Merge branch 'users/abpai/algoToWrapMetadata' of https://github.com/A…

…zure/azure-cosmos-dotnet-v3 into users/abpai/algoToWrapMetadata
Azure · Feb 24, 2022 · da9ff1f · da9ff1f
2 parents 1082826 + 0ed2b69
commit da9ff1f
Show file tree

Hide file tree

Showing 13 changed files with 2,886 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<ClientOfficialVersion>3.24.0</ClientOfficialVersion>
-		<ClientPreviewVersion>3.24.0</ClientPreviewVersion>
+		<ClientOfficialVersion>3.25.0</ClientOfficialVersion>
+		<ClientPreviewVersion>3.25.0</ClientPreviewVersion>
 		<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
 		<DirectVersion>3.24.1</DirectVersion>
 		<EncryptionVersion>1.0.0-previewV19</EncryptionVersion>

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/contracts/API_3.25.0-preview.txt b/Microsoft.Azure.Cosmos/contracts/API_3.25.0-preview.txt
diff --git a/Microsoft.Azure.Cosmos/contracts/API_3.25.0.txt b/Microsoft.Azure.Cosmos/contracts/API_3.25.0.txt
diff --git a/Microsoft.Azure.Cosmos/src/CosmosClient.cs b/Microsoft.Azure.Cosmos/src/CosmosClient.cs
@@ -40,7 +40,7 @@ namespace Microsoft.Azure.Cosmos
     ///                 ApplicationRegion = Regions.EastUS2,
     ///             });
     /// 
-    /// Database db = await client.CreateDatabaseAsync("database-id");
+    /// Database db = await cosmosClient.CreateDatabaseAsync("database-id");
     /// Container container = await db.CreateContainerAsync("container-id");
     /// 
     /// // Dispose cosmosClient at application exit
@@ -62,7 +62,7 @@ namespace Microsoft.Azure.Cosmos
     ///                 ApplicationRegion = Regions.EastUS2,
     ///             });
     /// 
-    /// Database db = await client.CreateDatabaseAsync("database-id");
+    /// Database db = await cosmosClient.CreateDatabaseAsync("database-id");
     /// Container container = await db.CreateContainerAsync("container-id");
     /// 
     /// // Dispose cosmosClient at application exit
@@ -81,7 +81,7 @@ namespace Microsoft.Azure.Cosmos
     ///     .WithApplicationRegion("East US 2")
     ///     .Build();
     /// 
-    /// Database db = await client.CreateDatabaseAsync("database-id")
+    /// Database db = await cosmosClient.CreateDatabaseAsync("database-id")
     /// Container container = await db.CreateContainerAsync("container-id");
     /// 
     /// // Dispose cosmosClient at application exit

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/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemTests.cs
@@ -704,7 +704,6 @@ await feedIterator.ReadNextAsync(this.cancellationToken))
             Assert.AreEqual(itemIds.Count, 0);
         }
 
-        [Ignore] // https://github.com/Azure/azure-cosmos-dotnet-v3/issues/2981
         [TestMethod]
         public async Task PartitionKeyDeleteTest()
         {

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" />

diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,16 @@ Preview features are treated as a separate branch and will not be included in th
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### <a name="3.25.0-preview"/> [3.25.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.25.0-preview) - 2022-02-18
+### <a name="3.25.0"/> [3.25.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.25.0) - 2022-02-18
+
+#### Added
+- [#3029](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3029) Dependencies: Upgrades to Azure.Core 1.19.0.
+
+#### Fixed
+- [#3034](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3034), [#3024](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3024), [#3018](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3018), [#3000](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3000) Documentation: Improvements in code samples within xml documentation.
+- [#3027](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3027) Initialization: Fixes the SDK to retry if the initialization fails due to transient errors.
+
 ### <a name="3.24.0-preview"/> [3.24.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.24.0-preview) - 2022-01-31
 
 #### Added