Merge commit '4284d27094146d0fd2a1c9a12b8059b67a660233'

.azure/pipelines/jobs/default-build.yml

@@ -106,7 +106,7 @@ jobs:
       # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
       pool:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
-          vmImage: macOS-13
+          vmImage: macOS-15
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           ${{ if eq(parameters.useHostedUbuntu, true) }}:
             vmImage: ubuntu-22.04
@@ -164,8 +164,8 @@ jobs:
         - script: df -h
           displayName: Disk size
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
-        - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
-          displayName: Use XCode 15.2.0
+        - script: sudo xcode-select -s /Applications/Xcode_16.4.0.app/Contents/Developer
+          displayName: Use XCode 16.4.0
       - checkout: self
         clean: true
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
@@ -323,7 +323,7 @@ jobs:
       pool:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
           name: Azure Pipelines
-          image: macOS-13
+          image: macOS-15
           os: macOS
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           name: $(DncEngInternalBuildPool)
@@ -391,8 +391,8 @@ jobs:
         - script: df -h
           displayName: Disk size
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
-        - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
-          displayName: Use XCode 15.2.0
+        - script: sudo xcode-select -s /Applications/Xcode_16.4.0.app/Contents/Developer
+          displayName: Use XCode 16.4.0
       - checkout: self
         clean: true
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:

eng/SourceBuildPrebuiltBaseline.xml

@@ -48,10 +48,10 @@
     <UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
 
     <!-- Used only for RepoTasks -->
-    <UsagePattern IdentityGlob="Microsoft.Build.Framework/17.8.29" />
-    <UsagePattern IdentityGlob="Microsoft.Build.Tasks.Core/17.8.29" />
-    <UsagePattern IdentityGlob="Microsoft.Build.Utilities.Core/17.8.29" />
-    <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.8.29" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Framework/17.8.43" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Tasks.Core/17.8.43" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Utilities.Core/17.8.43" />
+    <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.8.43" />
     <UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
   </IgnorePatterns>
 

eng/Version.Details.xml

@@ -388,39 +388,39 @@
       <Uri>https://github.com/dotnet/winforms</Uri>
       <Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25503.3">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25555.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
+      <Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0-preview.1.25475.1">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0-preview.1.25559.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
+      <Sha>7ddf87e16c92efd0d6d4b7da4a9ee7d185e8835f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0-preview.1.25475.1">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0-preview.1.25559.1">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31</Sha>
+      <Sha>7ddf87e16c92efd0d6d4b7da4a9ee7d185e8835f</Sha>
     </Dependency>
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
       <Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

@@ -143,8 +143,8 @@
     <SystemIOHashingVersion>9.0.12</SystemIOHashingVersion>
     <SystemRuntimeCachingVersion>9.0.12</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>9.10.0-preview.1.25475.1</MicrosoftExtensionsTimeProviderTestingVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>10.0.0-preview.1.25559.1</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>10.0.0-preview.1.25559.1</MicrosoftExtensionsTimeProviderTestingVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>9.0.12</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.12</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -166,10 +166,10 @@
     <NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
     <NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25503.3</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25503.3</MicrosoftSourceBuildIntermediatearcadeVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25555.4</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25555.4</MicrosoftSourceBuildIntermediatearcadeVersion>
     <!-- Packages from dotnet/source-build-externals -->
     <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/source-build-reference-packages -->
@@ -227,11 +227,11 @@
     <MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
     <!-- Partner teams -->
     <MicrosoftBCLHashCodeVersion>1.1.1</MicrosoftBCLHashCodeVersion>
-    <MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.8.43</MicrosoftBuildVersion>
     <MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
-    <MicrosoftBuildFrameworkVersion>17.8.29</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>17.8.29</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>17.8.29</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildFrameworkVersion>17.8.43</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildTasksCoreVersion>17.8.43</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.8.43</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
     <!--
       Temporarily override the Microsoft.NET.Test.Sdk version Arcade defaults to. That's incompatible w/ test

eng/common/core-templates/job/publish-build-assets.yml

@@ -145,6 +145,11 @@ jobs:
           PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
           is1ESPipeline: ${{ parameters.is1ESPipeline }}
 
+      # Darc is targeting 8.0, so make sure it's installed
+      - task: UseDotNet@2
+        inputs:
+          version: 8.0.x
+
       - task: AzureCLI@2
         displayName: Publish Using Darc
         inputs:

eng/common/core-templates/post-build/post-build.yml

@@ -305,6 +305,11 @@ stages:
 
         - task: NuGetAuthenticate@1
 
+        # Darc is targeting 8.0, so make sure it's installed
+        - task: UseDotNet@2
+          inputs:
+            version: 8.0.x
+
         - task: AzureCLI@2
           displayName: Publish Using Darc
           inputs:

global.json

@@ -27,7 +27,7 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25503.3"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4"
   }
 }

src/submodules/googletest

@@ -1 +1 @@
-Subproject commit 9706f75b8f91c52a3840cf5d878a7f37ea10ef00
+Subproject commit 6ec14dfd8c409d05fba94e18e3a02df35b874353