[Internal]Msdata/direct: Refactors msdata/direct refresh July 2025

.globalconfig

@@ -0,0 +1,13 @@
+# .NET code analysis rule set
+is_global = true
+
+# Current 
+dotnet_diagnostic.CDX1000.severity = error # DontConvertExceptionToObject
+dotnet_diagnostic.CDX1001.severity = error # DontUseExceptionInInterpolation
+dotnet_diagnostic.CDX1002.severity = error # DontUseExceptionStackTrace
+dotnet_diagnostic.CDX1003.severity = error # DontUseExceptionToString
+
+# 📊 Experimental Analyzer Features
+dotnet_diagnostic.CDX1004.severity = suggestion # Experimental - DontCreateNestedExceptions
+dotnet_diagnostic.CDX1005.severity = suggestion # Experimental - DontThrowExceptions
+dotnet_diagnostic.CDX1006.severity = suggestion # Experimental - DontCatchGenericExceptions

Directory.Build.props

@@ -1,14 +1,14 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<ClientOfficialVersion>3.47.1</ClientOfficialVersion>
-		<ClientPreviewVersion>3.48.0</ClientPreviewVersion>
+		<ClientOfficialVersion>3.52.1</ClientOfficialVersion>
+		<ClientPreviewVersion>3.53.0</ClientPreviewVersion>
 		<ClientPreviewSuffixVersion>preview.1</ClientPreviewSuffixVersion>
-		<DirectVersion>3.37.10</DirectVersion>
+		<DirectVersion>3.39.1</DirectVersion>
 		<FaultInjectionVersion>1.0.0</FaultInjectionVersion>
 		<FaultInjectionSuffixVersion>beta.0</FaultInjectionSuffixVersion>
-		<EncryptionOfficialVersion>2.0.4</EncryptionOfficialVersion>
+		<EncryptionOfficialVersion>2.0.5</EncryptionOfficialVersion>
 		<EncryptionPreviewVersion>2.1.0</EncryptionPreviewVersion>
-		<EncryptionPreviewSuffixVersion>preview4</EncryptionPreviewSuffixVersion>
+		<EncryptionPreviewSuffixVersion>preview5</EncryptionPreviewSuffixVersion>
 		<CustomEncryptionVersion>1.0.0-preview08</CustomEncryptionVersion>
 		<HybridRowVersion>1.1.0-preview3</HybridRowVersion>
 		<LangVersion>10.0</LangVersion>

Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj

@@ -13,7 +13,7 @@
     <Title>Microsoft Azure Cosmos DB client-side encryption library for multi-tenant</Title>
     <PackageId>Microsoft.Azure.Cosmos.Encryption.Custom</PackageId>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Azure/azure-cosmos-dotnet-v3</PackageProjectUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -32,10 +32,6 @@
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.41.0-preview.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\Icon.png" Pack="true" PackagePath=""/>
   </ItemGroup>

Microsoft.Azure.Cosmos.Encryption.Custom/tests/Microsoft.Azure.Cosmos.Encryption.Custom.Tests/Contracts/DotNetSDKEncryptionCustomAPI.json

@@ -1386,6 +1386,22 @@
       },
       "NestedTypes": {}
     },
+    "Microsoft.Azure.Cosmos.Encryption.Custom.JsonProcessor;System.Enum;IsAbstract:False;IsSealed:True;IsInterface:False;IsEnum:True;IsClass:False;IsValueType:True;IsNested:False;IsGenericType:False;IsSerializable:True": {
+      "Subclasses": {},
+      "Members": {
+        "Int32 value__": {
+          "Type": "Field",
+          "Attributes": [],
+          "MethodInfo": "Int32 value__;IsInitOnly:False;IsStatic:False;"
+        },
+        "Microsoft.Azure.Cosmos.Encryption.Custom.JsonProcessor Newtonsoft": {
+          "Type": "Field",
+          "Attributes": [],
+          "MethodInfo": "Microsoft.Azure.Cosmos.Encryption.Custom.JsonProcessor Newtonsoft;IsInitOnly:False;IsStatic:True;"
+        }
+      },
+      "NestedTypes": {}
+    },
     "Microsoft.Azure.Cosmos.Encryption.Custom.JsonProcessor;System.Enum;IsAbstract:False;IsSealed:True;IsInterface:False;IsEnum:True;IsClass:False;IsValueType:True;IsNested:False;IsGenericType:False;IsSerializable:True": {
       "Subclasses": {},
       "Members": {

Microsoft.Azure.Cosmos.Encryption/changelog.md

@@ -3,6 +3,18 @@ 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="2.0.5"/> [2.0.5](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.5) - 2025-05-23
+
+#### Added
+- [#5215](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/5215) Adds support for Microsoft.Azure.Cosmos from version 3.37.1 to 3.51.0 
+
+### <a name="2.1.0-preview5"/> [2.1.0-preview5](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.1.0-preview5) - 2025-05-23
+
+#### Added
+- [#5215](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/5215) Adds support for Microsoft.Azure.Cosmos 3.52.0-preview.0
+
+### <a name="2.0.3"/> [2.0.3](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.3) - 2023-07-12
+
 ### <a name="2.0.4"/> [2.0.4](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.4) - 2023-12-12
 
 #### Added

Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs

@@ -753,6 +753,22 @@ public override Task<IEnumerable<string>> GetPartitionKeyRangesAsync(
         {
             return this.Container.GetPartitionKeyRangesAsync(feedRange, cancellationToken);
         }
+
+        public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes<T>(string processorName, ChangeFeedHandler<ChangeFeedItem<T>> onChangesDelegate)
+        {
+            throw new NotImplementedException();
+        }
+#endif
+
+#if SDKPROJECTREF
+
+        public override Task<bool> IsFeedRangePartOfAsync(
+            Cosmos.FeedRange x,
+            Cosmos.FeedRange y,
+            CancellationToken cancellationToken = default)
+        {
+            throw new NotImplementedException();
+        }
 #endif
 
 #if SDKPROJECTREF

Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj

@@ -17,7 +17,7 @@
     <Title>Microsoft Azure Cosmos DB client-side encryption library</Title>
     <PackageId>Microsoft.Azure.Cosmos.Encryption</PackageId>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/Azure/azure-cosmos-dotnet-v3</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -29,19 +29,15 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' != 'True' ">
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="[3.35.4,3.37.0]" />
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="[3.51.0,)" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\Icon.png" Pack="true" PackagePath=""/>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' == 'True' ">
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.52.0-preview.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">

Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/BenchmarkConfig.cs

@@ -31,6 +31,20 @@ public class BenchmarkConfig
         [JsonIgnore]
         public string Key { get; set; }
 
+        [Option("isthinclientenabled", Required = false, HelpText = "ThinClient enabled")]
+        public string IsThinClientEnabledRaw { get; set; }
+        public bool IsThinClientEnabled => string.Equals(this.IsThinClientEnabledRaw, "true", StringComparison.OrdinalIgnoreCase);
+
+        [Option("isgatewaymodeenabled", Required = false, HelpText = "Gateway mode enabled")]
+        public string IsGatewayModeEnabledRaw { get; set; }
+        public bool IsGatewayModeEnabled => string.Equals(this.IsGatewayModeEnabledRaw, "true", StringComparison.OrdinalIgnoreCase);
+
+        [Option("isdirectmodeenabled", Required = false, HelpText = "Direct mode enabled")]
+        public string IsDirectModeEnabledRaw { get; set; }
+        public bool IsDirectModeEnabled => string.Equals(this.IsDirectModeEnabledRaw, "true", StringComparison.OrdinalIgnoreCase);
+
+
+
         [Option(Required = false, HelpText = "Workload Name, it will override the workloadType value in published results")]
         public string WorkloadName { get; set; }
 
@@ -209,7 +223,7 @@ private string GetUserAgentPrefix()
             return this.WorkloadName ?? this.WorkloadType ?? BenchmarkConfig.UserAgentSuffix;
         }
 
-        internal Microsoft.Azure.Cosmos.CosmosClient CreateCosmosClient(string accountKey)
+        internal Microsoft.Azure.Cosmos.CosmosClient CreateCosmosClient()
         {
             // Overwrite the default timespan if configured
             if(this.TelemetryScheduleInSec > 0)
@@ -223,6 +237,7 @@ internal Microsoft.Azure.Cosmos.CosmosClient CreateCosmosClient(string accountKe
                 MaxRetryAttemptsOnRateLimitedRequests = 0,
                 MaxRequestsPerTcpConnection = this.MaxRequestsPerTcpConnection,
                 MaxTcpConnectionsPerEndpoint = this.MaxTcpConnectionsPerEndpoint,
+                ConnectionMode = (this.IsThinClientEnabled || this.IsGatewayModeEnabled) ? Microsoft.Azure.Cosmos.ConnectionMode.Gateway: Microsoft.Azure.Cosmos.ConnectionMode.Direct,
                 CosmosClientTelemetryOptions = new Microsoft.Azure.Cosmos.CosmosClientTelemetryOptions()
                 {
                     DisableSendingMetricsToService = !this.EnableTelemetry,
@@ -243,7 +258,7 @@ internal Microsoft.Azure.Cosmos.CosmosClient CreateCosmosClient(string accountKe
 
             return new Microsoft.Azure.Cosmos.CosmosClient(
                         this.EndPoint,
-                        accountKey,
+                        this.Key,
                         clientOptions);
         }
 

Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/Program.cs

@@ -35,6 +35,8 @@ public static async Task Main(string[] args)
             try
             {
                 BenchmarkConfig config = BenchmarkConfig.From(args);
+                Environment.SetEnvironmentVariable("AZURE_COSMOS_THIN_CLIENT_ENABLED", config.IsThinClientEnabled.ToString());
+
                 await AddAzureInfoToRunSummary();
 
                 MeterProvider meterProvider = BuildMeterProvider(config);
@@ -71,6 +73,8 @@ public static async Task Main(string[] args)
             }
             finally
             {
+                Environment.SetEnvironmentVariable("AZURE_COSMOS_THIN_CLIENT_ENABLED", "False");
+
                 Utility.TeeTraceInformation($"{nameof(CosmosBenchmark)} completed successfully.");
                 if (Debugger.IsAttached)
                 {
@@ -144,7 +148,8 @@ private static async Task AddAzureInfoToRunSummary()
         private async Task<RunSummary> ExecuteAsync(BenchmarkConfig config)
         {
             // V3 SDK client initialization
-            using (CosmosClient cosmosClient = config.CreateCosmosClient(config.Key))
+
+            using (CosmosClient cosmosClient = config.CreateCosmosClient())
             {
                 Microsoft.Azure.Cosmos.Database database = cosmosClient.GetDatabase(config.Database);
                 if (config.CleanupOnStart)
@@ -219,8 +224,8 @@ private async Task<RunSummary> ExecuteAsync(BenchmarkConfig config)
                     Utility.TeeTraceInformation("Publishing results");
                     runSummary.Diagnostics = CosmosDiagnosticsLogger.GetDiagnostics();
                     await this.PublishResults(
-                        config, 
-                        runSummary, 
+                        config,
+                        runSummary,
                         cosmosClient);
                 }
 
@@ -376,7 +381,7 @@ private static async Task<Container> GetResultContainer(BenchmarkConfig config,
 
         private static void ClearCoreSdkListeners()
         {
-            Type defaultTrace = Type.GetType("Microsoft.Azure.Cosmos.Core.Trace.DefaultTrace,Microsoft.Azure.Cosmos.Client");
+            Type defaultTrace = Type.GetType("Microsoft.Azure.Cosmos.Core.Trace.DefaultTrace,Microsoft.Azure.Cosmos.Direct");
             TraceSource traceSource = (TraceSource)defaultTrace.GetProperty("TraceSource").GetValue(null);
             traceSource.Switch.Level = SourceLevels.All;
             traceSource.Listeners.Clear();

Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/RunSummary.cs

@@ -28,7 +28,6 @@ public RunSummary(
         public string Commit => this.BenchmarkConfig.CommitId;
         public string CommitDate => this.BenchmarkConfig.CommitDate;
         public string CommitTime => this.BenchmarkConfig.CommitTime;
-
         public string Remarks { get; set; }
         public string Date { get; }
         public string Time { get; }
@@ -59,8 +58,7 @@ public RunSummary(
         [JsonProperty]
         public static string Location { get; set; }
         [JsonProperty]
-        public static JObject AzureVmInfo { get; set; }
-
+        public static JObject AzureVmInfo { get; set; }
         public double Top10PercentAverageRps { get; set; }
         public double Top20PercentAverageRps { get; set; }
         public double Top30PercentAverageRps { get; set; }

Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/loop.sh

@@ -8,14 +8,33 @@ export PL=18
 export ACCOUNT_ENDPOINT=
 export ACCOUNT_KEY=
 
-#Loop forever
+# Loop forever
 i=0
 while :
 do
     #Kill any running processes
     pkill -f run.sh
     git pull origin master
 
+    # Distribute workload between modes
+    mode=$((i % 3))
+    if [ $mode -eq 0 ]; then
+        echo "Running in THINCLIENT mode"
+        export THINCLIENT_ENABLED=true
+        export GATEWAYMODE_ENABLED=false
+        export DIRECTMODE_ENABLED=false
+    elif [ $mode -eq 1 ]; then
+        echo "Running in GATEWAY mode"
+        export THINCLIENT_ENABLED=false
+        export GATEWAYMODE_ENABLED=true
+        export DIRECTMODE_ENABLED=false
+    else
+        echo "Running in DIRECT mode"
+        export THINCLIENT_ENABLED=false
+        export GATEWAYMODE_ENABLED=false
+        export DIRECTMODE_ENABLED=true
+    fi
+
     # Query operations take a long time
     # Only run them once every 10 runs
     if [ $(($i % 10)) -eq 0 ]; then
@@ -30,5 +49,5 @@ do
 
     echo "====== Waiting for 10Sec ================="
     sleep 10 #Wait for 10sec
-    
+
 done