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

Commit 95663c4

Browse files
pemari-msftpemari-msft
authored
Merge pull request #409 from erezvani1529/master
[.Net][8.1] Update OData to Netstandard friendly packages
2 parents c61e8e3 + 249af46 commit 95663c4

File tree

38 files changed

+147
-142
lines changed

38 files changed

+147
-142
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.0.0";
248+
public const string AgentMetadataValue = ".NET 8.1.0";
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.0.0";
13+
public const string AgentMetadataValue = ".NET 8.1.0";
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.0.0 ";
7+
public static readonly string UserAgent = "Azure-Storage/8.1.0 ";
88
public const string UserAgentProductName = "Azure-Storage";
9-
public const string UserAgentProductVersion = "8.0.0";
9+
public const string UserAgentProductVersion = "8.1.0";
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.0.1.0")]
35-
[assembly: AssemblyFileVersion("8.0.1.0")]
34+
[assembly: AssemblyVersion("8.1.0.0")]
35+
[assembly: AssemblyFileVersion("8.1.0.0")]
3636

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

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"title": "Microsoft.WindowsAzure.Storage",
3-
"version": "8.0.1.0",
3+
"version": "8.1.0.0",
44
"authors": [ "Microsoft Corporation" ],
55
"description": "Azure Storage SDK for NetCore",
66
"dependencies": {
7-
"Microsoft.Data.OData": "5.7.0",
8-
"Microsoft.Data.Services.Client": "5.7.0",
9-
"System.Spatial": "5.7.0",
7+
"Microsoft.Data.OData": "5.8.2",
8+
"Microsoft.Data.Services.Client": "5.8.2",
9+
"System.Spatial": "5.8.2",
1010
"Newtonsoft.Json": "9.0.1"
1111
},
1212

@@ -15,10 +15,7 @@
1515
"dependencies": {
1616
"NETStandard.Library": "1.6.0"
1717
},
18-
"imports": [
19-
"dnxcore50",
20-
"portable-net451+win8"
21-
]
18+
"imports":"dnxcore50"
2219
}
2320

2421
},

‎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.0.1.0")]
38-
[assembly: AssemblyFileVersion("8.0.1.0")]
39-
[assembly: AssemblyInformationalVersion("8.0.1.0")]
37+
[assembly: AssemblyVersion("8.1.0.0")]
38+
[assembly: AssemblyFileVersion("8.1.0.0")]
39+
[assembly: AssemblyInformationalVersion("8.1.0.0")]
4040

4141

4242
[assembly: InternalsVisibleTo(

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

Lines changed: 12 additions & 12 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.0.1</version>
5+
<version>8.1.0</version>
66
<title>Windows Azure Storage</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
@@ -18,34 +18,34 @@
1818
<dependencies>
1919
<group targetFramework=".netstandard1.0">
2020
<dependency id="NETStandard.Library" version="1.6.0" />
21-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
22-
<dependency id="Microsoft.Data.Services.Client" version="5.7.0" />
23-
<dependency id="System.Spatial" version="5.7.0" />
21+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
22+
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
23+
<dependency id="System.Spatial" version="5.8.2" />
2424
<dependency id="Newtonsoft.Json" version="9.0.1" />
2525
</group>
2626
<group targetFramework=".netstandard1.3">
2727
<dependency id="NETStandard.Library" version="1.6.0" />
28-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
29-
<dependency id="Microsoft.Data.Services.Client" version="5.7.0" />
30-
<dependency id="System.Spatial" version="5.7.0" />
28+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
29+
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
30+
<dependency id="System.Spatial" version="5.8.2" />
3131
<dependency id="Newtonsoft.Json" version="9.0.1" />
3232
</group>
3333
<group targetFramework=".netframework4.5">
34-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
34+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
3535
<dependency id="Newtonsoft.Json" version="6.0.8" />
36-
<dependency id="Microsoft.Data.Services.Client" version="5.7.0" />
36+
<dependency id="Microsoft.Data.Services.Client" version="5.8.2" />
3737
<dependency id="Microsoft.Azure.KeyVault.Core" version="1.0.0" />
3838
</group>
3939
<group targetFramework="win8">
40-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
40+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
4141
<dependency id="Newtonsoft.Json" version="6.0.8" />
4242
</group>
4343
<group targetFramework="wpa">
44-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
44+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
4545
<dependency id="Newtonsoft.Json" version="6.0.8" />
4646
</group>
4747
<group targetFramework="wp8">
48-
<dependency id="Microsoft.Data.OData" version="5.7.0" />
48+
<dependency id="Microsoft.Data.OData" version="5.8.2" />
4949
<dependency id="Newtonsoft.Json" version="6.0.8" />
5050
<dependency id="Microsoft.Azure.KeyVault.Core" version="1.0.0" />
5151
</group>

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"version": "8.0.1.0",
2+
"version": "8.1.0.0",
33

44
"authors": [ "Microsoft Corporation" ],
55
"description": "Azure Storage SDK for NetCore",
66
"dependencies": {
7-
"Microsoft.Data.OData": "5.7.0",
8-
"Microsoft.Data.Services.Client": "5.7.0",
9-
"System.Spatial": "5.7.0",
7+
"Microsoft.Data.OData": "5.8.2",
8+
"Microsoft.Data.Services.Client": "5.8.2",
9+
"System.Spatial": "5.8.2",
1010
"Newtonsoft.Json": "9.0.1"
1111
},
1212

@@ -15,10 +15,7 @@
1515
"dependencies": {
1616
"NETStandard.Library": "1.6.0"
1717
},
18-
"imports": [
19-
"dnxcore50",
20-
"portable-net451+win8"
21-
]
18+
"imports": "dnxcore50"
2219
}
2320

2421
},

‎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.0.1";
827+
public const string UserAgentProductVersion = "8.1.0";
828828

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

‎Lib/WindowsDesktop/Microsoft.WindowsAzure.Storage.Desktop.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@
4747
<SpecificVersion>False</SpecificVersion>
4848
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<Reference Include="Microsoft.Data.Edm, Version=5.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.7.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
52+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Data.OData, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<Reference Include="Microsoft.Data.OData, Version=5.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\packages\Microsoft.Data.OData.5.7.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
56+
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
5757
</Reference>
58-
<Reference Include="Microsoft.Data.Services.Client, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.7.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
60+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6363
<SpecificVersion>False</SpecificVersion>
@@ -68,9 +68,9 @@
6868
<Reference Include="System.Data" />
6969
<Reference Include="System.Data.DataSetExtensions" />
7070
<Reference Include="System.Net" />
71-
<Reference Include="System.Spatial, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<Reference Include="System.Spatial, Version=5.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<SpecificVersion>False</SpecificVersion>
73-
<HintPath>..\..\packages\System.Spatial.5.7.0\lib\net40\System.Spatial.dll</HintPath>
73+
<HintPath>..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
7474
</Reference>
7575
<Reference Include="System.Xml" />
7676
<Reference Include="System.Xml.Linq" />

0 commit comments

Comments
 (0)