diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index a85638a2d24..6307c04e50c 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -549,9 +549,6 @@ extends:
os: windows
workspace:
clean: all
- variables:
- - ${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
- - group: Publish-Build-Assets
templateContext:
outputs:
- output: artifactsDrop
@@ -566,6 +563,12 @@ extends:
clean: true
submodules: recursive
+ - task: UseDotNet@2
+ displayName: Install .NET 9.x
+ inputs:
+ version: 9.x
+ includePreviewVersions: true
+
# Download symbols to be published to the symbols artifact drop declared above
- task: DownloadPipelineArtifact@2
inputs:
@@ -599,23 +602,30 @@ extends:
arguments: -c $(XA.Build.Configuration) -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\bootstrap.binlog
condition: and(succeeded(), eq('${{ parameters.pushXAPackagesToMaestro }}', 'true'))
- - task: DotNetCoreCLI@2
+ - task: AzureCLI@2
displayName: generate and publish BAR manifest
inputs:
- projects: $(System.DefaultWorkingDirectory)\build-tools\create-packs\Microsoft.Android.Sdk.proj
- arguments: >-
+ azureSubscription: "Darc: Maestro Production"
+ scriptType: ps
+ scriptLocation: inlineScript
+ inlineScript: >-
+ dotnet build $(System.DefaultWorkingDirectory)\build-tools\create-packs\Microsoft.Android.Sdk.proj
-t:PushManifestToBuildAssetRegistry
- -p:BuildAssetRegistryToken=$(MaestroAccessToken)
-p:OutputPath=$(Build.StagingDirectory)\nuget-signed\
-c $(XA.Build.Configuration) -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\push-bar-manifest.binlog
condition: and(succeeded(), eq('${{ parameters.pushXAPackagesToMaestro }}', 'true'))
- - powershell: |
- $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
- $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
- $arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
- & dotnet tool update microsoft.dotnet.darc --version "$darcVersion" --add-source "$arcadeServicesSource" --tool-path $(Agent.ToolsDirectory)\darc -v n
- & $(Agent.ToolsDirectory)\darc\darc add-build-to-channel --default-channels --id $(BARBuildId) --publishing-infra-version 3 --password $(MaestroAccessToken) --azdev-pat $(publishing-dnceng-devdiv-code-r-build-re)
+ - task: AzureCLI@2
+ inputs:
+ azureSubscription: "Darc: Maestro Production"
+ scriptType: ps
+ scriptLocation: inlineScript
+ inlineScript: |
+ $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
+ $darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
+ $arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
+ & dotnet tool update microsoft.dotnet.darc --version "$darcVersion" --add-source "$arcadeServicesSource" --tool-path $(Agent.ToolsDirectory)\darc -v n
+ & $(Agent.ToolsDirectory)\darc\darc add-build-to-channel --default-channels --id $(BARBuildId) --ci --publishing-infra-version 3 --azdev-pat $(System.AccessToken)
displayName: add build to default darc channel
condition: and(succeeded(), eq('${{ parameters.pushXAPackagesToMaestro }}', 'true'))
diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
index 44a5d06c00a..9062956cbae 100644
--- a/build-tools/create-packs/Directory.Build.targets
+++ b/build-tools/create-packs/Directory.Build.targets
@@ -163,7 +163,7 @@
-
+
@@ -192,7 +192,7 @@
- https://github.com/dotnet/arcade
70831f0d126fe88b81d7dc8de11358e17a5ce364
-
+
https://github.com/dotnet/arcade
- 67d23f4ba1813b315e7e33c71d18b63475f5c5f8
+ 60ae233c3d77f11c5fdb53e570b64d503b13ba59
https://github.com/dotnet/templating
diff --git a/eng/Versions.props b/eng/Versions.props
index c3f859b2ccb..71bbba8a538 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,7 +6,7 @@
9.0.0-rc.1.24408.12
9.0.0-rc.1.24408.12
7.0.0-beta.22103.1
- 8.0.0-beta.24225.1
+ 9.0.0-beta.24408.2
9.0.0-rc.1.24402.2
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)
7.0.100-rc.1.22410.7