Skip to content

Commit af62eb5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#628)
* Update dependencies from https://github.com/dotnet/arcade build 20251107.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25531.1 -> To Version 11.0.0-beta.25557.2 * Update dependencies from https://github.com/dotnet/arcade build 20251110.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.25531.1 -> To Version 11.0.0-beta.25560.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3381a40 commit af62eb5

File tree

13 files changed

+68
-22
lines changed

13 files changed

+68
-22
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25560.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
8+
<Sha>3a7f017be1c42a4ecc516446977cf55d429cf390</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
/p:MaestroApiEndpoint=https://maestro.dot.net
141141
/p:OfficialBuildId=$(OfficialBuildId)
142142
-runtimeSourceFeed https://ci.dot.net/internal
143-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
143+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
144144

145145
condition: ${{ parameters.condition }}
146146
continueOnError: ${{ parameters.continueOnError }}
@@ -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
@@ -205,8 +210,8 @@ jobs:
205210
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
206211
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
207212
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208-
-runtimeSourceFeed https://ci.dot.net/internal
209-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
213+
-runtimeSourceFeed https://ci.dot.net/internal
214+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
210215
211216
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
212217
- template: /eng/common/core-templates/steps/publish-logs.yml

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

Lines changed: 5 additions & 1 deletion
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:
@@ -330,4 +334,4 @@ stages:
330334
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
331335
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
332336
-runtimeSourceFeed https://ci.dot.net/internal
333-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
337+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ steps:
2626
# If the file exists - sensitive data for redaction will be sourced from it
2727
# (single entry per line, lines starting with '# ' are considered comments and skipped)
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
29-
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
29+
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
3131
-runtimeSourceFeed https://ci.dot.net/internal
32-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
32+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
3434
'$(MaestroAccessToken)'
3535
'$(dn-bot-all-orgs-artifact-feeds-rw)'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ steps:
1414
workingDirectory: $(Agent.TempDirectory)
1515

1616
- script: |
17-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
17+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
18+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
1919
displayName: "Source Index: Download netsourceindex Tools"
2020
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
2121
workingDirectory: $(Agent.TempDirectory)

‎eng/common/cross/arm/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf32-littlearm)
8+
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) )

‎eng/common/cross/arm64/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-littleaarch64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

‎eng/common/cross/x64/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-x86-64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) )

0 commit comments

Comments
 (0)