Skip to content

Commit 7c2b926

Browse files
github-actions[bot]ForgindJanKrivaneksujitnayakYuliiaKovalova
authored
[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 <[email protected]> * [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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Jan Krivanek <[email protected]> Co-authored-by: sujitnayak <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Jan Provazník <[email protected]> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]> 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>
1 parent 7620cbd commit 7c2b926

File tree

10 files changed

+315
-9
lines changed

10 files changed

+315
-9
lines changed

‎.github/workflows/inter-branch-merge-flow.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- vs1**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
14+
with:
15+
configuration_file_path: '.config/git-merge-flow-config.jsonc'

‎.opt-prof.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ stages:
5757
cloudBuildResourceName: ComponentBuildUnderTest
5858
testLabPoolName: VS-Platform # The test lab pool to run your tests in
5959
testMachineCleanUpStrategy: ${{parameters.testMachineCleanUpStrategy}}
60-
testMachineImageName: Windows-10-Enterprise-20H2
60+
testMachineImageName: Windows-11-Enterprise-23H2
6161
visualStudioSigning: Test
6262
variables:
6363
- name: branchName # The branch in the VS repo the bootstrapper was based on

‎azure-pipelines/WIFtoPATauth.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
parameters:
2+
- name: deadPATServiceConnectionId # The GUID of the PAT-based service connection whose access token must be replaced.
3+
type: string
4+
- name: wifServiceConnectionName # The name of the WIF service connection to use to get the access token.
5+
type: string
6+
- name: resource # The scope for which the access token is requested.
7+
type: string
8+
default: 499b84ac-1321-427f-aa17-267ca6975798 # Azure Artifact feeds (any of them)
9+
10+
steps:
11+
- task: AzureCLI@2
12+
displayName: 🔏 Authenticate with WIF service connection
13+
inputs:
14+
azureSubscription: ${{ parameters.wifServiceConnectionName }}
15+
scriptType: pscore
16+
scriptLocation: inlineScript
17+
inlineScript: |
18+
$accessToken = az account get-access-token --query accessToken --resource '${{ parameters.resource }}' -o tsv
19+
# Set the access token as a secret, so it doesn't get leaked in the logs
20+
Write-Host "##vso[task.setsecret]$accessToken"
21+
# Override the apitoken of the nuget service connection, for the duration of this stage
22+
Write-Host "##vso[task.setendpoint id=${{ parameters.deadPATServiceConnectionId }};field=authParameter;key=apitoken]$accessToken"

‎azure-pipelines/vs-insertion.yml‎

Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,267 @@
1+
# Create a VS insertion (DotNet-MSBuild-Trusted -> VS) from a CI run on main or any servicing branch.
2+
# To achieve insertion automation, this pipeline definition yml has to be on servicing branches and main.
3+
4+
5+
# Runs in 3 modes:
6+
# 1. daily main insertion from latest main CI.
7+
# - can be disabled in the UI by adding a custom schedule for any branch.
8+
# 2. trigger insert as a followup to a servicing CI run.
9+
# - can be disabled in the UI by adding a custom CI trigger.
10+
# 3. manual insertion - select manually the TargetBranch and inserted CI run.
11+
trigger: none
12+
pr: none
13+
name: $(Date:yyyyMMdd).$(Rev:r)
14+
15+
schedules:
16+
- cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC
17+
displayName: Daily VS insertion main
18+
branches:
19+
include:
20+
- main
21+
always: false # Don't run if there are no code changes
22+
23+
resources:
24+
pipelines:
25+
- pipeline: 'MSBuild'
26+
project: 'DevDiv'
27+
source: 'MSBuild'
28+
branch: main # for daily main scheduled insertion
29+
trigger:
30+
branches:
31+
include: # trigger as a followup to servicing CI
32+
- vs*
33+
repositories:
34+
- repository: 1ESPipelineTemplates
35+
type: git
36+
name: 1ESPipelineTemplates/1ESPipelineTemplates
37+
ref: refs/tags/release
38+
39+
parameters:
40+
- name: TargetBranch
41+
default: auto
42+
type: string
43+
displayName: 'Insertion Target Branch (select for manual insertion)'
44+
values:
45+
- auto
46+
- main
47+
- rel/d17.13
48+
- rel/d17.12
49+
- rel/d17.11
50+
- rel/d17.10
51+
- rel/d17.8
52+
- rel/d17.6
53+
- rel/d17.3
54+
- rel/d17.0
55+
- name: DropRetentionDays
56+
default: 183
57+
type: number
58+
displayName: 'Drop Retention Days (do not set to < 90)'
59+
60+
variables:
61+
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
62+
- name: AutoInsertTargetBranch
63+
${{ if eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
64+
value: 'rel/d17.13'
65+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.12') }}:
66+
value: 'rel/d17.12'
67+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.11') }}:
68+
value: 'rel/d17.11'
69+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.10') }}:
70+
value: 'rel/d17.10'
71+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.8') }}:
72+
value: 'rel/d17.8'
73+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.6') }}:
74+
value: 'rel/d17.6'
75+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.3') }}:
76+
value: 'rel/d17.3'
77+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.0') }}:
78+
value: 'rel/d17.0'
79+
${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
80+
value: 'main'
81+
${{ else }}:
82+
value: ''
83+
- name: InsertTargetBranch
84+
${{ if not(eq(parameters.TargetBranch, 'auto')) }}:
85+
value: ${{ parameters.TargetBranch }}
86+
${{ else }}:
87+
value: $(AutoInsertTargetBranch)
88+
- name: TeamName
89+
value: msbuild
90+
- name: TeamEmail
91+
value: [email protected]
92+
- name: MSBuild_CI_BuildNumber
93+
value: $(resources.pipeline.MSBuild.runName)
94+
- name: MSBuild_CI_SourceVersion
95+
value: $(resources.pipeline.MSBuild.sourceCommit)
96+
- name: ArtifactPackagesPath
97+
value: $(Build.ArtifactStagingDirectory)/PackageArtifacts
98+
99+
- name: MSBuildPackagePattern
100+
value: '$(ArtifactPackagesPath)/Microsoft.Build.*.nupkg'
101+
- name: StringToolsPackagePattern
102+
value: '$(ArtifactPackagesPath)/Microsoft.NET.StringTools*.nupkg'
103+
- name: ExternalAPIsPackagePattern
104+
value: '$(ArtifactPackagesPath)/VS.ExternalAPIs.*.nupkg'
105+
106+
extends:
107+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
108+
parameters:
109+
pool:
110+
name: VSEngSS-MicroBuild2022-1ES
111+
customBuildTags:
112+
- ES365AIMigrationTooling-Release
113+
stages:
114+
- stage: RetainBuild
115+
displayName: Retain build
116+
jobs:
117+
- job: Job_1
118+
displayName: Run on agent
119+
condition: succeeded()
120+
timeoutInMinutes: 0
121+
steps:
122+
# Check that InsertTargetBranch is valid before running anything else.
123+
- task: PowerShell@2
124+
name: CheckInsertTargetBranch
125+
inputs:
126+
targetType: inline
127+
script: |
128+
if ("$(InsertTargetBranch)" -eq "") {
129+
Write-Error "InsertTargetBranch is not set, this means your're not inserting from main or a valid servicing branch."
130+
exit 1
131+
}
132+
# the insertion source branch corresponds to the branch on which the MSBuild pipeline ran
133+
- task: PowerShell@2
134+
name: SetSourceBranchName
135+
inputs:
136+
targetType: inline
137+
script: |
138+
# Extract the last section after the last '/'
139+
$fullBranch = "$(resources.pipeline.MSBuild.sourceBranch)"
140+
$branchSegments = $fullBranch -split '/'
141+
$branch = $branchSegments[-1]
142+
Write-Host "Setting source branch to '$branch'"
143+
Write-Host "##vso[task.setvariable variable=SourceBranchName;isoutput=true]$branch"
144+
- task: MicroBuildRetainVstsDrops@1
145+
name: MicroBuildRetainVstsDrops_2
146+
displayName: Retain VSTS Drops
147+
inputs:
148+
DropNames: Products/DevDiv/DotNet-msbuild-Trusted/$(SetSourceBranchName.SourceBranchName)/$(MSBuild_CI_BuildNumber)
149+
AccessToken: $(System.AccessToken)
150+
DropServiceUri: https://devdiv.artifacts.visualstudio.com/DefaultCollection
151+
DropRetentionDays: ${{ parameters.DropRetentionDays }}
152+
- stage: VSInsertion
153+
displayName: VS insertion
154+
dependsOn: RetainBuild
155+
variables:
156+
SourceBranchName: $[ stageDependencies.RetainBuild.Job_1.outputs['SetSourceBranchName.SourceBranchName'] ]
157+
VSDropPath: https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/DotNet-msbuild-Trusted/$(SourceBranchName)/$(MSBuild_CI_BuildNumber)
158+
VSManVersionSuffix: $(MSBuild_ExtApisPackageVersion)+$(MSBuild_CI_SourceVersion)
159+
StandardVSManPath: Microsoft.Build.vsman{$(VSManVersionSuffix)}=$(VSDropPath);Microsoft.Build.vsman
160+
Arm64VSManPath: Microsoft.Build.Arm64.vsman{$(VSManVersionSuffix)}=$(VSDropPath);Microsoft.Build.Arm64.vsman
161+
UnGACVSManPath: Microsoft.Build.UnGAC.vsman=$(VSDropPath);Microsoft.Build.UnGAC.vsman
162+
InsertJsonValues: $(StandardVSManPath),$(Arm64VSManPath),$(UnGACVSManPath)
163+
InsertConfigValues: VS.ExternalAPIs.MSBuild=$(MSBuild_ExtApisPackageVersion)
164+
InsertCustomScriptExecutionCommand: $(Pipeline.Workspace)\xsd\Update-MSBuildXsds.ps1
165+
InsertDescription: Insert MSBuild $(MSBuild_CI_BuildNumber) from the branch $(SourceBranchName) at commit $(MSBuild_CI_SourceVersion). Corresponding package version is $(MSBuild_ExtApisPackageVersion)
166+
InsertPayloadName: 'MSBuild $(SourceBranchName) $(MSBuild_ExtApisPackageVersion)'
167+
jobs:
168+
- job: PushPackagesAndInsert
169+
displayName: Push Packages and Insert VS payload
170+
condition: succeeded()
171+
timeoutInMinutes: 0
172+
templateContext:
173+
inputs:
174+
- input: pipelineArtifact
175+
pipeline: 'MSBuild'
176+
artifactName: 'xsd'
177+
targetPath: '$(Pipeline.Workspace)/xsd'
178+
- input: pipelineArtifact
179+
pipeline: 'MSBuild'
180+
artifactName: 'PackageArtifacts'
181+
targetPath: '$(Build.ArtifactStagingDirectory)/PackageArtifacts'
182+
# the CI build creates a sourcebuild intermediate package that is not signed, remove it to avoid warning from Guardian
183+
itemPattern: |
184+
**
185+
!**/Microsoft.SourceBuild.Intermediate*.nupkg
186+
steps:
187+
- task: Powershell@2
188+
name: PwshMungeExternalAPIsPkgVersion
189+
displayName: Munge ExternalAPIs package version and set props
190+
inputs:
191+
targetType: inline
192+
script: |
193+
$folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/VS.ExternalAPIs.*.nupkg"
194+
$packageFile = Get-ChildItem -Path $folder -Filter VS.ExternalAPIs.*.nupkg | Select-Object -First 1
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)"
198+
$folder = "$(Build.ArtifactStagingDirectory)/PackageArtifacts/Microsoft.NET.StringTools*.nupkg"
199+
$packageFile = Get-ChildItem -Path $folder -Filter Microsoft.NET.StringTools*.nupkg | Select-Object -First 1
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+
215+
{
216+
$props += @(
217+
"Microsoft.Build.Conversion.Core=$MicrosoftNETStringToolsPackageVersion",
218+
"Microsoft.Build.Engine=$MicrosoftNETStringToolsPackageVersion"
219+
)
220+
}
221+
$propsValue = $props -join ";"
222+
Write-Host "Setting InsertPackagePropsValues to '$propsValue'"
223+
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)"
224+
- task: 1ES.PublishNuGet@1
225+
displayName: 'Push MSBuild CoreXT packages'
226+
inputs:
227+
packageParentPath: '$(Build.ArtifactStagingDirectory)'
228+
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern);$(ExternalAPIsPackagePattern)
229+
nuGetFeedType: internal
230+
publishVstsFeed: VS
231+
allowPackageConflicts: true
232+
- template: /azure-pipelines/WIFtoPATauth.yml@self
233+
parameters:
234+
wifServiceConnectionName: azure-public/vside package push
235+
deadPATServiceConnectionId: 42175e93-c771-4a4f-a132-3cca78f44b3b
236+
- task: 1ES.PublishNuGet@1
237+
displayName: 'Push MSBuild packages to VSSDK'
238+
inputs:
239+
packageParentPath: '$(Build.ArtifactStagingDirectory)'
240+
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern)
241+
nuGetFeedType: external
242+
publishFeedCredentials: azure-public/vssdk
243+
allowPackageConflicts: true
244+
- task: PowerShell@2
245+
name: PrintTargetBranch
246+
inputs:
247+
targetType: inline
248+
script: |
249+
Write-Host "InsertTargetBranch: $(InsertTargetBranch)"
250+
- task: MicroBuildInsertVsPayload@4
251+
name: MicroBuildInsertVsPayload_4
252+
displayName: Insert VS Payload
253+
inputs:
254+
LinkWorkItemsToPR: true
255+
TeamName: $(TeamName)
256+
TeamEmail: $(TeamEmail)
257+
TargetBranch: $(InsertTargetBranch)
258+
InsertionPayloadName: $(InsertPayloadName)
259+
PackagePropsValues: $(InsertPackagePropsValues)
260+
InsertionDescription: $(InsertDescription)
261+
ComponentJsonValues: $(InsertJsonValues)
262+
DefaultConfigValues: $(InsertConfigValues)
263+
InsertionReviewers: MSBuild,VS ProTools
264+
CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
265+
AutoCompletePR: true
266+
AutoCompleteMergeStrategy: Squash
267+
InsertionBuildPolicy: Request Perf DDRITs

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
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
</IgnorePatterns>
2121
<Usages>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
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>2aade6beb02ea367fd97c4070a4198802fe61c03</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‎

Lines changed: 2 additions & 2 deletions
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.10.13</VersionPrefix>
5+
<VersionPrefix>17.10.14</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.8.3</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
@@ -40,7 +40,7 @@
4040
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
4141
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
4242
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
43-
<SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
43+
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
4444
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
4545
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
4646
</PropertyGroup>

‎src/MSBuild/MSBuild.csproj‎

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

‎src/MSBuild/app.amd64.config‎

Lines changed: 2 additions & 2 deletions
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‎

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