Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ This file should be imported by eng/Versions.props
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0</SystemWindowsExtensionsPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25608.6</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25608.6</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25608.6</MicrosoftDotNetXliffTasksPackageVersion>
<!-- dotnet/symreader dependencies -->
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
<!-- dotnet/arcade-services dependencies -->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25603.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25608.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9851192f7f7a7ee352358cce2627160fd1f2a54e</Sha>
<Sha>17c915fe8e3094d636fb256f2c2860f38ea7b121</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25603.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25608.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9851192f7f7a7ee352358cce2627160fd1f2a54e</Sha>
<Sha>17c915fe8e3094d636fb256f2c2860f38ea7b121</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
<Uri>https://github.com/dotnet/symreader</Uri>
Expand All @@ -131,9 +131,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25603.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25608.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9851192f7f7a7ee352358cce2627160fd1f2a54e</Sha>
<Sha>17c915fe8e3094d636fb256f2c2860f38ea7b121</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25161.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down Expand Up @@ -41,4 +41,4 @@ jobs:

- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
binLogPath: ${{ parameters.binLogPath }}
binLogPath: ${{ parameters.binLogPath }}
4 changes: 0 additions & 4 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"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"
},
"vswhere": "3.1.7",
"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"
}
}