Skip to content

Commit bf35ffd

Browse files
dotnet-maestro[bot]akoeplinger
dotnet-maestro[bot]
and
akoeplinger
authored
[main] Update dependencies from dotnet/arcade (#61125)
* Update dependencies from https://github.com/dotnet/arcade build 20250321.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk From Version 10.0.0-beta.25164.6 -> To Version 10.0.0-beta.25171.1 * Remove duplicate .msi FileExtensionSignInfo --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 94a671c commit bf35ffd

File tree

9 files changed

+72
-33
lines changed

9 files changed

+72
-33
lines changed

Diff for: ‎eng/Signing.props

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup Label="File signing information">
11-
<!-- Arcade does not set a default for .msi's -->
12-
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
13-
1411
<!-- Third-party components which should be signed. -->
1512
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
1613
<FileSignInfo Include="AngleSharp.dll" CertificateName="3PartySHA2" />

Diff for: ‎eng/Version.Details.xml

+16-16
Original file line numberDiff line numberDiff line change
@@ -396,39 +396,39 @@
396396
<Uri>https://github.com/dotnet/runtime</Uri>
397397
<Sha>4ff64a03e5c31fa824c4bc9377ef1ae8134d3f7a</Sha>
398398
</Dependency>
399-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25164.6">
399+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25171.1">
400400
<Uri>https://github.com/dotnet/arcade</Uri>
401-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
401+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
402402
</Dependency>
403403
<!-- Intermediate is necessary for source build. -->
404-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25164.6">
404+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25171.1">
405405
<Uri>https://github.com/dotnet/arcade</Uri>
406-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
406+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
407407
<SourceBuild RepoName="arcade" ManagedOnly="true" />
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25164.6">
409+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25171.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
411+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25164.6">
413+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25171.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
415+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25164.6">
417+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25171.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
419+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25164.6">
421+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25171.1">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
423+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25164.6">
425+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25171.1">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
427+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
428428
</Dependency>
429-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25164.6">
429+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25171.1">
430430
<Uri>https://github.com/dotnet/arcade</Uri>
431-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
431+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
432432
</Dependency>
433433
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.4.0-preview.1.25164.5">
434434
<Uri>https://github.com/dotnet/extensions</Uri>

Diff for: ‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@
168168
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
169169
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
170170
<!-- Packages from dotnet/arcade -->
171-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksArchivesVersion>
172-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksInstallersVersion>
173-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25164.6</MicrosoftDotNetBuildTasksTemplatingVersion>
174-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25164.6</MicrosoftDotNetRemoteExecutorVersion>
175-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25164.6</MicrosoftSourceBuildIntermediatearcadeVersion>
171+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25171.1</MicrosoftDotNetBuildTasksArchivesVersion>
172+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25171.1</MicrosoftDotNetBuildTasksInstallersVersion>
173+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25171.1</MicrosoftDotNetBuildTasksTemplatingVersion>
174+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25171.1</MicrosoftDotNetRemoteExecutorVersion>
175+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.25171.1</MicrosoftSourceBuildIntermediatearcadeVersion>
176176
<!-- Packages from dotnet/source-build-externals -->
177177
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.616001</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
178178
<!-- Packages from dotnet/source-build-reference-packages -->

Diff for: ‎eng/common/CIBuild.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

Diff for: ‎eng/common/build.ps1

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
7172
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7273
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7374
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
75+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
76+
Write-Host " -buildCheck Sets /check msbuild parameter"
7477
Write-Host ""
7578

7679
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
97100

98101
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
99102
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
103+
$check = if ($buildCheck) { '/check' } else { '' }
100104

101105
if ($projects) {
102106
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
113117
MSBuild $toolsetBuildProj `
114118
$bl `
115119
$platformArg `
120+
$check `
116121
/p:Configuration=$configuration `
117122
/p:RepoRoot=$RepoRoot `
118123
/p:Restore=$restore `
@@ -166,4 +171,4 @@ catch {
166171
ExitWithExitCode 1
167172
}
168173

169-
ExitWithExitCode 0
174+
ExitWithExitCode 0

Diff for: ‎eng/common/build.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --buildCheck <value> Sets /check msbuild parameter"
4546
echo ""
4647
echo "Command line arguments not listed above are passed thru to msbuild."
4748
echo "Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
7677

7778
warn_as_error=true
7879
node_reuse=true
80+
build_check=false
7981
binary_log=false
8082
exclude_ci_binary_log=false
8183
pipelines_log=false
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
173175
node_reuse=$2
174176
shift
175177
;;
178+
-buildcheck)
179+
build_check=true
180+
;;
176181
-runtimesourcefeed)
177182
runtime_source_feed=$2
178183
shift
@@ -224,8 +229,14 @@ function Build {
224229
bl="/bl:\"$log_dir/Build.binlog\""
225230
fi
226231

232+
local check=""
233+
if [[ "$build_check" == true ]]; then
234+
check="/check"
235+
fi
236+
227237
MSBuild $_InitializeToolset \
228238
$bl \
239+
$check \
229240
/p:Configuration=$configuration \
230241
/p:RepoRoot="$repo_root" \
231242
/p:Restore=$restore \
@@ -256,4 +267,4 @@ if [[ "$restore" == true ]]; then
256267
InitializeNativeTools
257268
fi
258269

259-
Build
270+
Build

Diff for: ‎eng/common/cibuild.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515

16-
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
16+
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@

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

+28-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
66
enableMicrobuildForMacAndLinux: false
77
# Location of the MicroBuild output folder
8-
microBuildOutputFolder: '$(Agent.TempDirectory)'
8+
microBuildOutputFolder: '$(Build.SourcesDirectory)'
99
continueOnError: false
1010

1111
steps:
@@ -41,7 +41,7 @@ steps:
4141
inputs:
4242
packageType: sdk
4343
version: 8.0.x
44-
installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet
44+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
4545
workingDirectory: ${{ parameters.microBuildOutputFolder }}
4646
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
4747

@@ -53,6 +53,7 @@ steps:
5353
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
5454
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
5555
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
56+
useEsrpCli: true
5657
env:
5758
TeamName: $(_TeamName)
5859
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
@@ -71,3 +72,28 @@ steps:
7172
eq(variables['_SignType'], 'real')
7273
)
7374
))
75+
76+
# Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964
77+
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
78+
- task: UseDotNet@2
79+
displayName: Install .NET 9.0 SDK for ESRP CLI Workaround
80+
inputs:
81+
packageType: sdk
82+
version: 9.0.x
83+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
84+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
85+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
86+
87+
- task: PowerShell@2
88+
displayName: Workaround for ESRP CLI on Linux
89+
inputs:
90+
targetType: 'inline'
91+
script: |
92+
Write-Host "Copying Linux Path"
93+
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
94+
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
95+
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
96+
$MBSIGN_APPFOLDER | Write-Host
97+
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
98+
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force
99+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

Diff for: ‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.6",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.6",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25164.6",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25171.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25171.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25171.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)