Skip to content

Commit d52dadd

Browse files
[rel/18.3] Update dependencies from dotnet/arcade (#15389)
* Update dependencies from https://github.com/dotnet/arcade build 20260130.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25612.6 -> To Version 10.0.0-beta.26080.4 * Set dotnet root --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: nohwnd <me@jakubjares.com>
1 parent 41f7799 commit d52dadd

26 files changed

+346
-349
lines changed

azure-pipelines-official.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ parameters:
4747
displayName: "Skip tests"
4848
type: boolean
4949
default: False
50+
- name: codeQLForce
51+
displayName: "Try collecting CodeQL before default CodeQL cadence"
52+
type: boolean
53+
default: False
5054

5155
- name: otherOsPools
5256
type: object
@@ -85,6 +89,13 @@ variables:
8589
- name: _ReleaseVersionKind
8690
value: release
8791

92+
# Set to 0 to force CodeQL scan without waiting 72 from last attempt (even if it failed).
93+
# This is only a hint for the tool, it might reject to run it if it already has up to date data.
94+
# See the Starting Code QL step for details.
95+
- ${{ if eq(parameters.codeQLForce, True) }}:
96+
- name: Codeql.Cadence
97+
value: 0
98+
8899
# Group gives access to $microsoft-symbol-server-pat and $symweb-symbol-server-pat
89100
- group: DotNet-Symbol-Server-Pats
90101
# Group gives access to $dn-bot-devdiv-drop-rw-code-rw and dn-bot-dnceng-build-rw-code-rw
@@ -243,6 +254,8 @@ extends:
243254
--performanceTest
244255
name: Test
245256
displayName: Test
257+
env:
258+
DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
246259

247260
# This step is only helpful for diagnosing some issues with vstest/test host that would not appear
248261
# through the console or trx

azure-pipelines.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ stages:
156156
value: Release
157157
strategy:
158158
matrix:
159-
Ubuntu_22_04:
159+
ubuntu:
160160
vmImage: ubuntu-22.04
161161
pwsh: true
162-
macOS_12:
162+
macOS:
163163
vmImage: macos-14
164164
pwsh: true
165165
pool:
@@ -191,6 +191,8 @@ stages:
191191
--performanceTest
192192
name: Test
193193
displayName: Test
194+
env:
195+
DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
194196

195197
# This step is only helpful for diagnosing some issues with vstest/test host that would not appear
196198
# through the console or trx

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This file should be imported by eng/Versions.props
1414
<!-- dotnet/core-setup dependencies -->
1515
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
1616
<!-- dotnet/arcade dependencies -->
17-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25612.6</MicrosoftDotNetArcadeSdkPackageVersion>
17+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26080.4</MicrosoftDotNetArcadeSdkPackageVersion>
1818
<!-- dotnet/symreader-converter dependencies -->
1919
<MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
2020
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25612.6">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26080.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>8adf115288fa51feaa30d063b946478054c7f7b4</Sha>
27+
<Sha>b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
3030
<Uri>https://github.com/dotnet/symreader-converter</Uri>

eng/common/SetupNugetSources.ps1

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3-
# disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45
#
56
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174
}
174175
}
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179+
if ($dotnetEngSource -ne $null) {
180+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181+
}
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185+
if ($dotnetToolsSource -ne $null) {
186+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187+
}
188+
176189
$doc.Save($filename)

eng/common/SetupNugetSources.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5-
# disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67
#
78
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89
#
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
173174
fi
174175
done
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179+
if [ "$?" == "0" ]; then
180+
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181+
fi
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185+
if [ "$?" == "0" ]; then
186+
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187+
fi
188+
176189
# I want things split line by line
177190
PrevIFS=$IFS
178191
IFS=$'\n'

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runtime_source_feed=''
9292
runtime_source_feed_key=''
9393

9494
properties=()
95-
while [[ $# -gt 0 ]]; do
95+
while [[ $# > 0 ]]; do
9696
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9797
case "$opt" in
9898
-help|-h)

eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22-
enablePreviewMicrobuild: false
23-
microbuildPluginVersion: 'latest'
2422
enableMicrobuildForMacAndLinux: false
2523
microbuildUseESRP: true
2624
enablePublishBuildArtifacts: false
@@ -73,8 +71,6 @@ jobs:
7371
templateContext: ${{ parameters.templateContext }}
7472

7573
variables:
76-
- name: AllowPtrToDetectTestRunRetryFiles
77-
value: true
7874
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7975
- name: DOTNET_CLI_TELEMETRY_PROFILE
8076
value: '$(Build.Repository.Uri)'
@@ -132,8 +128,6 @@ jobs:
132128
- template: /eng/common/core-templates/steps/install-microbuild.yml
133129
parameters:
134130
enableMicrobuild: ${{ parameters.enableMicrobuild }}
135-
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
136-
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
137131
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
138132
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
139133
continueOnError: ${{ parameters.continueOnError }}
@@ -159,8 +153,6 @@ jobs:
159153
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
160154
parameters:
161155
enableMicrobuild: ${{ parameters.enableMicrobuild }}
162-
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
163-
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
164156
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
165157
continueOnError: ${{ parameters.continueOnError }}
166158

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,15 +117,15 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123123
# Populate internal runtime variables.
124124
- template: /eng/common/templates/steps/enable-internal-sources.yml
125125
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126126
parameters:
127127
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
128-
128+
129129
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
130130

131131
- task: AzureCLI@2
@@ -145,7 +145,7 @@ jobs:
145145

146146
condition: ${{ parameters.condition }}
147147
continueOnError: ${{ parameters.continueOnError }}
148-
148+
149149
- task: powershell@2
150150
displayName: Create ReleaseConfigs Artifact
151151
inputs:
@@ -173,7 +173,7 @@ jobs:
173173
artifactName: AssetManifests
174174
displayName: 'Publish Merged Manifest'
175175
retryCountOnTaskFailure: 10 # for any logs being locked
176-
sbomEnabled: false # we don't need SBOM for logs
176+
sbomEnabled: false # we don't need SBOM for logs
177177

178178
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
179179
parameters:
@@ -190,7 +190,7 @@ jobs:
190190
BARBuildId: ${{ parameters.BARBuildId }}
191191
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
192192
is1ESPipeline: ${{ parameters.is1ESPipeline }}
193-
193+
194194
# Darc is targeting 8.0, so make sure it's installed
195195
- task: UseDotNet@2
196196
inputs:
@@ -218,4 +218,4 @@ jobs:
218218
- template: /eng/common/core-templates/steps/publish-logs.yml
219219
parameters:
220220
is1ESPipeline: ${{ parameters.is1ESPipeline }}
221-
JobLabel: 'Publish_Artifacts_Logs'
221+
JobLabel: 'Publish_Artifacts_Logs'

eng/common/core-templates/job/source-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,19 @@ 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.2204.amd64
63+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
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-azurelinux-3
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:
7070
${{ if eq(variables['System.TeamProject'], 'public') }}:
7171
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')]
72-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
72+
demands: ImageOverride -equals Azure-Linux-3-Amd64-Public
7373
${{ if eq(variables['System.TeamProject'], 'internal') }}:
7474
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')]
75-
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
75+
demands: ImageOverride -equals Azure-Linux-3-Amd64
7676
${{ if ne(parameters.platform.pool, '') }}:
7777
pool: ${{ parameters.platform.pool }}
7878

0 commit comments

Comments
 (0)