Skip to content

Commit 7efe7f7

Browse files
authored
Bump System.Text.Json toolset version (#113384)
Resolves CG alert
1 parent 889d514 commit 7efe7f7

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

eng/Versions.props

+8-2
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,16 @@
138138
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
139139
<runtimenativeSystemIOPortsVersion>10.0.0-preview.3.25152.4</runtimenativeSystemIOPortsVersion>
140140
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
141+
<MicrosoftBclAsyncInterfacesToolsetVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
142+
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
141143
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
142-
<SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
144+
<SystemMemoryToolsetVersion>4.5.5</SystemMemoryToolsetVersion>
145+
<SystemTextJsonToolsetVersion>8.0.5</SystemTextJsonToolsetVersion>
146+
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
147+
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
143148
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
144-
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
149+
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
150+
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
145151
<!-- Runtime-Assets dependencies -->
146152
<SystemRuntimeNumericsTestDataVersion>10.0.0-beta.25126.1</SystemRuntimeNumericsTestDataVersion>
147153
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.25126.1</SystemComponentModelTypeConverterTestDataVersion>

src/tasks/Directory.Build.targets

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<Project>
2-
3-
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
4-
52
<ItemGroup>
63
<!-- reference MSBuild directly to avoid bringing in it's package closure. These all represent assemblies available to tasks and provided by MSBuild -->
74
<PackageDownloadAndReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" Folder="ref/net472" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472'))" />
@@ -15,10 +12,17 @@
1512

1613
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(MSBuildProjectName)' != 'tasks'">
1714
<!-- These assemblies and their dependencies are made available by MSBuild on .NET Framework -->
18-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
19-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" ExcludeAssets="Runtime" PrivateAssets="All" NoWarn="NU1903" />
15+
<PackageDownloadAndReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesToolsetVersion)" Folder="lib/net462" />
16+
<PackageDownloadAndReference Include="System.Buffers" Version="$(SystemBuffersToolsetVersion)" Folder="lib/net461" />
17+
<PackageDownloadAndReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableToolsetVersion)" Folder="lib/net462" />
18+
<PackageDownloadAndReference Include="System.Memory" Version="$(SystemMemoryToolsetVersion)" Folder="lib/net461" />
19+
<PackageDownloadAndReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" Folder="lib/net462" />
20+
<PackageDownloadAndReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebToolsetVersion)" Folder="lib/net462" />
21+
<PackageDownloadAndReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" Folder="lib/net462" />
22+
<PackageDownloadAndReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsToolsetVersion)" Folder="lib/net461" />
2023
</ItemGroup>
2124

2225
<Import Project="$(RepositoryEngineeringDir)PackageDownloadAndReference.targets" Condition="'$(MSBuildProjectName)' != 'tasks'" />
2326

27+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
2428
</Project>

0 commit comments

Comments
 (0)