Dependencies: Adds upgrade to Azure.Core 1.19.0 (#3029)

Upgrading Azure.Core to 1.19.0 and System.Runtime.CompilerServices.Unsafe to 4.6.0
Azure · Feb 17, 2022 · c7d6a91 · c7d6a91
1 parent a6b06e3
commit c7d6a91
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj b/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
@@ -33,7 +33,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Azure.Core" Version="1.3.0" />
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  <PackageReference Include="Azure.Identity" Version="1.1.1" />
  <PackageReference Include="Microsoft.Data.Encryption.Cryptography" Version="0.2.0-pre" />
  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> 

diff --git a/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj b/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
@@ -33,7 +33,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Azure.Core" Version="1.3.0" />
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.1.0" />
  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> 
  </ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/SystemTextJson/SystemTextJson.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/SystemTextJson/SystemTextJson.csproj
@@ -9,7 +9,7 @@
  <ServerGarbageCollection>true</ServerGarbageCollection>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Azure.Core" Version="1.14.0" />
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -119,21 +119,21 @@
  </ItemGroup>
 
  <ItemGroup>
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
  <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
  <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
  <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
  <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
  <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
- <PackageReference Include="Azure.Core" Version="1.3.0" />
 
  <!--Direct Dependencies-->
  <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
 
  <!--HybridRow Dependencies-->
  <PackageReference Include="System.Memory" Version="4.5.4" />
  <PackageReference Include="System.Buffers" Version="4.5.1" />
- <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
+ <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
  <PackageReference Include="System.ValueTuple" Version="4.5.0" />
  <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />

diff --git a/...os/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj b/...os/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj
@@ -51,7 +51,7 @@
  <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
  <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
  <PackageReference Include="System.Reflection" Version="4.3.0" />
- <PackageReference Include="Azure.Core" Version="1.3.0" />
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DirectContractTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DirectContractTests.cs
@@ -104,11 +104,11 @@ public void ProjectPackageDependenciesTest()
  { "System.Configuration.ConfigurationManager", new Version(4, 7, 0) },
  { "System.Memory", new Version(4, 5, 4) },
  { "System.Buffers", new Version(4, 5, 1) },
- { "System.Runtime.CompilerServices.Unsafe", new Version(4, 5, 3) },
+ { "System.Runtime.CompilerServices.Unsafe", new Version(4, 6, 0) },
  { "System.Threading.Tasks.Extensions", new Version(4, 5, 4) },
  { "System.ValueTuple", new Version(4, 5, 0) },
  { "Microsoft.Bcl.HashCode", new Version(1, 1, 0) },
- { "Azure.Core", new Version(1, 3, 0) },
+ { "Azure.Core", new Version(1, 19, 0) },
  };
 
  Assert.AreEqual(projectDependencies.Count, baselineDependencies.Count);
@@ -119,6 +119,9 @@ public void ProjectPackageDependenciesTest()
  }
  }
 
+ /// <summary>
+ /// Ignoring HybridRow dependency check as it is using System.Runtime.CompilerServices.Unsafe 4.5.3 and Azure.Core 1.19.0 needs >=4.6.0 version of the same
+ /// </summary>
  [TestMethod]
  public void PackageDependenciesTest()
  {
@@ -132,6 +135,11 @@ public void PackageDependenciesTest()
  Dictionary<string, Version> nuspecDependencies = DirectContractTests.GetNuspecDependencies(nuspecFile);
  foreach (KeyValuePair<string, Version> e in nuspecDependencies)
  {
+ if (nuspecFile.Contains("hybridrow") && e.Key.Contains("CompilerServices.Unsafe"))
+ {
+ continue;
+ }
+
  if (!allDependencies.ContainsKey(e.Key))
  {
  allDependencies[e.Key] = e.Value;

diff --git a/...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj b/...osoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj
@@ -46,7 +46,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Azure.Core" Version="1.3.0" />
+ <PackageReference Include="Azure.Core" Version="1.19.0" />
  <PackageReference Include="FluentAssertions" Version="5.10.3" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
  <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.7.1" />