Skip to content

[release/10.0] Source code updates from dotnet/dotnet #38699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtgodbe merged 2 commits into from
Jul 27, 2026
Merged

[release/10.0] Source code updates from dotnet/dotnet #38699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8149b3
Backflow from https://github.com/dotnet/dotnet / e0c9b3f build 324500
dotnet-maestro[bot] Jul 27, 2026
a200f4b
Update dependencies from build 324500
dotnet-maestro[bot] Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-b63fd14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-b63fd14d/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-e0c9b3f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e0c9b3f9/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
Expand All @@ -26,4 +26,8 @@
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://data.nuget.org/v3/index.json" />
</auditSources>
</configuration>
36 changes: 18 additions & 18 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26361.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26361.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26361.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.10</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.10</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.10</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.10</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.10</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.10</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.10</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.10-servicing.26361.102</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.10</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.10-servicing.26361.102</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.10</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.10</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.10</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.10</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26376.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26376.103</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26376.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.12</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.12</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.12</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.12</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.12</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.12</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.12-servicing.26376.103</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.12</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.12-servicing.26376.103</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.12</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.12</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.12</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.12</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="b63fd14d0c0dc26a52814d3f8debb67ba806f1f0" BarId="322528" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d" BarId="324500" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.10-servicing.26361.102">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.12-servicing.26376.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.10">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.10">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.10-servicing.26361.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.12-servicing.26376.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.10">
<Dependency Name="System.Text.Json" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.10">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.10">
<Dependency Name="System.Formats.Asn1" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.10">
<Dependency Name="System.Runtime.Caching" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26361.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26376.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26361.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26376.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26361.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26376.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>b63fd14d0c0dc26a52814d3f8debb67ba806f1f0</Sha>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
<PropertyGroup Label="Version settings">
<VersionPrefix>10.0.10</VersionPrefix>
<VersionPrefix>10.0.12</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Param(
[string][Alias('v')]$verbosity = "minimal",
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[string] $warnNotAsError = '',
[bool] $nodeReuse = $true,
[switch] $buildCheck = $false,
[switch][Alias('r')]$restore,
Expand Down Expand Up @@ -70,6 +71,7 @@ function Print-Usage() {
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Expand Down
6 changes: 6 additions & 0 deletions eng/common/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ usage()
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
echo " --buildCheck <value> Sets /check msbuild parameter"
echo " --fromVMR Set when building from within the VMR"
echo ""
Expand Down Expand Up @@ -78,6 +79,7 @@ ci=false
clean=false

warn_as_error=true
warn_not_as_error=''
node_reuse=true
build_check=false
binary_log=false
Expand Down Expand Up @@ -176,6 +178,10 @@ while [[ $# > 0 ]]; do
warn_as_error=$2
shift
;;
-warnnotaserror)
warn_not_as_error=$2
shift
;;
-nodereuse)
node_reuse=$2
shift
Expand Down
20 changes: 19 additions & 1 deletion eng/common/core-templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ parameters:
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

# Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat).
# When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT.
# All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not
# exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter.
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'

SourcesDirectory: $(System.DefaultWorkingDirectory)
CreatePr: true
AutoCompletePr: false
Expand Down Expand Up @@ -73,6 +79,15 @@ jobs:
displayName: Generate LocProject.json
condition: ${{ parameters.condition }}

# Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only).
# All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal.
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
- template: /eng/common/templates/steps/get-federated-access-token.yml
parameters:
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
outputVariableName: 'CeapexEntraToken'
condition: ${{ parameters.condition }}

- task: OneLocBuild@2
displayName: OneLocBuild
env:
Expand All @@ -88,7 +103,10 @@ jobs:
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
isShouldReusePrSelected: ${{ parameters.ReusePr }}
packageSourceAuth: patAuth
patVariable: ${{ parameters.CeapexPat }}
${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
patVariable: $(CeapexEntraToken)
${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}:
patVariable: ${{ parameters.CeapexPat }}
${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}"
Expand Down
3 changes: 0 additions & 3 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ jobs:

# Populate internal runtime variables.
- template: /eng/common/templates/steps/enable-internal-sources.yml
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
parameters:
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

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

Expand Down
2 changes: 0 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,6 @@ stages:

# Populate internal runtime variables.
- template: /eng/common/templates/steps/enable-internal-sources.yml
parameters:
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

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

Expand Down
10 changes: 9 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
# Configures warning treatment in msbuild.
[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }

# Specifies semi-colon delimited list of warning codes that should not be treated as errors.
[string]$warnNotAsError = if (Test-Path variable:warnNotAsError) { $warnNotAsError } else { '' }

# Specifies which msbuild engine to use for build: 'vs', 'dotnet' or unspecified (determined based on presence of tools.vs in global.json).
[string]$msbuildEngine = if (Test-Path variable:msbuildEngine) { $msbuildEngine } else { $null }

Expand Down Expand Up @@ -732,7 +735,7 @@ function InitializeToolset() {

'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj

MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile
MSBuild-Core $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile /p:RestoreIgnoreFailedSources=true

$path = Get-Content $toolsetLocationFile -Encoding UTF8 -TotalCount 1
if (!(Test-Path $path)) {
Expand Down Expand Up @@ -836,6 +839,11 @@ function MSBuild-Core() {
$cmdArgs += ' /p:TreatWarningsAsErrors=false'
}

if ($warnAsError -and $warnNotAsError) {
$escapedWarnNotAsError = $warnNotAsError -replace ';', '%3B'
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$escapedWarnNotAsError"
}

foreach ($arg in $args) {
if ($null -ne $arg -and $arg.Trim() -ne "") {
if ($arg.EndsWith('\')) {
Expand Down
Loading
Loading