Merge branch 'master' into users/kundadebdatta/update_msdata_direct_0…

…7_20_2023
Azure · Jul 20, 2023 · 750914c · 750914c
2 parents 946bc4a + 5ec7b4b
commit 750914c
Show file tree

Hide file tree

Showing 96 changed files with 7,959 additions and 709 deletions.
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -0,0 +1,57 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 9:0
+      filters:
+      - isOpen
+      - isIssue
+      - hasLabel:
+          label: needs-more-information
+      - noActivitySince:
+          days: 14
+      - isNotAssigned
+      actions:
+      - addReply:
+          reply: '@${issueAuthor} this issue requires more information for the team to be able to help. In case this information is available, please add it and re-open the Issue.'
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issues
+      - not: isAssignedToSomeone
+      - isAction:
+          action: Opened
+      - not:
+          hasLabel:
+            label: needs-investigation
+      then:
+      - addLabel:
+          label: needs-investigation
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: auto-merge
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: auto-merge
+      then:
+      - disableAutoMerge
+      description: 
+onFailure: 
+onSuccess: 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<ClientOfficialVersion>3.35.0</ClientOfficialVersion>
-		<ClientPreviewVersion>3.35.0</ClientPreviewVersion>
+		<ClientOfficialVersion>3.35.2</ClientOfficialVersion>
+		<ClientPreviewVersion>3.35.2</ClientPreviewVersion>
 		<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
-		<DirectVersion>3.31.2</DirectVersion>
+		<DirectVersion>3.31.3</DirectVersion>
 		<EncryptionOfficialVersion>2.0.2</EncryptionOfficialVersion>
 		<EncryptionPreviewVersion>2.0.2</EncryptionPreviewVersion>
 		<EncryptionPreviewSuffixVersion>preview</EncryptionPreviewSuffixVersion>
-		<CustomEncryptionVersion>1.0.0-preview05</CustomEncryptionVersion>
+		<CustomEncryptionVersion>1.0.0-preview06</CustomEncryptionVersion>
 		<HybridRowVersion>1.1.0-preview3</HybridRowVersion>
 		<LangVersion>10.0</LangVersion>
 		<AboveDirBuildProps>$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))</AboveDirBuildProps>

diff --git a/Microsoft.Azure.Cosmos.Encryption.Custom/changelog.md b/Microsoft.Azure.Cosmos.Encryption.Custom/changelog.md
@@ -3,6 +3,11 @@ 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="1.0.0-preview06"/> [1.0.0-preview06](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview06) - 2023-06-28
+
+#### Fixes 
+- [#3956](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3956) Updates package reference Microsoft.Azure.Cosmos to version 3.35.1-preview.
+
 ### <a name="1.0.0-preview05"/> [1.0.0-preview05](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview05) - 2023-04-27
 
 #### Fixes 

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
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' == 'True' ">
-      <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.26.0-preview" />
+      <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.1-preview" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">

diff --git a/....Custom/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.Custom.EmulatorTests.csproj b/....Custom/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.Custom.EmulatorTests.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>

diff --git a/...mos.Encryption/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.EmulatorTests.csproj b/...mos.Encryption/tests/EmulatorTests/Microsoft.Azure.Cosmos.Encryption.EmulatorTests.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/BenchmarkOperationType.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/BenchmarkOperationType.cs
@@ -0,0 +1,16 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+namespace CosmosBenchmark
+{
+    /// <summary>
+    /// Benchmark operation type.
+    /// </summary>
+    public enum BenchmarkOperationType
+    {
+        Read,
+        Insert,
+        Query
+    }
+}
diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/Fx/CosmosDiagnosticsLogger.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/Fx/CosmosDiagnosticsLogger.cs
@@ -6,11 +6,8 @@ namespace CosmosBenchmark
 {
     using System;
     using System.Collections.Concurrent;
-    using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
-    using System.Runtime.CompilerServices;
-    using System.Text;
     using Microsoft.Azure.Cosmos;
     using Newtonsoft.Json.Linq;
 

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/IBenchmarkOperation.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/IBenchmarkOperation.cs
@@ -6,10 +6,26 @@ namespace CosmosBenchmark
 {
     using System.Threading.Tasks;
 
+    /// <summary>
+    /// Represents the Benchmark operation.
+    /// </summary>
     internal interface IBenchmarkOperation
     {
-        Task PrepareAsync();
+        /// <summary>
+        /// Benchmark operation type.
+        /// </summary>
+        BenchmarkOperationType OperationType { get; }
 
+        /// <summary>
+        /// Executes Benchmark operation once asynchronously.
+        /// </summary>
+        /// <returns>The operation result wrapped by task.</returns>
         Task<OperationResult> ExecuteOnceAsync();
+
+        /// <summary>
+        /// Prepares Benchmark operation asynchronously.
+        /// </summary>
+        /// <returns>The task related to method's work.</returns>
+        Task PrepareAsync();
     }
 }
diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/InsertV2BenchmarkOperation.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/InsertV2BenchmarkOperation.cs
@@ -38,6 +38,8 @@ public InsertV2BenchmarkOperation(
             this.sampleJObject = JsonHelper.Deserialize<Dictionary<string, object>>(sampleJson);
         }
 
+        public BenchmarkOperationType OperationType => BenchmarkOperationType.Insert;
+
         public async Task<OperationResult> ExecuteOnceAsync()
         {
             ResourceResponse<Document> itemResponse = await this.documentClient.CreateDocumentAsync(

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/QueryStreamSinglePkV2BenchmarkOperation.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/QueryStreamSinglePkV2BenchmarkOperation.cs
@@ -47,6 +47,8 @@ public QueryStreamSinglePkV2BenchmarkOperation(
             this.containerUri = UriFactory.CreateDocumentCollectionUri(this.databsaeName, this.containerName);
         }
 
+        public BenchmarkOperationType OperationType => BenchmarkOperationType.Query;
+
         public async Task<OperationResult> ExecuteOnceAsync()
         {
             IDocumentQuery<dynamic> query = this.documentClient.CreateDocumentQuery<dynamic>(

diff --git a/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/QueryTSinglePkV2BenchmarkOperation.cs b/Microsoft.Azure.Cosmos.Samples/Tools/Benchmark/v2/QueryTSinglePkV2BenchmarkOperation.cs
@@ -46,6 +46,8 @@ public QueryTSinglePkV2BenchmarkOperation(
             this.sampleJObject[this.partitionKeyPath] = this.executionItemPartitionKey;
         }
 
+        public BenchmarkOperationType OperationType => BenchmarkOperationType.Query;
+
         public async Task<OperationResult> ExecuteOnceAsync()
         {
             IDocumentQuery<Dictionary<string, object>> query = this.documentClient.CreateDocumentQuery<Dictionary<string, object>>(
@@ -107,7 +109,7 @@ public async Task PrepareAsync()
                     new RequestOptions() { PartitionKey = new PartitionKey(this.executionItemPartitionKey) });
             if (itemResponse.StatusCode != HttpStatusCode.Created)
             {
-                throw new Exception($"Create failed with statuscode: {itemResponse.StatusCode}");
+                throw new Exception($"Create failed with status code: {itemResponse.StatusCode}");
             }
 
             this.initialized = true;