Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 38425e7

Browse files
authored
Merge pull request #753 from asorrin-msft/9.3.1_candidate
9.3.1 candidate
2 parents d265ac4 + 917aa86 commit 38425e7

File tree

21 files changed

+78
-40
lines changed

21 files changed

+78
-40
lines changed

Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public static class EncryptionConstants
256256
public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
257257
public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
258258
public const string AgentMetadataKey = "EncryptionLibrary";
259-
public const string AgentMetadataValue = ".NET 9.3.0";
259+
public const string AgentMetadataValue = ".NET 9.3.1";
260260

261261
}
262262
}

Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.EncryptionConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class EncryptionConstants
1010
public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
1111
public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
1212
public const string AgentMetadataKey = "EncryptionLibrary";
13-
public const string AgentMetadataValue = ".NET 9.3.0";
13+
public const string AgentMetadataValue = ".NET 9.3.1";
1414
}
1515

1616
}

Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.HeaderConstants.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ namespace Microsoft.WindowsAzure.Storage.Shared.Protocol
44

55
public static class HeaderConstants
66
{
7-
public static readonly string UserAgent = "Azure-Storage/9.3.0 ";
7+
public static readonly string UserAgent = "Azure-Storage/9.3.1 ";
88
public const string UserAgentProductName = "Azure-Storage";
9-
public const string UserAgentProductVersion = "9.3.0";
9+
public const string UserAgentProductVersion = "9.3.1";
1010
public const string PrefixForStorageHeader = "x-ms-";
1111
public const string TrueHeader = "true";
1212
public const string FalseHeader = "false";

Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("Microsoft")]
1313
[assembly: AssemblyProduct("Windows Azure Storage")]
14-
[assembly: AssemblyCopyright("Copyright © 2013 Microsoft Corp.")]
14+
[assembly: AssemblyCopyright("Copyright © 2018 Microsoft Corp.")]
1515
[assembly: AssemblyTrademark("Microsoft ® is a registered trademark of Microsoft Corporation.")]
1616
[assembly: AssemblyCulture("")]
1717

@@ -31,8 +31,8 @@
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.0.*")]
3333

34-
[assembly: AssemblyVersion("9.3.0.0")]
35-
[assembly: AssemblyFileVersion("9.3.0.0")]
34+
[assembly: AssemblyVersion("9.3.1.0")]
35+
[assembly: AssemblyFileVersion("9.3.1.0")]
3636

3737
[assembly: InternalsVisibleTo(
3838
"Microsoft.WindowsAzure.Storage.Facade.Portable, PublicKey=" +

Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Microsoft.WindowsAzure.Storage",
3-
"version": "9.3.0.0",
3+
"version": "9.3.1.0",
44

55
"authors": [ "Microsoft Corporation" ],
66
"description": "Azure Storage SDK for NetCore",

Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: AssemblyConfiguration("")]
1212
[assembly: AssemblyCompany("Microsoft")]
1313
[assembly: AssemblyProduct("Microsoft Azure Storage")]
14-
[assembly: AssemblyCopyright("Copyright © 2014 Microsoft Corp.")]
14+
[assembly: AssemblyCopyright("Copyright © 2018 Microsoft Corp.")]
1515
[assembly: AssemblyTrademark("Microsoft ® is a registered trademark of Microsoft Corporation.")]
1616
[assembly: AssemblyCulture("")]
1717

@@ -34,9 +34,9 @@
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
3636

37-
[assembly: AssemblyVersion("9.3.0.0")]
38-
[assembly: AssemblyFileVersion("9.3.0.0")]
39-
[assembly: AssemblyInformationalVersion("9.3.0.0")]
37+
[assembly: AssemblyVersion("9.3.1.0")]
38+
[assembly: AssemblyFileVersion("9.3.1.0")]
39+
[assembly: AssemblyInformationalVersion("9.3.1.0")]
4040

4141

4242
[assembly: InternalsVisibleTo(

Lib/AspNet/Microsoft.WindowsAzure.Storage/WindowsAzure.StorageK.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>WindowsAzure.Storage</id>
5-
<version>9.3.0</version>
5+
<version>9.3.1</version>
66
<title>Windows Azure Storage</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>

Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "9.3.0.0",
2+
"version": "9.3.1.0",
33

44
"authors": [ "Microsoft Corporation" ],
55
"description": "Azure Storage SDK for NetCore",

Lib/ClassLibraryCommon/Blob/Protocol/BlobHttpResponseParsers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static BlobProperties GetProperties(HttpWebResponse response)
6060
properties.ContentLanguage = response.Headers[Constants.HeaderConstants.ContentLanguageHeader];
6161
#else
6262
string created = response.Headers[Constants.HeaderConstants.CreationTimeHeader];
63-
properties.Created = string.IsNullOrEmpty(created) ? (DateTimeOffset?)null : DateTimeOffset.Parse(created).ToUniversalTime();
63+
properties.Created = string.IsNullOrEmpty(created) ? (DateTimeOffset?)null : DateTimeOffset.Parse(created, CultureInfo.InvariantCulture).ToUniversalTime();
6464

6565
properties.LastModified = response.LastModified.ToUniversalTime();
6666
properties.ContentLanguage = response.Headers[HttpResponseHeader.ContentLanguage];

Lib/ClassLibraryCommon/Core/Util/CancellableAsyncResultTaskWrapper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void Cancel()
112112

113113
internal void Wait()
114114
{
115-
((Task)this.internalAsyncResult).Wait();
115+
CommonUtility.RunWithoutSynchronizationContext(() => ((Task)this.internalAsyncResult).Wait());
116116
}
117117
}
118118

@@ -146,7 +146,7 @@ internal TResult Result
146146
{
147147
get
148148
{
149-
return ((Task<TResult>)this.internalAsyncResult).Result;
149+
return CommonUtility.RunWithoutSynchronizationContext(() => ((Task<TResult>)this.internalAsyncResult).Result);
150150
}
151151
}
152152
}

0 commit comments

Comments
 (0)