Skip to content

Commit 4fa49a2

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20260812.3
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26411.3 -> To Version 10.0.0-beta.26412.3
1 parent dd12545 commit 4fa49a2

7 files changed

Lines changed: 28 additions & 6 deletions

File tree

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-int-dotnet-dotnet-e2f47b0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-e2f47b01/nuget/v3/index.json" />
1110
<!-- End: Package sources from dotnet-dotnet -->
1211
<!-- Begin: Package sources from dotnet-android -->
1312
<!-- End: Package sources from dotnet-android -->
@@ -34,7 +33,6 @@
3433
<clear />
3534
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3635
<!-- Begin: Package sources from dotnet-dotnet -->
37-
<add key="darc-int-dotnet-dotnet-e2f47b0" value="true" />
3836
<!-- End: Package sources from dotnet-dotnet -->
3937
<!-- Begin: Package sources from dotnet-maui -->
4038
<!-- End: Package sources from dotnet-maui -->

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26411.3">
39+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26412.3">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>6a3a6bdbe2195bb7420b24a3d76e1fd66d7bbc35</Sha>
41+
<Sha>cc913986bd49ba62a2606fe232f79cd5d5294f19</Sha>
4242
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4343
</Dependency>
4444
</ToolsetDependencies>

eng/common/build.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Param(
66
[string][Alias('v')]$verbosity = "minimal",
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
9+
[string] $warnNotAsError = '',
910
[bool] $nodeReuse = $true,
1011
[switch] $buildCheck = $false,
1112
[switch][Alias('r')]$restore,
@@ -70,6 +71,7 @@ function Print-Usage() {
7071
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
7172
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
7273
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
74+
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
7375
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7476
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7577
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"

eng/common/build.sh

Lines changed: 6 additions & 0 deletions
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 " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
4546
echo " --buildCheck <value> Sets /check msbuild parameter"
4647
echo " --fromVMR Set when building from within the VMR"
4748
echo ""
@@ -78,6 +79,7 @@ ci=false
7879
clean=false
7980

8081
warn_as_error=true
82+
warn_not_as_error=''
8183
node_reuse=true
8284
build_check=false
8385
binary_log=false
@@ -176,6 +178,10 @@ while [[ $# > 0 ]]; do
176178
warn_as_error=$2
177179
shift
178180
;;
181+
-warnnotaserror)
182+
warn_not_as_error=$2
183+
shift
184+
;;
179185
-nodereuse)
180186
node_reuse=$2
181187
shift

eng/common/tools.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
# Configures warning treatment in msbuild.
3535
[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }
3636

37+
# Specifies semi-colon delimited list of warning codes that should not be treated as errors.
38+
[string]$warnNotAsError = if (Test-Path variable:warnNotAsError) { $warnNotAsError } else { '' }
39+
3740
# Specifies which msbuild engine to use for build: 'vs', 'dotnet' or unspecified (determined based on presence of tools.vs in global.json).
3841
[string]$msbuildEngine = if (Test-Path variable:msbuildEngine) { $msbuildEngine } else { $null }
3942

@@ -836,6 +839,11 @@ function MSBuild-Core() {
836839
$cmdArgs += ' /p:TreatWarningsAsErrors=false'
837840
}
838841

842+
if ($warnAsError -and $warnNotAsError) {
843+
$escapedWarnNotAsError = $warnNotAsError -replace ';', '%3B'
844+
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$escapedWarnNotAsError"
845+
}
846+
839847
foreach ($arg in $args) {
840848
if ($null -ne $arg -and $arg.Trim() -ne "") {
841849
if ($arg.EndsWith('\')) {

eng/common/tools.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ fi
5252
# Configures warning treatment in msbuild.
5353
warn_as_error=${warn_as_error:-true}
5454

55+
# Specifies semi-colon delimited list of warning codes that should not be treated as errors.
56+
warn_not_as_error=${warn_not_as_error:-''}
57+
5558
# True to attempt using .NET Core already that meets requirements specified in global.json
5659
# installed on the machine instead of downloading one.
5760
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
@@ -532,7 +535,12 @@ function MSBuild-Core {
532535
mt_switch="-mt"
533536
fi
534537

535-
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
538+
local warnnotaserror_switch=""
539+
if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then
540+
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}"
541+
fi
542+
543+
RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
536544
}
537545

538546
function GetDarc {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.Build.NoTargets": "3.7.0",
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26411.3",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26412.3",
1313
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1414
}
1515
}

0 commit comments

Comments
 (0)