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

Commit c349ab9

Browse files
pemari-msftpemari-msft
authored
Merge pull request #86 from wastore/dev
[.Net][Release 8.1.1] Fix for a problematic OData Reference
2 parents 249af46 + 57bed9c commit c349ab9

File tree

25 files changed

+42
-45
lines changed

25 files changed

+42
-45
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
@@ -245,7 +245,7 @@ public static class EncryptionConstants
245245
public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
246246
public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
247247
public const string AgentMetadataKey = "EncryptionLibrary";
248-
public const string AgentMetadataValue = ".NET 8.1.0";
248+
public const string AgentMetadataValue = ".NET 8.1.1";
249249
}
250250
}
251251

‎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 8.1.0";
13+
public const string AgentMetadataValue = ".NET 8.1.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/8.1.0 ";
7+
public static readonly string UserAgent = "Azure-Storage/8.1.1 ";
88
public const string UserAgentProductName = "Azure-Storage";
9-
public const string UserAgentProductVersion = "8.1.0";
9+
public const string UserAgentProductVersion = "8.1.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.0.*")]
3333

34-
[assembly: AssemblyVersion("8.1.0.0")]
35-
[assembly: AssemblyFileVersion("8.1.0.0")]
34+
[assembly: AssemblyVersion("8.1.1.0")]
35+
[assembly: AssemblyFileVersion("8.1.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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"title": "Microsoft.WindowsAzure.Storage",
3-
"version": "8.1.0.0",
3+
"version": "8.1.1.0",
44
"authors": [ "Microsoft Corporation" ],
55
"description": "Azure Storage SDK for NetCore",
66
"dependencies": {
77
"Microsoft.Data.OData": "5.8.2",
8-
"Microsoft.Data.Services.Client": "5.8.2",
98
"System.Spatial": "5.8.2",
109
"Newtonsoft.Json": "9.0.1"
1110
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
3636

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

4141

4242
[assembly: InternalsVisibleTo(

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

Lines changed: 1 addition & 3 deletions
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>8.1.0</version>
5+
<version>8.1.1</version>
66
<title>Windows Azure Storage</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
@@ -19,14 +19,12 @@
1919
<group targetFramework=".netstandard1.0">
2020
<dependency id="NETStandard.Library" version="1.6.0" />
2121
<dependency id="Microsoft.Data.OData" version="5.8.2" />
22-
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
2322
<dependency id="System.Spatial" version="5.8.2" />
2423
<dependency id="Newtonsoft.Json" version="9.0.1" />
2524
</group>
2625
<group targetFramework=".netstandard1.3">
2726
<dependency id="NETStandard.Library" version="1.6.0" />
2827
<dependency id="Microsoft.Data.OData" version="5.8.2" />
29-
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
3028
<dependency id="System.Spatial" version="5.8.2" />
3129
<dependency id="Newtonsoft.Json" version="9.0.1" />
3230
</group>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"version": "8.1.0.0",
2+
"version": "8.1.1.0",
33

44
"authors": [ "Microsoft Corporation" ],
55
"description": "Azure Storage SDK for NetCore",
66
"dependencies": {
77
"Microsoft.Data.OData": "5.8.2",
8-
"Microsoft.Data.Services.Client": "5.8.2",
98
"System.Spatial": "5.8.2",
109
"Newtonsoft.Json": "9.0.1"
1110
},

‎Lib/Common/Shared/Protocol/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ static HeaderConstants()
824824
/// <summary>
825825
/// Specifies the value to use for UserAgent header.
826826
/// </summary>
827-
public const string UserAgentProductVersion = "8.1.0";
827+
public const string UserAgentProductVersion = "8.1.1";
828828

829829
/// <summary>
830830
/// Master Microsoft Azure Storage header prefix.

‎Lib/WindowsDesktop/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
// by using the '*' as shown below:
3636
// [assembly: AssemblyVersion("1.0.*")]
3737

38-
[assembly: AssemblyVersion("8.1.0.0")]
39-
[assembly: AssemblyFileVersion("8.1.0.0")]
38+
[assembly: AssemblyVersion("8.1.1.0")]
39+
[assembly: AssemblyFileVersion("8.1.1.0")]
4040

4141
#if SIGN
4242
[assembly: InternalsVisibleTo(

‎Lib/WindowsDesktop/WindowsAzure.Storage.nuspec

Lines changed: 1 addition & 3 deletions
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>8.1.0</version>
5+
<version>8.1.1</version>
66
<title>Windows Azure Storage</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
@@ -19,14 +19,12 @@
1919
<group targetFramework=".netstandard1.0">
2020
<dependency id="NETStandard.Library" version="1.6.0" />
2121
<dependency id="Microsoft.Data.OData" version="5.8.2" />
22-
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
2322
<dependency id="System.Spatial" version="5.8.2" />
2423
<dependency id="Newtonsoft.Json" version="9.0.1" />
2524
</group>
2625
<group targetFramework=".netstandard1.3">
2726
<dependency id="NETStandard.Library" version="1.6.0" />
2827
<dependency id="Microsoft.Data.OData" version="5.8.2" />
29-
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
3028
<dependency id="System.Spatial" version="5.8.2" />
3129
<dependency id="Newtonsoft.Json" version="9.0.1" />
3230
</group>

‎Lib/WindowsPhone/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
// You can specify all the values or you can default the Revision and Build Numbers
3434
// by using the '*' as shown below:
3535

36-
[assembly: AssemblyVersion("8.1.0.0")]
37-
[assembly: AssemblyFileVersion("8.1.0.0")]
36+
[assembly: AssemblyVersion("8.1.1.0")]
37+
[assembly: AssemblyFileVersion("8.1.1.0")]
3838

3939
[assembly: NeutralResourcesLanguageAttribute("en-US")]
4040

‎Lib/WindowsPhoneRT/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
//
2525
// You can specify all the values or you can default the Build and Revision Numbers
2626
// by using the '*' as shown below:
27-
[assembly: AssemblyVersion("8.1.0.0")]
28-
[assembly: AssemblyFileVersion("8.1.0.0")]
27+
[assembly: AssemblyVersion("8.1.1.0")]
28+
[assembly: AssemblyFileVersion("8.1.1.0")]
2929

3030
[assembly: NeutralResourcesLanguageAttribute("en-US")]
3131
[assembly: ComVisible(false)]

‎Lib/WindowsRuntime/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
// by using the '*' as shown below:
2727
// [assembly: AssemblyVersion("1.0.*")]
2828

29-
[assembly: AssemblyVersion("8.1.0.0")]
30-
[assembly: AssemblyFileVersion("8.1.0.0")]
29+
[assembly: AssemblyVersion("8.1.1.0")]
30+
[assembly: AssemblyFileVersion("8.1.1.0")]
3131

3232
[assembly: ComVisible(false)]
3333

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Microsoft Azure Storage SDK for .NET (8.1.0)
1+
# Microsoft Azure Storage SDK for .NET (8.1.1)
22

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

‎Test/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.NetCore.Test/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Microsoft.WindowsAzure.Storage.Facade.NetCore.Test",
3-
"version": "8.1.0.0",
3+
"version": "8.1.1.0",
44
"testRunner": "xunit",
55

66
"dependencies": {
@@ -16,7 +16,7 @@
1616
"type": "platform",
1717
"version": "1.0.0"
1818
},
19-
"WindowsAzure.Storage": "8.1.0-test"
19+
"WindowsAzure.Storage": "8.1.1"
2020
},
2121

2222
"imports": "dnxcore50"

‎Test/AspNet/Facade/Microsoft.WindowsAzure.Storage.Facade.Portable/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": "8.1.0.0",
2+
"version": "8.1.1.0",
33
"supports": {},
44
"dependencies": {
5-
"WindowsAzure.Storage": "8.1.0-test"
5+
"WindowsAzure.Storage": "8.1.1-test"
66
},
77
"frameworks": {
88
".NETPortable,Version=v4.5,Profile=Profile259": {}

‎Test/AspNet/Microsoft.WindowsAzure.Storage.Test/o_11xtmvop.my2

-10 MB
Binary file not shown.

‎Test/AspNet/Microsoft.WindowsAzure.Storage.Test/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"version": "8.1.0.0",
2+
"version": "8.1.1.0",
33
"testRunner": "xunit",
44

55
"dependencies": {
66
"xunit": "2.1.0",
77
"dotnet-test-xunit": "2.2.0-preview2-build1029",
8-
"Microsoft.WindowsAzure.Storage": "8.1.0.0",
8+
"Microsoft.WindowsAzure.Storage": "8.1.1.0",
99
"XUnitForMsTest": "1.0.0-*"
1010
},
1111

‎Test/WindowsDesktop/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535

36-
[assembly: AssemblyVersion("8.1.0.0")]
37-
[assembly: AssemblyFileVersion("8.1.0.0")]
36+
[assembly: AssemblyVersion("8.1.1.0")]
37+
[assembly: AssemblyFileVersion("8.1.1.0")]
3838

‎Test/WindowsPhone/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Revision and Build Numbers
3434
// by using the '*' as shown below:
3535

36-
[assembly: AssemblyVersion("8.1.0.0")]
37-
[assembly: AssemblyFileVersion("8.1.0.0")]
36+
[assembly: AssemblyVersion("8.1.1.0")]
37+
[assembly: AssemblyFileVersion("8.1.1.0")]
3838

3939
[assembly: NeutralResourcesLanguageAttribute("en-US")]

‎Test/WindowsPhone81/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Revision and Build Numbers
3434
// by using the '*' as shown below:
3535

36-
[assembly: AssemblyVersion("8.1.0.0")]
37-
[assembly: AssemblyFileVersion("8.1.0.0")]
36+
[assembly: AssemblyVersion("8.1.1.0")]
37+
[assembly: AssemblyFileVersion("8.1.1.0")]
3838

3939
[assembly: NeutralResourcesLanguageAttribute("en-US")]

‎Test/WindowsPhoneRT.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
2727

28-
[assembly: AssemblyVersion("8.1.0.0")]
29-
[assembly: AssemblyFileVersion("8.1.0.0")]
28+
[assembly: AssemblyVersion("8.1.1.0")]
29+
[assembly: AssemblyFileVersion("8.1.1.0")]
3030

3131
[assembly: ComVisible(false)]

‎Test/WindowsRuntime/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
2727

28-
[assembly: AssemblyVersion("8.1.0.0")]
29-
[assembly: AssemblyFileVersion("8.1.0.0")]
28+
[assembly: AssemblyVersion("8.1.1.0")]
29+
[assembly: AssemblyFileVersion("8.1.1.0")]
3030

3131
[assembly: ComVisible(false)]

‎changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Changes in 8.1.1 :
2+
- All (NetStandard/NetCore): Removed Microsoft.Data.Services.Client as a temporary fix to ODataLib dependency incompatibility with NetStandard
3+
14
Changes in 8.1.0 :
25
- All: Updated OData references to the latest Netstandard friendly package version 5.8.2.
36
- Queues (WinRT/NetCore): Fixed a bug where connections were not closed after an add message operation.

0 commit comments

Comments
 (0)