Skip to content

Commit 472c3b0

Browse files
dotnet-maestro[bot]lewingakoeplinger
authored
[main] Update dependencies from dotnet/arcade (#113592)
* Update dependencies from https://github.com/dotnet/arcade build 20250314.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25164.6 * 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.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25171.1 * Update Microsoft.DotNet.ApiCompat.Task * Remove duplicate .msi FileExtensionSignInfo * Update dependencies from https://github.com/dotnet/arcade build 20250325.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25175.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 707dc2d commit 472c3b0

File tree

17 files changed

+147
-164
lines changed

17 files changed

+147
-164
lines changed

‎eng/Signing.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
<FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
5757
<FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
5858
<FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
59-
60-
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
6159
</ItemGroup>
6260

6361
<!--

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25175.2">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
89+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25157.1">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25175.2">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
94+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25175.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
99+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25175.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
103+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25157.1">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25175.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
107+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25157.1">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25175.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
111+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25157.1">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25175.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
115+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25175.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
119+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25157.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25175.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
123+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25157.1">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25175.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
127+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25157.1">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25175.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
131+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25157.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25175.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
135+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25157.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25175.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
139+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25157.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25175.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
143+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25157.1">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25175.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
147+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25157.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25175.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
151+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25157.1">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25175.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
155+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25175.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
159+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25157.1">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25175.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
163+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25157.1">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25175.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
167+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25126.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>132fdfbd9c8f09f8c51179c1e7742f048f94734c</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25157.1">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25175.2">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
353+
<Sha>584374998d21b1d550452753c7b5f41725c07a11</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -402,9 +402,9 @@
402402
<Sha>bfe9d9f9059008d919d867fe5bdfabfe8b6ed69d</Sha>
403403
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.3.25126.5">
405+
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.3.25173.9">
406406
<Uri>https://github.com/dotnet/sdk</Uri>
407-
<Sha>c921fd0a32c3e6001b10791dd0a30f8ef80f915f</Sha>
407+
<Sha>5ebd5267376b61d01b4afc9d4cf9c832488312b2</Sha>
408408
</Dependency>
409409
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
410410
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,24 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25126.5</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25173.9</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25157.1</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25157.1</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25157.1</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25157.1</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25157.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25157.1</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25157.1</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25157.1</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25175.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25175.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25175.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25175.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25175.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25175.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25175.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25175.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25175.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25175.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

‎eng/common/CIBuild.cmd‎

Lines changed: 1 addition & 1 deletion
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 %*"

‎eng/common/build.ps1‎

Lines changed: 6 additions & 1 deletion
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

‎eng/common/build.sh‎

Lines changed: 12 additions & 1 deletion
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

‎eng/common/cibuild.sh‎

Lines changed: 1 addition & 1 deletion
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 $@

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

Lines changed: 28 additions & 2 deletions
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'))

0 commit comments

Comments
 (0)