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

Commit

Permalink
Merge pull request #1013 from EmmaZhu/releasebranch
Browse files Browse the repository at this point in the history 
Version 11.2.0 release
  • Loading branch information
@vinjiang
vinjiang committed Jul 24, 2020
2 parents 057ce0b + c108b8b commit 81cb4ae
Show file tree
Hide file tree
Showing 29 changed files with 121 additions and 95 deletions.
5 changes: 5 additions & 0 deletions Blob/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Changes in 11.2.0:

- Updated REST version to 2019-07-07.
- Added support for encryption scope.

Changes in 11.1.7:

- None.
Expand Down
2 changes: 1 addition & 1 deletion Blob/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft Azure Storage Blob SDK for .NET (11.1.7)
# Microsoft Azure Storage Blob SDK for .NET (11.2.0)

The Microsoft Azure Storage Blob SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.

Expand Down
2 changes: 1 addition & 1 deletion Common/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft Azure Storage Common SDK for .NET (11.1.7)
# Microsoft Azure Storage Common SDK for .NET (11.2.0)

The Microsoft Azure Storage Common SDK for .NET is referenced by Azure Storage Blob/Queue/File SDKs and Azure CosmosDB Table SDK
and should not be referenced directly by your application.
Expand Down
4 changes: 4 additions & 0 deletions Common/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Changes in 11.2.0:

- Updated REST version to 2019-07-07..

Changes in 11.1.7:

- None.
Expand Down
5 changes: 5 additions & 0 deletions File/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Changes in 11.2.0:

- Updated REST version to 2019-07-07.
- Added support for preserving SMB permissions and properties in file copying.

Changes in 11.1.7:

- None.
Expand Down
2 changes: 1 addition & 1 deletion File/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft Azure Storage File SDK for .NET (11.1.7)
# Microsoft Azure Storage File SDK for .NET (11.2.0)

The Microsoft Azure Storage File SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.

Expand Down
6 changes: 3 additions & 3 deletions Lib/Common.Split/NetFx/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/Common.Split/NetStandard/Microsoft.Azure.Storage.Common/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/Common.Split/NetStandard2/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]


#if SIGN
Expand Down
2 changes: 1 addition & 1 deletion Lib/Common/Shared/Protocol/Constants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ static HeaderConstants()
/// <summary>
/// Specifies the value to use for UserAgent header.
/// </summary>
public const string UserAgentProductVersion = "11.1.7";
public const string UserAgentProductVersion = "11.2.0";

/// <summary>
/// Master Microsoft Azure Storage header prefix.
Expand Down
6 changes: 3 additions & 3 deletions Lib/NetStandard2.Split/Blob/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/NetStandard2.Split/File/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.Storage.Test, PublicKey=" +
Expand Down
6 changes: 3 additions & 3 deletions Lib/NetStandard2.Split/Queue/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7.0")]
[assembly: AssemblyFileVersion("11.1.7.0")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0.0")]
[assembly: AssemblyFileVersion("11.2.0.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/Netstandard.Split/Microsoft.Azure.Storage.Blob/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/Netstandard.Split/Microsoft.Azure.Storage.File/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

[assembly: InternalsVisibleTo(
"Microsoft.Azure.Storage.Test, PublicKey=" +
Expand Down
6 changes: 3 additions & 3 deletions Lib/Netstandard.Split/Microsoft.Azure.Storage.Queue/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("9d154050-0b01-4f70-afa3-8e2176e9cd73")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

[assembly: InternalsVisibleTo(
"Microsoft.Azure.Storage.Test, PublicKey=" +
Expand Down
6 changes: 3 additions & 3 deletions Lib/WindowsDesktop.Split/Blob/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/WindowsDesktop.Split/File/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
6 changes: 3 additions & 3 deletions Lib/WindowsDesktop.Split/Queue/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("11.1.7")]
[assembly: AssemblyFileVersion("11.1.7")]
[assembly: AssemblyInformationalVersion("11.1.7.0")]
[assembly: AssemblyVersion("11.2.0")]
[assembly: AssemblyFileVersion("11.2.0")]
[assembly: AssemblyInformationalVersion("11.2.0.0")]

#if SIGN
[assembly: InternalsVisibleTo(
Expand Down
2 changes: 1 addition & 1 deletion Nuspecs/CreatePackages/CreatePackages.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="BuildPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionNumber>11.1.7</VersionNumber>
<VersionNumber>11.2.0</VersionNumber>
<MasterBranch>origin/master</MasterBranch>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
Expand Down
4 changes: 4 additions & 0 deletions Queue/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Changes in 11.2.0:

- Updated REST version to 2019-07-07.

Changes in 11.1.7:

- GitHub Issue #999 - NetworkTimeout not applied correctly in QueueRequestOptions.
Expand Down
2 changes: 1 addition & 1 deletion Queue/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Microsoft Azure Storage Queue SDK for .NET (11.1.7)
# Microsoft Azure Storage Queue SDK for .NET (11.2.0)

The Microsoft Azure Storage Queue SDK for .NET allows you to build Azure applications that take advantage of scalable cloud computing resources.

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

We have engineered a highly performant and scalable SDK with our V12 releases. We encourage all our customers to give it a try.

# Microsoft Azure Storage SDK for .NET (11.1.7)
# Microsoft Azure Storage SDK for .NET (11.2.0)

> Server Version: 2019-02-02
> Server Version: 2019-07-07
The Microsoft Azure Storage SDK for .NET allows you to build Azure applications
that take advantage of scalable cloud computing resources.
Expand Down
2 changes: 1 addition & 1 deletion Test/ClassLibraryCommon/Blob/BlobCancellationUnitTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void CloudBlockBlobDownloadToStreamAPMCancel()
}
catch (StorageException ex)
{
Assert.AreEqual("The operation was canceled.", ex.Message);
Assert.AreEqual("A task was canceled.", ex.Message);
Assert.AreEqual(ex.RequestInformation.HttpStatusCode, 306);
Assert.AreEqual(ex.RequestInformation.HttpStatusMessage, null);
}
Expand Down
25 changes: 13 additions & 12 deletions Test/ClassLibraryCommon/Blob/CloudAppendBlobTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2208,10 +2208,10 @@ public void CloudAppendBlobSnapshot()

List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
finally
{
Expand Down Expand Up @@ -2301,10 +2301,11 @@ public void CloudAppendBlobSnapshotAPM()

List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);

AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
}
finally
Expand Down Expand Up @@ -2385,10 +2386,10 @@ public async Task CloudAppendBlobSnapshotTask()
.Results
.ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
finally
{
Expand Down
23 changes: 11 additions & 12 deletions Test/ClassLibraryCommon/Blob/CloudBlobTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ public void CloudBlobSnapshot()

List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
finally
{
Expand Down Expand Up @@ -217,10 +217,10 @@ public void CloudBlobSnapshotAPM()

List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
}
finally
Expand Down Expand Up @@ -302,11 +302,10 @@ public async Task CloudBlobSnapshotTask()
.Results
.ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
Assert.IsTrue(((CloudBlob)blobs[2]).IsDeleted);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[4]);
}
finally
{
Expand Down
8 changes: 4 additions & 4 deletions Test/ClassLibraryCommon/Blob/CloudBlockBlobTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3340,10 +3340,10 @@ public void CloudBlockBlobSnapshotAPM()

List<IListBlobItem> blobs = container.ListBlobs(null, true, BlobListingDetails.All, null, null).ToList();
Assert.AreEqual(4, blobs.Count);
AssertAreEqual(snapshot1, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[1]);
AssertAreEqual(blob, (CloudBlob)blobs[2]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[3]);
AssertAreEqual(snapshotCopy, (CloudBlob)blobs[0]);
AssertAreEqual(snapshot1, (CloudBlob)blobs[1]);
AssertAreEqual(snapshot2, (CloudBlob)blobs[2]);
AssertAreEqual(blob, (CloudBlob)blobs[3]);
}
}
finally
Expand Down
Loading

0 comments on commit 81cb4ae

Please sign in to comment.