[release/8.0.3xx] Update dependencies from dotnet/arcade (#44062)

dotnet · Oct 11, 2024 · 3b21c49 · 3b21c49
2 parents 94cacc5 + cc42639
commit 3b21c49
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 18 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -5,12 +5,31 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-d667257-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-d667257-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
+    <add key="darc-pub-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-86f5186d/nuget/v3/index.json" />
     <add key="darc-int-dotnet-format-86f5186" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-format-86f5186-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-86f5186d-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
@@ -22,7 +41,7 @@
     <add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-81cabf2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
     <add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
@@ -34,6 +53,16 @@
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-10/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -60,10 +89,26 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="true" />
     <add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
+    <add key="darc-int-dotnet-format-86f5186-1" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-10" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-2" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-3" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-4" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-5" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-6" value="true" />
+    <add key="darc-int-dotnet-format-86f5186-9" value="true" />
     <add key="darc-int-dotnet-format-86f5186" value="true" />
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
@@ -73,14 +118,24 @@
     <add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
     <add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
     <add key="darc-int-dotnet-runtime-2aade6b" value="true" />
-    <add key="darc-int-dotnet-runtime-81cabf2" value="true" />
+    <add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
     <add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
     <add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
     <add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
     <add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
     <add key="darc-int-dotnet-runtime-e77011b" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-10" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-3" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-4" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-5" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-6" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-7" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-8" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-f655eec-9" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24504.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
+      <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24504.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
+      <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24504.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
+      <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24504.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24508.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>103916ccdbe7f4ab2e194068a1a3cd330542601f</Sha>
+      <Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.24504.2</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.24508.1</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24504.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24508.1</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
@@ -892,7 +892,7 @@ function IsWindowsPlatform() {
 }
 
 function Get-Darc($version) {
-  $darcPath  = "$TempDir\darc\$(New-Guid)"
+  $darcPath  = "$TempDir\darc\$([guid]::NewGuid())"
   if ($version -ne $null) {
     & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
   } else {

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.108",
+    "dotnet": "8.0.110",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1"
   }
 }
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs
@@ -100,8 +100,8 @@ public void ManagedWinRTComponentCanBeReferenced()
             managedWinRTComponent.AdditionalProperties.Add("CsWinRTComponent", "true");
             managedWinRTComponent.AdditionalProperties.Add("PlatformTarget", "x64");
 
-            //  TODO: Update to latest (currently 1.2.5) once it shows up on dotnet-public feed
-            managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "1.2.3"));
+            //  TODO: Update to latest (currently 2.1.1) once it shows up on dotnet-public feed
+            managedWinRTComponent.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "2.1.1"));
 
             managedWinRTComponent.SourceFiles["Coords.cs"] = @"using System;