Merge branch 'users/sakulk/bugfixes2' of https://github.com/Azure/azu…

…re-cosmos-dotnet-v3 into users/sakulk/bugfixes2
Azure · Aug 19, 2021 · a286881 · a286881
2 parents 5196d60 + 7607b97
commit a286881
Show file tree

Hide file tree

Showing 59 changed files with 678 additions and 611 deletions.
diff --git a/...mos.Encryption/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.EmulatorTests.csproj b/...mos.Encryption/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.EmulatorTests.csproj
@@ -3,7 +3,7 @@
     <IsTestProject>true</IsTestProject>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Platform>AnyCPU</Platform>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>Microsoft.Azure.Cosmos</RootNamespace>

diff --git a/...ption/tests/Microsoft.Azure.Cosmos.Encryption.Tests/Contracts/DotNetSDKEncryptionAPI.json b/...ption/tests/Microsoft.Azure.Cosmos.Encryption.Tests/Contracts/DotNetSDKEncryptionAPI.json
@@ -1193,9 +1193,11 @@
       "Attributes": [],
       "MethodInfo": "System.String ToString();IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
     },
-    "System.Type GetType()": {
+    "System.Type GetType()[System.Runtime.CompilerServices.NullableContextAttribute((Byte)1)]": {
       "Type": "Method",
-      "Attributes": [],
+      "Attributes": [
+        "NullableContextAttribute"
+      ],
       "MethodInfo": "System.Type GetType();IsAbstract:False;IsStatic:False;IsVirtual:False;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
     },
     "Void .ctor()": {

diff --git a/...ts/Microsoft.Azure.Cosmos.Encryption.Tests/Microsoft.Azure.Cosmos.Encryption.Tests.csproj b/...ts/Microsoft.Azure.Cosmos.Encryption.Tests/Microsoft.Azure.Cosmos.Encryption.Tests.csproj
@@ -4,7 +4,7 @@
     <IsTestProject>true</IsTestProject>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Platform>AnyCPU</Platform>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>Microsoft.Azure.Cosmos.Encryption.Tests</RootNamespace>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/AzureFunctions/AzureFunctions.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/AzureFunctions/AzureFunctions.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
     <AssemblyName>Cosmos.Samples.AzureFunctions</AssemblyName>
     <RootNamespace>Cosmos.Samples.AzureFunctions</RootNamespace>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/BulkSupport/BulkSupport.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/BulkSupport/BulkSupport.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Cosmos.Samples.BulkSupport</AssemblyName>
     <RootNamespace>Cosmos.Samples.BulkSupport</RootNamespace>
     <LangVersion>latest</LangVersion>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ChangeFeed/ChangeFeed.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ChangeFeed/ChangeFeed.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Cosmos.Samples.ChangeFeed</AssemblyName>
     <RootNamespace>Cosmos.Samples.ChangeFeed</RootNamespace>
     <LangVersion>latest</LangVersion>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ContainerManagement/ContainerManagement.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ContainerManagement/ContainerManagement.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/CustomSerialization/CustomSerialization.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/CustomSerialization/CustomSerialization.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/DatabaseManagement/DatabaseManagement.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/DatabaseManagement/DatabaseManagement.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/Encryption/Encryption.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/Encryption/Encryption.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Cosmos.Samples.Encryption</AssemblyName>
     <RootNamespace>Cosmos.Samples.Encryption</RootNamespace>
     <LangVersion>latest</LangVersion>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/Geospatial/Geospatial.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/Geospatial/Geospatial.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>netcoreapp2.1</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/Handlers/HandlerSample.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/Handlers/HandlerSample.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyName>Cosmos.Samples.Handlers</AssemblyName>
     <RootNamespace>Cosmos.Samples.Handlers</RootNamespace>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/HttpClientFactory/HttpClientFactory.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/HttpClientFactory/HttpClientFactory.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/IndexManagement/IndexManagement.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/IndexManagement/IndexManagement.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ItemManagement/ItemManagement.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ItemManagement/ItemManagement.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...Cosmos.Samples/Usage/NonPartitionContainerMigration/NonPartitionContainerMigration.csproj b/...Cosmos.Samples/Usage/NonPartitionContainerMigration/NonPartitionContainerMigration.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/PowerShellRestApi/PowerShellRestApi.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/PowerShellRestApi/PowerShellRestApi.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/Queries/Queries.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/Queries/Queries.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/ServerSideScripts/ServerSideScripts.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/ServerSideScripts/ServerSideScripts.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/SystemTextJson/SystemTextJson.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/SystemTextJson/SystemTextJson.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Cosmos.Samples.SystemTextJson</AssemblyName>
     <RootNamespace>Cosmos.Samples.SystemTextJson</RootNamespace>
     <LangVersion>latest</LangVersion>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/TransactionalBatch/TransactionalBatch.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/TransactionalBatch/TransactionalBatch.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Cosmos.Samples.TransactionalBatch</AssemblyName>
     <RootNamespace>Cosmos.Samples.TransactionalBatch</RootNamespace>
     <LangVersion>latest</LangVersion>

diff --git a/Microsoft.Azure.Cosmos.Samples/Usage/UserManagement/UserManagement.csproj b/Microsoft.Azure.Cosmos.Samples/Usage/UserManagement/UserManagement.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/ChangeFeedProcessorContext.cs b/Microsoft.Azure.Cosmos/src/ChangeFeedProcessor/ChangeFeedProcessorContext.cs
@@ -7,13 +7,7 @@ namespace Microsoft.Azure.Cosmos
     /// <summary>
     /// Context that is related to the set of delivered changes.
     /// </summary>
-
-#if PREVIEW
-    public
-#else
-    internal
-#endif
-    abstract class ChangeFeedProcessorContext
+    public abstract class ChangeFeedProcessorContext
     {
         /// <summary>
         /// Gets the token representative of the current lease from which the changes come from.

diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryFeature.cs b/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryFeature.cs
@@ -27,5 +27,6 @@ enum QueryFeatures : ulong
         OrderBy = 1 << 7,
         Top = 1 << 8,
         NonValueAggregate = 1 << 9,
+        DCount = 1 << 10
     }
 }
diff --git a/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryPlanRetriever.cs b/Microsoft.Azure.Cosmos/src/Query/Core/QueryPlan/QueryPlanRetriever.cs
@@ -26,7 +26,8 @@ internal static class QueryPlanRetriever
             | QueryFeatures.OffsetAndLimit
             | QueryFeatures.OrderBy
             | QueryFeatures.Top
-            | QueryFeatures.NonValueAggregate;
+            | QueryFeatures.NonValueAggregate
+            | QueryFeatures.DCount;
 
         private static readonly string SupportedQueryFeaturesString = SupportedQueryFeatures.ToString();
 

diff --git a/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs b/Microsoft.Azure.Cosmos/src/Resource/ClientContextCore.cs
@@ -116,7 +116,8 @@ internal static CosmosClientContext Create(
                      userAgent: connectionPolicy.UserAgentContainer.UserAgent,
                      connectionMode: connectionPolicy.ConnectionMode,
                      authorizationTokenProvider: cosmosClient.AuthorizationTokenProvider,
-                     diagnosticsHelper: DiagnosticsHandlerHelper.Instance());
+                     diagnosticsHelper: DiagnosticsHandlerHelper.Instance(),
+                     preferredRegions: clientOptions.ApplicationPreferredRegions);
             } 
             else
             {