Skip to content

Commit c660d59

Browse files
kotlarmiloskotlarmilos
authored
Merge branch 'net11.0' into feature/coreclr-r2r
2 parents ed6e4d6 + ce85d8e commit c660d59

File tree

9 files changed

+66
-55
lines changed

9 files changed

+66
-55
lines changed

‎eng/Version.Details.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25571.109</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13-
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETILLinkPackageVersion>
14-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETILLinkTasksPackageVersion>
15-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>10.0.100-rc.3.25571.109</MicrosoftNETSdkPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25571.109</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
11+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25603.102</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13+
<MicrosoftNETILLinkPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETILLinkPackageVersion>
14+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETILLinkTasksPackageVersion>
15+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.3.25603.102</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-alpha.25603.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet/macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.3.25571.109">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.3.25603.102">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
5+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.3.25571.109">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rc.3.25603.102">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
9+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.3.25571.109">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.3.25603.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
13+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.3.25571.109">
15+
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0-rc.3.25603.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
17+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
1818
</Dependency>
1919
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25571.109">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25603.102">
2121
<Uri>https://github.com/dotnet/dotnet</Uri>
22-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
22+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25571.109">
24+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25603.102">
2525
<Uri>https://github.com/dotnet/dotnet</Uri>
26-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
26+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
2727
</Dependency>
2828
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
2929
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
@@ -95,25 +95,25 @@
9595
</Dependency>
9696
</ProductDependencies>
9797
<ToolsetDependencies>
98-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25571.109">
98+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.25603.102">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
100+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25571.109">
102+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25603.102">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
104+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25571.109">
106+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-alpha.25603.102">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
108+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
109109
</Dependency>
110110
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
111111
<Uri>https://github.com/dotnet/xharness</Uri>
112112
<Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.109">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25603.102">
115115
<Uri>https://github.com/dotnet/dotnet</Uri>
116-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
116+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
</ToolsetDependencies>

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2022.amd64.open
28+
image: windows.vs2026preview.scout.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2022.amd64
31+
image: windows.vs2026preview.scout.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2022.amd64
134+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2022.amd64
178+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2022.amd64
239+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ parameters:
1313
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1414
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1515
microbuildUseESRP: true
16-
# Location of the MicroBuild output folder
17-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
18-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
16+
# Microbuild installation directory
17+
microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild
1918
# Microbuild version
2019
microbuildPluginVersion: 'latest'
2120

@@ -30,8 +29,27 @@ steps:
3029
inputs:
3130
packageType: sdk
3231
version: 8.0.x
33-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
32+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild
33+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
34+
35+
- script: |
36+
set -euo pipefail
37+
38+
# UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly
39+
version=$(dotnet --version)
40+
cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json
41+
{
42+
"sdk": {
43+
"version": "$version",
44+
"paths": [
45+
"${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild"
46+
],
47+
"errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin."
48+
}
49+
}
50+
EOF
51+
displayName: 'Add global.json to MicroBuild Installation path'
52+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3553
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3654
3755
- script: |
@@ -85,6 +103,7 @@ steps:
85103
zipSources: false
86104
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
87105
version: ${{ parameters.microbuildPluginVersion }}
106+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
88107
${{ if eq(parameters.microbuildUseESRP, true) }}:
89108
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
90109
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ try {
7070
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
7171
}
7272
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
73-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty
73+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty
7474
}
7575
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7676
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
157157
return $global:_DotNetInstallDir
158158
}
159159

160-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161-
$env:DOTNET_MULTILEVEL_LOOKUP=0
162-
163160
# Disable first run since we do not need all ASP.NET packages restored.
164161
$env:DOTNET_NOLOGO=1
165162

@@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
225222
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
226223
Write-PipelinePrependPath -Path $dotnetRoot
227224

228-
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
229225
Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
230226

231227
return $global:_DotNetInstallDir = $dotnetRoot
@@ -394,8 +390,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394390

395391
# If the version of msbuild is going to be xcopied,
396392
# use this version. Version matches a package here:
397-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16
398-
$defaultXCopyMSBuildVersion = '17.14.16'
393+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0
394+
$defaultXCopyMSBuildVersion = '18.0.0'
399395

400396
if (!$vsRequirements) {
401397
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎eng/common/tools.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ function InitializeDotNetCli {
115115

116116
local install=$1
117117

118-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
119-
export DOTNET_MULTILEVEL_LOOKUP=0
120-
121118
# Disable first run since we want to control all package sources
122119
export DOTNET_NOLOGO=1
123120

@@ -166,7 +163,6 @@ function InitializeDotNetCli {
166163
# build steps from using anything other than what we've downloaded.
167164
Write-PipelinePrependPath -path "$dotnet_root"
168165

169-
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
170166
Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
171167

172168
# return value

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.3.25571.109",
3+
"version": "10.0.100-rc.3.25603.102",
44
"paths": [
55
"builds/downloads/dotnet",
66
"$host$"
77
],
88
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
99
},
1010
"tools": {
11-
"dotnet": "10.0.100-rc.3.25571.109"
11+
"dotnet": "10.0.100-rc.3.25603.102"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.109"
14+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.102"
1515
}
1616
}

0 commit comments

Comments
 (0)