[net10.0] Update dependencies from dotnet/dotnet

eng/Version.Details.xml

@@ -1,25 +1,25 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.6.25302.103">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.6.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-preview.6.25302.103">
+    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-preview.6.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.6.25302.103">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.6.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25302.103">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25302.103">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.4" Version="18.4.9291">
@@ -55,31 +55,31 @@
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
       <Sha>797d30720e5e629d23eb146935da94cb1b61047e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-preview.6.25302.103">
+    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-preview.6.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25302.103">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25302.103">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-preview.5.25302.103">
+    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-preview.5.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25262.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>173a357c9d49136d9b7d49ca2bf9709a68067e19</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25302.103">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25303.102">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>d2434b1b5ed778f9869b1e51ba1df4bc3a64eda7</Sha>
+      <Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/Versions.props

@@ -2,18 +2,18 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- Versions updated by maestro -->
-    <MicrosoftNETSdkPackageVersion>10.0.100-preview.6.25302.103</MicrosoftNETSdkPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.6.25302.103</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETILLinkPackageVersion>10.0.0-preview.6.25302.103</MicrosoftNETILLinkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25302.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetSharedFrameworkSdkVersion>10.0.0-beta.25302.103</MicrosoftDotNetSharedFrameworkSdkVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25302.103</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-preview.6.25302.103</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
-    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.5.25302.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.100-preview.6.25303.102</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.6.25303.102</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>10.0.0-preview.6.25303.102</MicrosoftNETILLinkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetSharedFrameworkSdkVersion>10.0.0-beta.25303.102</MicrosoftDotNetSharedFrameworkSdkVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.6.25303.102</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-preview.6.25303.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
+    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.5.25303.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25302.103</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25303.102</MicrosoftDotNetCecilPackageVersion>
     <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25262.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25302.103</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25303.102</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- Manually updated versions -->
     <MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->

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

@@ -32,6 +32,12 @@ parameters:
   # Optional: 🌤️ or not the build has assets it wants to publish to BAR
   isAssetlessBuild: false
 
+  # Optional, publishing version
+  publishingVersion: 3
+
+  # Optional: A minimatch pattern for the asset manifests to publish to BAR
+  assetManifestsPattern: '*/manifests/**/*.xml'
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -77,13 +83,31 @@ jobs:
       clean: true
 
     - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: 
-      - task: DownloadPipelineArtifact@2
-        displayName: Download Asset Manifests
-        inputs:
-          artifactName: AssetManifests
-          targetPath: '$(Build.StagingDirectory)/AssetManifests'
-        condition: ${{ parameters.condition }}
-        continueOnError: ${{ parameters.continueOnError }}
+      - ${{ if eq(parameters.publishingVersion, 3) }}: 
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Asset Manifests
+          inputs:
+            artifactName: AssetManifests
+            targetPath: '$(Build.StagingDirectory)/AssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+      - ${{ if eq(parameters.publishingVersion, 4) }}:
+        - task: DownloadPipelineArtifact@2
+          displayName: Download V4 asset manifests
+          inputs:
+            itemPattern: '*/manifests/**/*.xml'
+            targetPath: '$(Build.StagingDirectory)/AllAssetManifests'
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
+        - task: CopyFiles@2
+          displayName: Copy V4 asset manifests to AssetManifests
+          inputs:
+            SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests'
+            Contents: ${{ parameters.assetManifestsPattern }}
+            TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
+            flattenFolders: true
+          condition: ${{ parameters.condition }}
+          continueOnError: ${{ parameters.continueOnError }}
 
     - task: NuGetAuthenticate@1
 
@@ -120,6 +144,17 @@ jobs:
             Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
           }
 
+    - ${{ if eq(parameters.publishingVersion, 4) }}:
+      - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
+        parameters:
+          is1ESPipeline: ${{ parameters.is1ESPipeline }}
+          args:
+            targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
+            artifactName: AssetManifests
+            displayName: 'Publish Merged Manifest'
+            retryCountOnTaskFailure: 10 # for any logs being locked
+            sbomEnabled: false  # we don't need SBOM for logs
+
     - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
       parameters:
         is1ESPipeline: ${{ parameters.is1ESPipeline }}

eng/common/tools.sh

@@ -528,6 +528,7 @@ function GetDarc {
     fi
 
     "$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version
+    darc_tool="$darc_path/darc"
 }
 
 # Returns a full path to an Arcade SDK task project file.

eng/common/vmr-sync.ps1

@@ -103,14 +103,14 @@ Set-StrictMode -Version Latest
 Highlight 'Installing .NET, preparing the tooling..'
 . .\eng\common\tools.ps1
 $dotnetRoot = InitializeDotNetCli -install:$true
+$darc = Get-Darc
 $dotnet = "$dotnetRoot\dotnet.exe"
-& "$dotnet" tool restore
 
 Highlight "Starting the synchronization of VMR.."
 
 # Synchronize the VMR
 $darcArgs = (
-  "darc", "vmr", "forwardflow",
+  "vmr", "forwardflow",
   "--tmp", $tmpDir,
   "--$verbosity",
   $vmrDir
@@ -124,7 +124,7 @@ if ($azdevPat) {
   $darcArgs += ("--azdev-pat", $azdevPat)
 }
 
-& "$dotnet" $darcArgs
+& "$darc" $darcArgs
 
 if ($LASTEXITCODE -eq 0) {
   Highlight "Synchronization succeeded"

eng/common/vmr-sync.sh

@@ -164,9 +164,9 @@ set -e
 highlight 'Installing .NET, preparing the tooling..'
 source "./eng/common/tools.sh"
 InitializeDotNetCli true
+GetDarc
 dotnetDir=$( cd ./.dotnet/; pwd -P )
 dotnet=$dotnetDir/dotnet
-"$dotnet" tool restore
 
 highlight "Starting the synchronization of VMR.."
 set +e
@@ -186,7 +186,9 @@ fi
 
 # Synchronize the VMR
 
-"$dotnet" darc vmr forwardflow \
+export DOTNET_ROOT="$dotnetDir"
+
+"$darc_tool" vmr forwardflow \
   --tmp "$tmp_dir"             \
   $azdev_pat                   \
   --$verbosity                 \

global.json

@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25302.103"
+    "version": "10.0.100-preview.6.25303.102"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25302.103"
+    "dotnet": "10.0.100-preview.6.25303.102"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25302.103"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102"
   }
 }