Skip to content

Commit 062ea8a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/source-build-reference-packages (#3619)
[main] Source code updates from dotnet/source-build-reference-packages
1 parent 6d904e7 commit 062ea8a

951 files changed

Lines changed: 50336 additions & 57182 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/source-build-reference-packages/eng/Version.Details.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25567-106</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25567-106</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25567.106</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.3.25567.106</MicrosoftDotNetGenAPITaskPackageVersion>
13-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25567.106</MicrosoftNETCoreILAsmPackageVersion>
14-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25567.106</MicrosoftNETCoreILDAsmPackageVersion>
9+
<MicrosoftBuildPackageVersion>18.3.0-preview-25578-104</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>18.3.0-preview-25578-104</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.3.25578.104</MicrosoftDotNetGenAPITaskPackageVersion>
13+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreILAsmPackageVersion>
14+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>
1616
<!--Property group for alternate package version names-->
1717
<PropertyGroup>

‎src/source-build-reference-packages/eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="feff871cec763e9a9f8e9ace212f0fd6041d479f" BarId="291132" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1" BarId="292651" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25567-106">
5+
<Dependency Name="Microsoft.Build" Version="18.3.0-preview-25578-104">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
7+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25567-106">
9+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.3.0-preview-25578-104">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
11+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25567.106">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
15+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.3.25567.106">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.3.25578.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
19+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25567.106">
21+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25578.104">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
23+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25567.106">
25+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25578.104">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>feff871cec763e9a9f8e9ace212f0fd6041d479f</Sha>
27+
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
30-
</Dependencies>
30+
</Dependencies>

‎src/source-build-reference-packages/eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ jobs:
122122

123123
# Populate internal runtime variables.
124124
- template: /eng/common/templates/steps/enable-internal-sources.yml
125-
parameters:
126-
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127128

128129
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129130

‎src/source-build-reference-packages/eng/common/core-templates/job/source-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-mariner-2
66+
image: 1es-azurelinux-3
6767
os: linux
6868
${{ else }}:
6969
pool:

‎src/source-build-reference-packages/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, '') }}:

‎src/source-build-reference-packages/eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 6 additions & 5 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:
@@ -305,8 +305,9 @@ stages:
305305
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306306
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307307

308-
- task: NuGetAuthenticate@1 # Populate internal runtime variables.
308+
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
310311
- template: /eng/common/templates/steps/enable-internal-sources.yml
311312
parameters:
312313
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

‎src/source-build-reference-packages/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') }}:

‎src/source-build-reference-packages/eng/common/generate-sbom-prep.sh‎

100755100644
File mode changed.

‎src/source-build-reference-packages/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

‎src/source-build-reference-packages/eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
394394

395395
# If the version of msbuild is going to be xcopied,
396396
# 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'
397+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0
398+
$defaultXCopyMSBuildVersion = '18.0.0'
399399

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

0 commit comments

Comments
 (0)