Merge branch 'main' into fix/storage/resume-false-completion

amnguye · Jul 12, 2024 · 7036ae1 · 7036ae1
2 parents bc75d81 + dd1b7fc
commit 7036ae1
Show file tree

Hide file tree

Showing 2,006 changed files with 93,775 additions and 15,530 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1005,6 +1005,7 @@
 /eng/                                                              @hallipr @weshaggard @benbp
 /eng/common/                                                       @Azure/azure-sdk-eng
 /eng/mgmt/                                                         @ArthurMa1978 @m-nash
+/.github/workflows/                                                @Azure/azure-sdk-eng
 
 # Add owners for notifications for specific pipelines
 /eng/pipelines/aggregate-reports.yml                               @jsquire

diff --git a/.github/workflows/event-processor.yml b/.github/workflows/event-processor.yml
@@ -58,7 +58,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash
@@ -114,7 +114,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

diff --git a/.github/workflows/scheduled-event-processor.yml b/.github/workflows/scheduled-event-processor.yml
@@ -39,7 +39,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20240610.2
+          --version 1.0.0-dev.20240708.1
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

diff --git a/doc/dev/Versioning.md b/doc/dev/Versioning.md
@@ -45,8 +45,8 @@ They will use the following format which is also used by the .NET team:
 ```
 FILEMAJOR.FILEMINOR.FILEPATCH.FILEREVISION
 ```
-- `FILEMAJOR`: Specified in the first part of `VersionPrefix` property.
-- `FILEMINOR`: Set to `MINOR * 100 + PATCH / 100`, where `MINOR` and `PATCH` are the 2nd and 3rd parts of `VersionPrefix` property.
+- `FILEMAJOR`: Specified in the first part of `Version` property.
+- `FILEMINOR`: Set to `MINOR * 100 + PATCH / 100`, where `MINOR` and `PATCH` are the 2nd and 3rd parts of `Version` property.
 - `FILEPATCH`: Set to `(PATCH % 100) * 100 + yy`.
 - `FILEREVISION`: Set to `(50 * mm + dd) * 100 + r`. This algorithm makes it easy to parse the month and date from `FILEREVISION` while staying in the range of a short which is what a version element uses.
 

diff --git a/eng/Directory.Build.Common.props b/eng/Directory.Build.Common.props
@@ -77,7 +77,8 @@
       AZPROVISION001; <!-- Provisioning -->
     </NoWarn>
 
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <!-- Temporarily setting this to false while we resolve the security warning related to System.Text.Json -->
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <!-- 
       .NET 8 now produces security warnings for nuget packages in dotnet restore. Keep these as warnings in T1 to avoid needing to update T1 library dependencies.
       See: https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/dotnet-restore-audit#recommended-action

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -177,6 +177,10 @@
     <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
+    <PackageReference Update="OpenAI" Version="2.0.0-beta.7" />
+  </ItemGroup>
+
   <!--
     Dependency versions for Track 2, Microsoft.* libraries.
     These are dependencies for Track 2 integration packages
@@ -222,7 +226,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240701.2" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240711.1" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240429.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />