Merge branch 'master' into users/Meghana-Palaparthi/DTS_read_transaction

Meghana-Palaparthi · web-flow · commit 4f5748954182 · 2026-04-21T11:17:42.000-05:00
diff --git a/Microsoft.Azure.Cosmos/src/Regions.cs b/Microsoft.Azure.Cosmos/src/Regions.cs
@@ -75,6 +75,11 @@ public static class Regions
         /// </summary>
         public const string SoutheastAsia = "Southeast Asia";
 
+        /// <summary>
+        /// Name of the Azure Southeast Asia 3 region in the Azure Cosmos DB service.
+        /// </summary>
+        public const string SoutheastAsia3 = "Southeast Asia 3";
+
         /// <summary>
         /// Name of the Azure Japan East region in the Azure Cosmos DB service.
         /// </summary>
@@ -489,5 +494,15 @@ public static class Regions
         /// Name of the Azure Singapore North region in the Azure Cosmos DB service.
         /// </summary>
         public const string SingaporeNorth = "Singapore North";
+
+        /// <summary>
+        /// Name of the Azure Saudi Arabia East region in the Azure Cosmos DB service.
+        /// </summary>
+        public const string SaudiArabiaEast = "Saudi Arabia East";
+
+        /// <summary>
+        /// Name of the Azure West Central US FRE region in the Azure Cosmos DB service.
+        /// </summary>
+        public const string WestCentralUSFRE = "West Central US FRE";
     }
 }
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemIntegrationTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemIntegrationTests.cs
@@ -381,6 +381,7 @@ public async Task AddressRefreshTimeoutTest()
             }
         }
           
+        [TestMethod]
         [Owner("dkunda")]
         [TestCategory("MultiRegion")]
         [DataRow(true, DisplayName = "Test scenario when binary encoding is enabled at client level.")]
@@ -2243,7 +2244,7 @@ public async Task ClinetOverrides0msRequestTimeoutValueForPPAF()
 
             CrossRegionHedgingAvailabilityStrategy strat = cosmosClient.DocumentClient.ConnectionPolicy.AvailabilityStrategy as CrossRegionHedgingAvailabilityStrategy;
             Assert.IsNotNull(strat);
-            Assert.AreNotEqual(0, strat.Threshold);
+            Assert.AreNotEqual(TimeSpan.Zero, strat.Threshold);
         }
         
         
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosItemTests.cs
@@ -2390,7 +2390,7 @@ public async Task ItemRequestOptionAccessConditionTest(bool binaryEncodingEnable
                     Assert.IsNotNull(responseMessage);
                     Assert.IsNull(responseMessage.Content);
                     Assert.AreEqual(HttpStatusCode.PreconditionFailed, responseMessage.StatusCode, responseMessage.ErrorMessage);
-                    Assert.AreNotEqual(responseMessage.Headers.ActivityId, Guid.Empty);
+                    Assert.AreNotEqual(Guid.Empty.ToString(), responseMessage.Headers.ActivityId);
                     Assert.IsTrue(responseMessage.Headers.RequestCharge > 0);
                     Assert.IsFalse(string.IsNullOrEmpty(responseMessage.ErrorMessage));
                     Assert.IsTrue(responseMessage.ErrorMessage.Contains("One of the specified pre-condition is not met"));
@@ -2407,7 +2407,7 @@ public async Task ItemRequestOptionAccessConditionTest(bool binaryEncodingEnable
                 {
                     Assert.IsNotNull(e);
                     Assert.AreEqual(HttpStatusCode.PreconditionFailed, e.StatusCode, e.Message);
-                    Assert.AreNotEqual(e.ActivityId, Guid.Empty);
+                    Assert.AreNotEqual(Guid.Empty.ToString(), e.ActivityId);
                     Assert.IsTrue(e.RequestCharge > 0);
                     string expectedResponseBody = $"{Environment.NewLine}Errors : [{Environment.NewLine}  \"One of the specified pre-condition is not met. Learn more: https://aka.ms/CosmosDB/sql/errors/precondition-failed\"{Environment.NewLine}]{Environment.NewLine}";
                     Assert.AreEqual(expectedResponseBody, e.ResponseBody);
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Fluent/ContainerSettingsTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Fluent/ContainerSettingsTests.cs
@@ -497,7 +497,7 @@ await databaseForConflicts.DefineContainer(containerName, partitionKeyPath)
                 containerSettings = containerResponse.Resource;
                 Assert.IsNotNull(containerSettings.ConflictResolutionPolicy);
                 Assert.AreEqual(ConflictResolutionMode.Custom, containerSettings.ConflictResolutionPolicy.Mode);
-                Assert.AreEqual(UriFactory.CreateStoredProcedureUri(databaseForConflicts.Id, containerName, sprocName), containerSettings.ConflictResolutionPolicy.ResolutionProcedure);
+                Assert.AreEqual(UriFactory.CreateStoredProcedureUri(databaseForConflicts.Id, containerName, sprocName).ToString(), containerSettings.ConflictResolutionPolicy.ResolutionProcedure);
                 Assert.IsTrue(string.IsNullOrEmpty(containerSettings.ConflictResolutionPolicy.ResolutionPath));
             }
             finally
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj
@@ -62,10 +62,10 @@
     <PackageReference Include="System.Security.SecureString" Version="4.3.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.8.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
   </ItemGroup>
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TriggersTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/TriggersTests.cs
@@ -153,6 +153,7 @@ await this.scripts.CreateTriggerStreamAsync(
         }
 
 
+        [TestMethod]
         [DataRow(TriggerOperation.Create, false, DisplayName = "TriggerOperation - Create with Binary encoding disabled.")]
         [DataRow(TriggerOperation.Create, true, DisplayName = "TriggerOperation - Create with Binary encoding enabled.")]
         [DataRow(TriggerOperation.Upsert, false, DisplayName = "TriggerOperation - Upsert with Binary encoding disabled.")]
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Performance.Tests/Microsoft.Azure.Cosmos.Performance.Tests.csproj b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Performance.Tests/Microsoft.Azure.Cosmos.Performance.Tests.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="OpenTelemetry" Version="1.10.0" />
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/AssemblyInfo.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+// ------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// ------------------------------------------------------------
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetSDKAPI.net6.json b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Contracts/DotNetSDKAPI.net6.json
@@ -8193,6 +8193,11 @@
           "Attributes": [],
           "MethodInfo": "System.String QatarCentral;IsInitOnly:False;IsStatic:True;"
         },
+        "System.String SaudiArabiaEast": {
+          "Type": "Field",
+          "Attributes": [],
+          "MethodInfo": "System.String SaudiArabiaEast;IsInitOnly:False;IsStatic:True;"
+        },
         "System.String SingaporeCentral": {
           "Type": "Field",
           "Attributes": [],
@@ -8228,6 +8233,11 @@
           "Attributes": [],
           "MethodInfo": "System.String SoutheastAsia;IsInitOnly:False;IsStatic:True;"
         },
+        "System.String SoutheastAsia3": {
+          "Type": "Field",
+          "Attributes": [],
+          "MethodInfo": "System.String SoutheastAsia3;IsInitOnly:False;IsStatic:True;"
+        },
         "System.String SoutheastUS": {
           "Type": "Field",
           "Attributes": [],
@@ -8363,6 +8373,11 @@
           "Attributes": [],
           "MethodInfo": "System.String WestCentralUS;IsInitOnly:False;IsStatic:True;"
         },
+        "System.String WestCentralUSFRE": {
+          "Type": "Field",
+          "Attributes": [],
+          "MethodInfo": "System.String WestCentralUSFRE;IsInitOnly:False;IsStatic:True;"
+        },
         "System.String WestEurope": {
           "Type": "Field",
           "Attributes": [],
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj
@@ -54,10 +54,10 @@
     <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" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.8.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="coverlet.msbuild" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/BufferedPartitionRangeEnumeratorTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/BufferedPartitionRangeEnumeratorTests.cs
@@ -95,7 +95,6 @@ public async Task TestMoveNextAndBufferPageAsync(bool aggressivePrefetch, bool e
             await implementation.TestMoveNextAndBufferPageAsync(aggressivePrefetch, exercisePrefetch);
         }
 
-        [TestClass]
         private sealed class Implementation : PartitionRangeEnumeratorTests<ReadFeedPage, ReadFeedState>
         {
             private const int Iterations = 1;
@@ -105,7 +104,6 @@ public Implementation()
             {
             }
 
-            [TestMethod]
             public async Task TestSplitAsync(bool aggressivePrefetch, bool exercisePrefetch)
             {
                 int numItems = 100;
@@ -143,7 +141,6 @@ public async Task TestSplitAsync(bool aggressivePrefetch, bool exercisePrefetch)
                 Assert.AreEqual(numItems, parentIdentifiers.Count + childIdentifiers.Count);
             }
 
-            [TestMethod]
             public async Task TestBufferPageAsync(bool aggressivePrefetch, bool exercisePrefetch)
             {
                 int numItems = 100;
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/DocumentContainerTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/DocumentContainerTests.cs
@@ -254,7 +254,7 @@ public async Task TestCrudAsync()
             CosmosObject item = CosmosObject.Parse("{\"pk\" : 42 }");
             Record record = await documentContainer.CreateItemAsync(item, cancellationToken: default);
             Assert.IsNotNull(record);
-            Assert.AreNotEqual(Guid.Empty, record.Identifier);
+            Assert.AreNotEqual(Guid.Empty.ToString(), record.Identifier);
 
             // Try to read it back
             Record readRecord = await documentContainer.ReadItemAsync(
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/PartitionRangeEnumeratorTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/PartitionRangeEnumeratorTests.cs
@@ -21,7 +21,6 @@ protected PartitionRangeEnumeratorTests(bool singlePartition)
             this.singlePartition = singlePartition;
         }
 
-        [TestMethod]
         public async Task TestMoveNextAsyncThrowsTaskCanceledException()
         {
             int numItems = 100;
@@ -38,7 +37,6 @@ public async Task TestMoveNextAsyncThrowsTaskCanceledException()
             await Assert.ThrowsExceptionAsync<OperationCanceledException>(async () => await enumerator.MoveNextAsync());
         }
 
-        [TestMethod]
         public async Task TestDrainFullyAsync(bool aggressivePrefetch)
         {
             int numItems = 1000;
@@ -48,7 +46,6 @@ public async Task TestDrainFullyAsync(bool aggressivePrefetch)
             Assert.AreEqual(numItems, identifiers.Count);
         }
 
-        [TestMethod]
         public async Task TestResumingFromStateAsync(bool aggressivePrefetch, bool exercisePrefetch)
         {
             int numItems = 1000;
@@ -63,7 +60,6 @@ public async Task TestResumingFromStateAsync(bool aggressivePrefetch, bool exerc
             Assert.AreEqual(numItems, firstDrainResults.Count + secondDrainResults.Count);
         }
 
-        [TestMethod]
         public async Task Test429sAsync(bool aggressivePrefetch)
         {
             int numItems = 100;
@@ -104,7 +100,6 @@ public async Task Test429sAsync(bool aggressivePrefetch)
             Assert.AreEqual(numItems, identifiers.Count);
         }
 
-        [TestMethod]
         public async Task Test429sWithContinuationsAsync(bool aggressivePrefetch, bool exercisePrefetch)
         {
             int numItems = 100;
@@ -156,7 +151,6 @@ public async Task Test429sWithContinuationsAsync(bool aggressivePrefetch, bool e
             Assert.AreEqual(numItems, identifiers.Count);
         }
 
-        [TestMethod]
         public async Task TestEmptyPages(bool aggressivePrefetch)
         {
             int numItems = 100;
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/SinglePartitionPartitionRangeEnumeratorTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Pagination/SinglePartitionPartitionRangeEnumeratorTests.cs
@@ -60,15 +60,13 @@ public async Task TestSplitAsync()
             await implementation.TestSplitAsync();
         }
 
-        [TestClass]
         private sealed class Implementation : PartitionRangeEnumeratorTests<ReadFeedPage, ReadFeedState>
         {
             public Implementation()
                 : base(singlePartition: true)
             {
             }
 
-            [TestMethod]
             public async Task TestSplitAsync()
             {
                 int numItems = 100;
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Query/OrderByQueryPartitionRangePageAsyncEnumeratorTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Query/OrderByQueryPartitionRangePageAsyncEnumeratorTests.cs
@@ -23,7 +23,6 @@ public async Task TestMoveNextAsyncThrowsTaskCanceledException()
             await implementation.TestMoveNextAsyncThrowsTaskCanceledException();
         }
 
-        [TestClass]
         private sealed class Implementation : PartitionRangeEnumeratorTests<OrderByQueryPage, QueryState>
         {
             public Implementation()
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Query/QueryPartitionRangePageEnumeratorTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Query/QueryPartitionRangePageEnumeratorTests.cs
@@ -60,15 +60,13 @@ public async Task TestSplitAsync()
             await implementation.TestSplitAsync();
         }
 
-        [TestClass]
         private sealed class Implementation : PartitionRangeEnumeratorTests<QueryPage, QueryState>
         {
             public Implementation()
                 : base(singlePartition: true)
             {
             }
 
-            [TestMethod]
             public async Task TestSplitAsync()
             {
                 int numItems = 100;
diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Scenarios/GremlinScenarioTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Scenarios/GremlinScenarioTests.cs
@@ -740,8 +740,8 @@ internal void GetDeserializedObjectsFromQueryResponseTest(JsonSerializationForma
             // from the backing CosmosElement contents rather than being directly returned as CosmosElements
             List<dynamic> responseCosmosElements = new List<dynamic>(cosmosElementQueryResponse.Resource);
             Assert.AreEqual(vertexArray.Count, responseCosmosElements.Count);
-            Assert.AreNotSame(vertex1LazyObject, responseCosmosElements[0]);
-            Assert.AreNotSame(vertex2LazyObject, responseCosmosElements[1]);
+            Assert.AreNotSame((object)vertex1LazyObject, (object)responseCosmosElements[0]);
+            Assert.AreNotSame((object)vertex2LazyObject, (object)responseCosmosElements[1]);
         }
 
         private CosmosObject CreateVertexDocument(string id, string label, string pkName, string pkValue, IEnumerable<Tuple<string, IEnumerable<object>>> userProperties)

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,7 @@ public async Task AddressRefreshTimeoutTest()`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`
	`384`	`+ [TestMethod]`
`384`	`385`	`[Owner("dkunda")]`
`385`	`386`	`[TestCategory("MultiRegion")]`
`386`	`387`	`[DataRow(true, DisplayName = "Test scenario when binary encoding is enabled at client level.")]`
`@@ -2243,7 +2244,7 @@ public async Task ClinetOverrides0msRequestTimeoutValueForPPAF()`
`2243`	`2244`
`2244`	`2245`	`CrossRegionHedgingAvailabilityStrategy strat = cosmosClient.DocumentClient.ConnectionPolicy.AvailabilityStrategy as CrossRegionHedgingAvailabilityStrategy;`
`2245`	`2246`	`Assert.IsNotNull(strat);`
`2246`		`- Assert.AreNotEqual(0, strat.Threshold);`
	`2247`	`+ Assert.AreNotEqual(TimeSpan.Zero, strat.Threshold);`
`2247`	`2248`	`}`
`2248`	`2249`
`2249`	`2250`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ await databaseForConflicts.DefineContainer(containerName, partitionKeyPath)`
`497`	`497`	`containerSettings = containerResponse.Resource;`
`498`	`498`	`Assert.IsNotNull(containerSettings.ConflictResolutionPolicy);`
`499`	`499`	`Assert.AreEqual(ConflictResolutionMode.Custom, containerSettings.ConflictResolutionPolicy.Mode);`
`500`		`- Assert.AreEqual(UriFactory.CreateStoredProcedureUri(databaseForConflicts.Id, containerName, sprocName), containerSettings.ConflictResolutionPolicy.ResolutionProcedure);`
	`500`	`+ Assert.AreEqual(UriFactory.CreateStoredProcedureUri(databaseForConflicts.Id, containerName, sprocName).ToString(), containerSettings.ConflictResolutionPolicy.ResolutionProcedure);`
`501`	`501`	`Assert.IsTrue(string.IsNullOrEmpty(containerSettings.ConflictResolutionPolicy.ResolutionPath));`
`502`	`502`	`}`
`503`	`503`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ await this.scripts.CreateTriggerStreamAsync(`
`153`	`153`	`}`
`154`	`154`
`155`	`155`
	`156`	`+ [TestMethod]`
`156`	`157`	`[DataRow(TriggerOperation.Create, false, DisplayName = "TriggerOperation - Create with Binary encoding disabled.")]`
`157`	`158`	`[DataRow(TriggerOperation.Create, true, DisplayName = "TriggerOperation - Create with Binary encoding enabled.")]`
`158`	`159`	`[DataRow(TriggerOperation.Upsert, false, DisplayName = "TriggerOperation - Upsert with Binary encoding disabled.")]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// ------------------------------------------------------------`
	`2`	`+// Copyright (c) Microsoft Corporation. All rights reserved.`
	`3`	`+// ------------------------------------------------------------`