diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f36c71f90776..e63dc7c5b4c9a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,6 +70,12 @@ variables: ${{ else }}: value: windows.vs2022.amd64 + - name: Vs2026PreviewQueueName + ${{ if eq(variables['System.TeamProject'], 'public') }}: + value: windows.vs2026preview.scout.amd64.open + ${{ else }}: + value: windows.vs2026preview.scout.amd64 + - name: UbuntuQueueName ${{ if eq(variables['System.TeamProject'], 'public') }}: value: Build.Ubuntu.2204.Amd64.Open @@ -129,16 +135,11 @@ parameters: type: object default: vmImage: macOS-15 - - name: vs2022PreviewPool - type: object - default: - name: $(PoolName) - demands: ImageOverride -equals $(Vs2022PreviewQueueName) - - name: vs2022RegularPool + - name: vs2026PreviewPool type: object default: name: $(PoolName) - demands: ImageOverride -equals $(Vs2022RegularQueueName) + demands: ImageOverride -equals $(Vs2026PreviewQueueName) stages: - stage: Windows_Debug_Build @@ -149,7 +150,7 @@ stages: jobName: Build_Windows_Debug testArtifactName: Transport_Artifacts_Windows_Debug configuration: Debug - poolParameters: ${{ parameters.vs2022PreviewPool }} + poolParameters: ${{ parameters.vs2026PreviewPool }} restoreArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false buildArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false /p:PublishReadyToRun=false @@ -161,7 +162,7 @@ stages: jobName: Build_Windows_Release testArtifactName: Transport_Artifacts_Windows_Release configuration: Release - poolParameters: ${{ parameters.vs2022PreviewPool }} + poolParameters: ${{ parameters.vs2026PreviewPool }} restoreArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false buildArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false /p:PublishReadyToRun=false @@ -313,7 +314,7 @@ stages: jobName: Test_Windows_CoreClr_Debug_Single_Machine testArtifactName: Transport_Artifacts_Windows_Debug configuration: Debug - poolParameters: ${{ parameters.vs2022RegularPool }} + poolParameters: ${{ parameters.vs2026PreviewPool }} testArguments: -testCoreClr - template: eng/pipelines/test-windows-job.yml @@ -440,7 +441,7 @@ stages: - job: Correctness_Build_Artifacts dependsOn: Determine_Changes - pool: ${{ parameters.vs2022PreviewPool }} + pool: ${{ parameters.vs2026PreviewPool }} timeoutInMinutes: 90 variables: - template: eng/pipelines/variables-build.yml @@ -510,7 +511,7 @@ stages: - job: Correctness_Determinism dependsOn: Determine_Changes condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true')) - pool: ${{ parameters.vs2022PreviewPool }} + pool: ${{ parameters.vs2026PreviewPool }} timeoutInMinutes: 90 variables: - template: eng/pipelines/variables-build.yml @@ -535,7 +536,7 @@ stages: - job: Correctness_Bootstrap_Build_Default dependsOn: Determine_Changes condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true')) - pool: ${{ parameters.vs2022PreviewPool }} + pool: ${{ parameters.vs2026PreviewPool }} timeoutInMinutes: 90 variables: - template: eng/pipelines/variables-build.yml @@ -549,7 +550,7 @@ stages: - job: Correctness_Bootstrap_Build_Framework dependsOn: Determine_Changes condition: ne(variables['Build.Reason'], 'PullRequest') - pool: ${{ parameters.vs2022PreviewPool }} + pool: ${{ parameters.vs2026PreviewPool }} timeoutInMinutes: 90 variables: - template: eng/pipelines/variables-build.yml @@ -572,7 +573,7 @@ stages: - job: Correctness_Rebuild dependsOn: Determine_Changes condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true')) - pool: ${{ parameters.vs2022PreviewPool }} + pool: ${{ parameters.vs2026PreviewPool }} timeoutInMinutes: 90 variables: - template: eng/pipelines/variables-build.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 392703115cdf4..dd0e692b60dbe 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -39,9 +39,9 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 - 11.0.0-beta.25603.2 - 11.0.0-beta.25603.2 - 11.0.0-beta.25603.2 + 11.0.0-beta.25608.6 + 11.0.0-beta.25608.6 + 11.0.0-beta.25608.6 2.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61966a0ff37f8..3d666c18f6e13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,13 +115,13 @@ - + https://github.com/dotnet/arcade - 9851192f7f7a7ee352358cce2627160fd1f2a54e + 17c915fe8e3094d636fb256f2c2860f38ea7b121 - + https://github.com/dotnet/arcade - 9851192f7f7a7ee352358cce2627160fd1f2a54e + 17c915fe8e3094d636fb256f2c2860f38ea7b121 https://github.com/dotnet/symreader @@ -131,9 +131,9 @@ https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/arcade - 9851192f7f7a7ee352358cce2627160fd1f2a54e + 17c915fe8e3094d636fb256f2c2860f38ea7b121 https://github.com/dotnet/arcade-services diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 58b7a76814e08..76baf5c27258f 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbde..1556562c68f0c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. $env:DOTNET_NOLOGO=1 @@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0f4..6c121300ac7da 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -115,9 +115,6 @@ function InitializeDotNetCli { local install=$1 - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources export DOTNET_NOLOGO=1 @@ -166,7 +163,6 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value diff --git a/global.json b/global.json index e0bf13b4cfac7..ee5fa4f61aea9 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "allowPrerelease": false, "rollForward": "patch" }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107", + "dotnet": "10.0.100", "vs": { "version": "17.14.0" }, @@ -13,8 +13,8 @@ "xcopy-msbuild": "17.14.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.2", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.6", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25608.6", "Microsoft.Build.Traversal": "3.4.0" } }