Merger feature/9.x into release/9.x (#7119)

dotnet · Aug 7, 2024 · bee57c5 · bee57c5
2 parents 42a60ec + 672e221
commit bee57c5
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 33 deletions.
diff --git a/.github/dependabot.template.yml b/.github/dependabot.template.yml
@@ -52,8 +52,9 @@ updates:
     commit-message:
       prefix: #@ commit_prefix
     groups:
-      azure-storage-dependencies:
+      azure-sdk-dependencies:
         patterns:
+          - "Azure.Core"
           - "Azure.Storage.*"
       identity-dependencies:
         patterns:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -18,8 +18,9 @@ updates:
   commit-message:
     prefix: '[main] '
   groups:
-    azure-storage-dependencies:
+    azure-sdk-dependencies:
       patterns:
+      - Azure.Core
       - Azure.Storage.*
     identity-dependencies:
       patterns:
@@ -94,8 +95,9 @@ updates:
   commit-message:
     prefix: '[release/8.0] '
   groups:
-    azure-storage-dependencies:
+    azure-sdk-dependencies:
       patterns:
+      - Azure.Core
       - Azure.Storage.*
     identity-dependencies:
       patterns:
@@ -174,8 +176,9 @@ updates:
   commit-message:
     prefix: '[release/6.x] '
   groups:
-    azure-storage-dependencies:
+    azure-sdk-dependencies:
       patterns:
+      - Azure.Core
       - Azure.Storage.*
     identity-dependencies:
       patterns:

diff --git a/.github/workflows/add-markdown-feedback.yml b/.github/workflows/add-markdown-feedback.yml
@@ -47,7 +47,7 @@ jobs:
           git diff > ./pr/linter.diff
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
         with:
           name: pr-linter
           path: pr/
diff --git a/.github/workflows/lint-csharp.yml b/.github/workflows/lint-csharp.yml
@@ -48,7 +48,7 @@ jobs:
           git diff > ./pr/linter.diff
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
         with:
           name: pr-linter
           path: pr/
diff --git a/.github/workflows/scan-for-to-do-comments.yml b/.github/workflows/scan-for-to-do-comments.yml
@@ -27,7 +27,7 @@ jobs:
           COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a
         with:
           name: issue-todo
           path: issue/
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,13 +4,13 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>4e5de62265bf243bdb7b295ce0f6f06fceea83d1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24402.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24406.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>fb2a705b0a62b70ae350014990d78aa5af9fa74e</Sha>
+      <Sha>2c1994334add963416f2f4431152c58504fbc443</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24402.1">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24406.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>fb2a705b0a62b70ae350014990d78aa5af9fa74e</Sha>
+      <Sha>2c1994334add963416f2f4431152c58504fbc443</Sha>
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24324.3">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -22,29 +22,29 @@
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
       <Sha>b70b32099c2365092974f6786636e25ae507c8fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24401.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24405.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a3dae8d4fd5a17c147cbecfd31e61463731ac0cc</Sha>
+      <Sha>2c829550b968e29389ce8392244da2b006d71301</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24401.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24405.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a3dae8d4fd5a17c147cbecfd31e61463731ac0cc</Sha>
+      <Sha>2c829550b968e29389ce8392244da2b006d71301</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24401.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24405.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a3dae8d4fd5a17c147cbecfd31e61463731ac0cc</Sha>
+      <Sha>2c829550b968e29389ce8392244da2b006d71301</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24401.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24405.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a3dae8d4fd5a17c147cbecfd31e61463731ac0cc</Sha>
+      <Sha>2c829550b968e29389ce8392244da2b006d71301</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24401.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24405.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a3dae8d4fd5a17c147cbecfd31e61463731ac0cc</Sha>
+      <Sha>2c829550b968e29389ce8392244da2b006d71301</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.540201">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.540601">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>fb2a705b0a62b70ae350014990d78aa5af9fa74e</Sha>
+      <Sha>2c1994334add963416f2f4431152c58504fbc443</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.7.24401.8" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -48,17 +48,17 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- dotnet/arcade references -->
-    <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24401.1</MicrosoftDotNetBuildTasksArchivesVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24401.1</MicrosoftDotNetCodeAnalysisVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24401.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24405.1</MicrosoftDotNetBuildTasksArchivesVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24405.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24405.1</MicrosoftDotNetXUnitExtensionsVersion>
     <!-- dotnet/aspnetcore references -->
     <MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-preview.7.24402.2</MicrosoftAspNetCoreAppRuntimewinx64Version>
     <VSRedistCommonAspNetCoreSharedFrameworkx6490Version>9.0.0-preview.7.24402.2</VSRedistCommonAspNetCoreSharedFrameworkx6490Version>
     <!-- dotnet/command-line-api references -->
     <SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
     <!-- dotnet/diagnostics references -->
-    <MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24402.1</MicrosoftDiagnosticsMonitoringVersion>
-    <MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24402.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
+    <MicrosoftDiagnosticsMonitoringVersion>8.0.0-preview.24406.1</MicrosoftDiagnosticsMonitoringVersion>
+    <MicrosoftDiagnosticsMonitoringEventPipeVersion>8.0.0-preview.24406.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
     <!-- dotnet/roslyn-analyzers -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24402.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <!-- dotnet/runtime references -->
@@ -67,7 +67,7 @@
     <!-- dotnet/sdk references -->
     <VSRedistCommonNetCoreSdkPlaceholderx6490Version>9.0.100-preview.7.24402.8</VSRedistCommonNetCoreSdkPlaceholderx6490Version>
     <!-- dotnet/symstore references -->
-    <MicrosoftFileFormatsVersion>1.0.540201</MicrosoftFileFormatsVersion>
+    <MicrosoftFileFormatsVersion>1.0.540601</MicrosoftFileFormatsVersion>
   </PropertyGroup>
   <PropertyGroup Label="Runtime Versions">
     <MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>

diff --git a/eng/dependabot/independent/Packages.props b/eng/dependabot/independent/Packages.props
@@ -5,6 +5,7 @@
   -->
 
   <ItemGroup>
+    <PackageReference Include="Azure.Core" Version="$(AzureCoreVersion)" />
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
     <PackageReference Include="Azure.Storage.Blobs" Version="$(AzureStorageBlobsVersion)" />
     <PackageReference Include="Azure.Storage.Queues" Version="$(AzureStorageQueuesVersion)" />

diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props
@@ -2,12 +2,12 @@
   <!-- Import references updated by Dependabot. -->
 
   <PropertyGroup>
-    <AzureCoreVersion>1.41.0</AzureCoreVersion>
+    <AzureCoreVersion>1.42.0</AzureCoreVersion>
     <AzureIdentityVersion>1.12.0</AzureIdentityVersion>
     <AzureStorageBlobsVersion>12.21.1</AzureStorageBlobsVersion>
     <AzureStorageQueuesVersion>12.19.1</AzureStorageQueuesVersion>
     <MicrosoftIdentityWebVersion>3.0.1</MicrosoftIdentityWebVersion>
-    <MicrosoftOpenApiReadersVersion>1.6.16</MicrosoftOpenApiReadersVersion>
+    <MicrosoftOpenApiReadersVersion>1.6.17</MicrosoftOpenApiReadersVersion>
     <SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
 

diff --git a/global.json b/global.json
@@ -31,7 +31,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24401.1",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24405.1",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1"
   }
 }