Skip to content

Commit eb37b2e

Browse files
github-actions[bot]GangWang01JanKrivaneksurayya-MSdotnet-maestro-bot
authored
[automated] Merge branch 'vs17.10' => 'vs17.11' (#11137)
* Check version bump on release branches' update * Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot * Remove the exception for dependencies update by dotnet-maestro[bot] * Bump version * [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081) * Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * update darc * update arcade channel .net 8 * update arcade * Changed pool image --------- Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com> Co-authored-by: sujitnayak <sujitn@microsoft.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com> Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Co-authored-by: Mariana Dematte <magarces@microsoft.com> * Disable localization for vs17.10 (#10269) Co-authored-by: Rainer Sigwald <raines@microsoft.com> * Enable private feeds for release branch (#10355) This PR enables MSBuild to take security fixes from MSBuild dependencies. * [vs17.10] Update dependencies from dotnet/arcade (#10809) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24508.1 * Update Versions.props --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> * CG alert cleaning on VS17.10 (#10724) * Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * [vs17.10] Update dependencies from dotnet/arcade (#10833) * [vs17.10] Update dependencies from dotnet/arcade (#10896) * [vs17.10] Update dependencies from dotnet/arcade (#10992) * Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.10.13 * Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4 * Revert "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4" This reverts commit 66381f3. * Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24570.5 * Reapply "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4" This reverts commit 2cffa88. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com> Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com> * [automated] Merge branch 'vs17.8' => 'vs17.10' (#11124) * Dont ngen taskhost Fixes our lack of optprof data (#8737) Don't ngen TaskHosts * Bump version * Bump version * Update System.Security.Cryptography.Pkcs * Bump version * Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751) * [release/vs17.7] Onboard 1es templates (#9924) * bump arcade version * bump MicrosoftNetCompilersToolsetVersion * bump MicrosoftNetCompilersToolsetVersion * update sha for Microsoft.Net.Compilers.Toolset * CG alert cleaning on VS17.8 (#10725) * Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * Bump System.Text.Json to 8.0.0.4 * Bump the dependencies of System.Text.Json * Add System.Formats.Asn1 8.0.1 to the pre-built exception list * Bump version prefix to 17.8.8 * Updated System.Collection.Immutable package to v8 * Adding System.Collections.Immutable 8.0.0 to the pre-built exception list * Updated Version.Details.xml * [vs17.8] update arcade and fix build (#10838) * Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * remove BuildXL from nuget config * compatibility suppressions * Update dependencies from https://github.com/dotnet/arcade build 20241… Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * include PortableRuntimeIdentifierGraph.json * Suppress a warning IDE0305 * bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> * [vs17.8] Sync internal and public branches (#10858) * Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894) * [vs17.8] Update dependencies from dotnet/arcade (#10986) * Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.8.11 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20241120.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5 * Update VersionPrefix to 17.8.12 * [vs17.8] Backport VS insertion pipeline YMLs (#11066) Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com> * Update .opt-prof.yml (#11112) * [vs17.8] Fix setting package versions in VS insertion (#11103) * fix setting package versions * use VS branch names in servicing package decision --------- Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com> * Update vs/msbuild version (#11115) * Update vs/msbuild version * Bump version * Update xcopy-msbuild version to 17.8.5 (#11118) * Add inter-branch merge flow file (#11123) * Update .opt-prof.yml (#11121) * Bump up System.Text.Json to 8.0.5 (#11134) * Remove the change to CompatibilitySuppressions.xml * Remove unnecessary workaround for sdk 8.0.1xx bootstrap in the branch vs17.8 * Bump up version prefix to 17.10.14 --------- Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com> Co-authored-by: sujitnayak <sujitn@microsoft.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com> Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com> Co-authored-by: Jan Provazník <janprovaznik@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [vs17.10] Run tests even if version is not bumped (#11059) Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com> * Bump up version prefix to 17.11.20 --------- Co-authored-by: Gang Wang <v-gaw@microsoft.com> Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Co-authored-by: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com> Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: sujitnayak <sujitn@microsoft.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com> Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com> Co-authored-by: Mariana Dematte <magarces@microsoft.com> Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com> Co-authored-by: Rainer Sigwald <raines@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jan Provazník <janprovaznik@microsoft.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
1 parent e4f5b93 commit eb37b2e

10 files changed

+104
-28
lines changed

‎.vsts-dotnet-ci.yml

+50
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ trigger:
33
- exp/*
44
- vs*
55

6+
variables:
7+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
8+
- group: AzureDevOps-Artifact-Feeds-Pats
9+
- name: cfsNugetWarnLevel
10+
value: warn
11+
- name: nugetMultiFeedWarnLevel
12+
value: none
13+
- name: NugetSecurityAnalysisWarningLevel
14+
value: none
15+
616
jobs:
717
- job: CheckVersionBumpOnReleaseBranches
818
displayName: "Check Version Bump On Release Branches"
@@ -65,6 +75,14 @@ jobs:
6575
pool:
6676
vmImage: 'windows-2022'
6777
steps:
78+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
79+
- task: PowerShell@2
80+
displayName: Setup Private Feeds Credentials
81+
inputs:
82+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
83+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
84+
env:
85+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
6886
- task: BatchScript@1
6987
displayName: cibuild_bootstrapped_msbuild.cmd
7088
inputs:
@@ -136,6 +154,14 @@ jobs:
136154
pool:
137155
vmImage: 'windows-2022'
138156
steps:
157+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
158+
- task: PowerShell@2
159+
displayName: Setup Private Feeds Credentials
160+
inputs:
161+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
162+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
163+
env:
164+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
139165
- task: BatchScript@1
140166
displayName: cibuild_bootstrapped_msbuild.cmd
141167
inputs:
@@ -191,6 +217,14 @@ jobs:
191217
name: VSEngSS-MicroBuild2022-1ES
192218
demands: agent.os -equals Windows_NT
193219
steps:
220+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
221+
- task: PowerShell@2
222+
displayName: Setup Private Feeds Credentials
223+
inputs:
224+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
225+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
226+
env:
227+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
194228
- task: BatchScript@1
195229
displayName: cibuild.cmd
196230
inputs:
@@ -265,6 +299,14 @@ jobs:
265299
pool:
266300
vmImage: 'ubuntu-latest'
267301
steps:
302+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
303+
- task: Bash@3
304+
displayName: Setup Private Feeds Credentials
305+
inputs:
306+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
307+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
308+
env:
309+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
268310
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
269311
displayName: CI Build
270312
- task: PublishTestResults@2
@@ -322,6 +364,14 @@ jobs:
322364
pool:
323365
vmImage: 'macOS-latest'
324366
steps:
367+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
368+
- task: Bash@3
369+
displayName: Setup Private Feeds Credentials
370+
inputs:
371+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
372+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
373+
env:
374+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
325375
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
326376
displayName: CI Build
327377
- task: PublishTestResults@2

‎.vsts-dotnet.yml

+15
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ variables:
3838
- name: Codeql.Enabled
3939
value: true
4040
- group: DotNet-MSBuild-SDLValidation-Params
41+
- group: AzureDevOps-Artifact-Feeds-Pats
42+
- name: cfsNugetWarnLevel
43+
value: warn
44+
- name: nugetMultiFeedWarnLevel
45+
value: none
46+
- name: NugetSecurityAnalysisWarningLevel
47+
value: none
4148

4249
resources:
4350
repositories:
@@ -110,6 +117,14 @@ extends:
110117
- task: NuGetToolInstaller@1
111118
displayName: 'Install NuGet.exe'
112119

120+
- task: PowerShell@2
121+
displayName: Setup Private Feeds Credentials
122+
inputs:
123+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
124+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
125+
env:
126+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
127+
113128
- task: NuGetCommand@2
114129
displayName: Restore internal tools
115130
inputs:

‎azure-pipelines/vs-insertion.yml

+26-18
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@ variables:
102102
value: '$(ArtifactPackagesPath)/Microsoft.NET.StringTools*.nupkg'
103103
- name: ExternalAPIsPackagePattern
104104
value: '$(ArtifactPackagesPath)/VS.ExternalAPIs.*.nupkg'
105-
# servicing branches until 17.12 also include Microsoft.Build.Engine and Microsoft.Build.Conversion.Core
106-
- name: EngineIncludedProps
107-
value: VS.ExternalAPIs.MSBuild=$(MSBuild_ExtApisPackageVersion);Microsoft.Build=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Conversion.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Engine=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Framework=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Tasks.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Utilities.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.NET.StringTools=$(MicrosoftNETStringToolsPackageVersion)
108-
- name: NoEngineProps
109-
value: VS.ExternalAPIs.MSBuild=$(MSBuild_ExtApisPackageVersion);Microsoft.Build=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Framework=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Tasks.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.Build.Utilities.Core=$(MicrosoftNETStringToolsPackageVersion);Microsoft.NET.StringTools=$(MicrosoftNETStringToolsPackageVersion)
110105

111106
extends:
112107
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
@@ -191,28 +186,41 @@ extends:
191186
steps:
192187
- task: Powershell@2
193188
name: PwshMungeExternalAPIsPkgVersion
194-
displayName: Munge ExternalAPIs package version
189+
displayName: Munge ExternalAPIs package version and set props
195190
inputs:
196191
targetType: inline
197192
script: |
198193
$folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/VS.ExternalAPIs.*.nupkg"
199194
$packageFile = Get-ChildItem -Path $folder -Filter VS.ExternalAPIs.*.nupkg | Select-Object -First 1
200-
$packageVersion = $packageFile.BaseName.TrimStart("VS.ExternalAPIs.MSBuild")
201-
Write-Host "Setting MSBuild_ExtApisPackageVersion to '$packageVersion'"
202-
Write-Host "##vso[task.setvariable variable=MSBuild_ExtApisPackageVersion]$($packageVersion)"
195+
$MSBuild_ExtApisPackageVersion = $packageFile.BaseName.TrimStart("VS.ExternalAPIs.MSBuild")
196+
Write-Host "Setting MSBuild_ExtApisPackageVersion to '$MSBuild_ExtApisPackageVersion'"
197+
Write-Host "##vso[task.setvariable variable=MSBuild_ExtApisPackageVersion]$($MSBuild_ExtApisPackageVersion)"
203198
$folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/Microsoft.NET.StringTools*.nupkg"
204199
$packageFile = Get-ChildItem -Path $folder -Filter Microsoft.NET.StringTools*.nupkg | Select-Object -First 1
205-
$packageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools")
206-
Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$packageVersion'"
207-
Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($packageVersion)"
208-
if ("$(InsertTargetBranch)" -in @("vs17.0", "vs17.3", "vs17.6", "vs17.8", "vs17.10", "vs17.11", "vs17.12"))
209-
{
210-
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($EngineIncludedProps)"
211-
}
212-
else
200+
$MicrosoftNETStringToolsPackageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools")
201+
Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$MicrosoftNETStringToolsPackageVersion'"
202+
Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($MicrosoftNETStringToolsPackageVersion)"
203+
204+
$props = @(
205+
"VS.ExternalAPIs.MSBuild=$MSBuild_ExtApisPackageVersion",
206+
"Microsoft.Build=$MicrosoftNETStringToolsPackageVersion",
207+
"Microsoft.Build.Framework=$MicrosoftNETStringToolsPackageVersion",
208+
"Microsoft.Build.Tasks.Core=$MicrosoftNETStringToolsPackageVersion",
209+
"Microsoft.Build.Utilities.Core=$MicrosoftNETStringToolsPackageVersion",
210+
"Microsoft.NET.StringTools=$MicrosoftNETStringToolsPackageVersion"
211+
)
212+
# servicing branches until 17.12 also include Microsoft.Build.Engine and Microsoft.Build.Conversion.Core
213+
if ("$(InsertTargetBranch)" -in @("rel/d17.0", "rel/d17.3", "rel/d17.6", "rel/d17.8", "rel/d17.10", "rel/d17.11", "rel/d17.12"))
214+
213215
{
214-
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($NoEngineProps)"
216+
$props += @(
217+
"Microsoft.Build.Conversion.Core=$MicrosoftNETStringToolsPackageVersion",
218+
"Microsoft.Build.Engine=$MicrosoftNETStringToolsPackageVersion"
219+
)
215220
}
221+
$propsValue = $props -join ";"
222+
Write-Host "Setting InsertPackagePropsValues to '$propsValue'"
223+
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)"
216224
- task: 1ES.PublishNuGet@1
217225
displayName: 'Push MSBuild CoreXT packages'
218226
inputs:

‎eng/SourceBuildPrebuiltBaseline.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
99
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
1010
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
11-
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.0*" />
11+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
1212
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
1313
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
1414
<UsagePattern IdentityGlob="System.Resources.Extensions/*8.0.0*" />
1515
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
1616
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
1717
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
18-
<UsagePattern IdentityGlob="System.Text.Json/*8.0.4*" />
18+
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
1919
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
2020
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
2121
</IgnorePatterns>

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5454
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="8.0.4">
56+
<Dependency Name="System.Text.Json" Version="8.0.5">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
58+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
5959
</Dependency>
6060
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.11.19</VersionPrefix>
5+
<VersionPrefix>17.11.20</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.10.4</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
@@ -27,6 +27,7 @@
2727
<PropertyGroup>
2828
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
2929
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
30+
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
3031
<!--
3132
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3233
When updating the version of System.Memory file a breaking change here: https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+
@@ -39,7 +40,7 @@
3940
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
4041
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
4142
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
42-
<SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
43+
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
4344
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
4445
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
4546
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>

‎eng/build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function Set-OptProfVariables() {
150150

151151
function Check-EditedFiles() {
152152
# Log VSTS errors for changed lines
153-
git --no-pager diff HEAD --unified=0 --no-color --exit-code | ForEach-Object { "##vso[task.logissue type=error] $_" }
153+
git --no-pager diff HEAD --unified=0 --no-color --exit-code -- src/ | ForEach-Object { "##vso[task.logissue type=error] $_" }
154154
if ($LASTEXITCODE -ne 0) {
155155
throw "##vso[task.logissue type=error] After building, there are changed files. Please build locally and include these changes in your pull request."
156156
}

‎src/MSBuild/MSBuild.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@
176176
<PackageReference Include="Microsoft.BuildXL.Processes" Condition="'$(FeatureReportFileAccesses)' == 'true'" PrivateAssets="all" />
177177
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
178178
<PackageReference Include="System.Configuration.ConfigurationManager" />
179+
<!-- Explicitly reference STJ in .NET 8 to bump to a patched version for the deps file -->
180+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(DotNetBuildFromSource)' != 'true'" />
179181
</ItemGroup>
180182
<!-- Manually download this library for RoslynCodeTaskFactory.
181183
See target AddRefAssemblies below. -->

‎src/MSBuild/app.amd64.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
</dependentAssembly>
135135
<dependentAssembly>
136136
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
137-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
138-
<codeBase version="8.0.0.4" href="..\System.Text.Json.dll"/>
137+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
138+
<codeBase version="8.0.0.5" href="..\System.Text.Json.dll"/>
139139
</dependentAssembly>
140140
<dependentAssembly>
141141
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎src/MSBuild/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</dependentAssembly>
9595
<dependentAssembly>
9696
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
97-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
97+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
9898
</dependentAssembly>
9999
<dependentAssembly>
100100
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

0 commit comments

Comments
 (0)