Skip to content

Commit e6217ba

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#19026)
* Update dependencies from https://github.com/dotnet/arcade build 20251022.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25522.1 * Update dependencies from https://github.com/dotnet/arcade build 20251024.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25524.1 * Update dependencies from https://github.com/dotnet/arcade build 20251027.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25527.2 * Update dependencies from https://github.com/dotnet/arcade build 20251028.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25528.1 * Update dependencies from https://github.com/dotnet/arcade build 20251030.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25530.1 * Update dependencies from https://github.com/dotnet/arcade build 20251031.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25531.1 * Update dependencies from https://github.com/dotnet/arcade build 20251103.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25553.1 * Update dependencies from https://github.com/dotnet/arcade build 20251104.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25554.2 * Update dependencies from https://github.com/dotnet/arcade build 20251105.5 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25520.4 -> To Version 11.0.0-beta.25555.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 726845e commit e6217ba

File tree

9 files changed

+31
-17
lines changed

9 files changed

+31
-17
lines changed

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
2727
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
2828
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
2929
<!-- dotnet/arcade dependencies -->
30-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25520.4</MicrosoftDotNetArcadeSdkPackageVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.5</MicrosoftDotNetArcadeSdkPackageVersion>
3131
<!-- _git/dotnet-optimization dependencies -->
3232
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
3333
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25520.4">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.5">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>16f3dcc641eb529fa7324ea2d1d236bf2ca57dd0</Sha>
81+
<Sha>86c3a198a81e697e2bfa713cae2c4bea4b0df085</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ jobs:
189189
BARBuildId: ${{ parameters.BARBuildId }}
190190
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
191191
is1ESPipeline: ${{ parameters.is1ESPipeline }}
192+
193+
# Darc is targeting 8.0, so make sure it's installed
194+
- task: UseDotNet@2
195+
inputs:
196+
version: 8.0.x
192197

193198
- task: AzureCLI@2
194199
displayName: Publish Using Darc

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ stages:
313313

314314
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
315315

316+
- task: UseDotNet@2
317+
inputs:
318+
version: 8.0.x
319+
316320
- task: AzureCLI@2
317321
displayName: Publish Using Darc
318322
inputs:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ parameters:
2020
steps:
2121
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
2222
- task: MicroBuildSigningPluginPreview@4
23-
displayName: Install Preview MicroBuild plugin (Windows)
23+
displayName: Install Preview MicroBuild plugin
2424
inputs: ${{ parameters.microbuildTaskInputs }}
2525
env: ${{ parameters.microbuildEnv }}
2626
continueOnError: ${{ parameters.continueOnError }}
2727
condition: ${{ parameters.condition }}
2828
- ${{ else }}:
2929
- task: MicroBuildSigningPlugin@4
30-
displayName: Install MicroBuild plugin (Windows)
30+
displayName: Install MicroBuild plugin
3131
inputs: ${{ parameters.microbuildTaskInputs }}
3232
env: ${{ parameters.microbuildEnv }}
3333
continueOnError: ${{ parameters.continueOnError }}
34-
condition: ${{ parameters.condition }}
34+
condition: ${{ parameters.condition }}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ 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)'
1619
# Microbuild version
1720
microbuildPluginVersion: 'latest'
1821

@@ -21,16 +24,14 @@ parameters:
2124
steps:
2225
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2326
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
24-
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
27+
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
2528
- task: UseDotNet@2
2629
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2730
inputs:
2831
packageType: sdk
2932
version: 8.0.x
30-
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
31-
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
32-
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
33-
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
33+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3435
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3536

3637
- script: |
@@ -70,7 +71,7 @@ steps:
7071
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
7172
microbuildEnv:
7273
TeamName: $(_TeamName)
73-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
74+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
7475
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7576
continueOnError: ${{ parameters.continueOnError }}
7677
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -92,7 +93,7 @@ steps:
9293
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
9394
microbuildEnv:
9495
TeamName: $(_TeamName)
95-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
96+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
9697
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9798
continueOnError: ${{ parameters.continueOnError }}
9899
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎eng/common/core-templates/steps/publish-logs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ steps:
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
2929
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
31+
-runtimeSourceFeed https://ci.dot.net/internal
32+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
3133
'$(publishing-dnceng-devdiv-code-r-build-re)'
3234
'$(MaestroAccessToken)'
3335
'$(dn-bot-all-orgs-artifact-feeds-rw)'

‎eng/common/post-build/redact-logs.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ param(
77
# File with strings to redact - separated by newlines.
88
# For comments start the line with '# ' - such lines are ignored
99
[Parameter(Mandatory=$false)][string] $TokensFilePath,
10-
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
10+
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
11+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
12+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
1113
)
1214

1315
try {

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25420.111",
3+
"version": "10.0.100-rc.2.25502.107",
44
"allowPrerelease": true,
55
"paths": [
66
".dotnet",
@@ -9,7 +9,7 @@
99
"errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh."
1010
},
1111
"tools": {
12-
"dotnet": "10.0.100-rc.1.25420.111",
12+
"dotnet": "10.0.100-rc.2.25502.107",
1313
"vs": {
1414
"version": "17.14",
1515
"components": [
@@ -22,7 +22,7 @@
2222
"perl": "5.38.2.2"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25520.4",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.5",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

0 commit comments

Comments
 (0)