Skip to content

Commit 815ca89

Browse files
[release/9.0-staging] Bump System.Text.Json toolset version (#113385)
* Bump System.Text.Json toolset version * Use PackageDownloadAndReference same as upstream PR * Change System.Buffers to ref/net45 --------- Co-authored-by: Steve Pfister <stpfiste@microsoft.com>
1 parent 979542f commit 815ca89

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

eng/Versions.props

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,16 @@
136136
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
137137
<runtimenativeSystemIOPortsVersion>9.0.0-rtm.24511.16</runtimenativeSystemIOPortsVersion>
138138
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
139+
<MicrosoftBclAsyncInterfacesToolsetVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
140+
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
139141
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
140-
<SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
142+
<SystemMemoryToolsetVersion>4.5.5</SystemMemoryToolsetVersion>
143+
<SystemTextJsonToolsetVersion>8.0.5</SystemTextJsonToolsetVersion>
144+
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
145+
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
141146
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
142-
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
147+
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
148+
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
143149
<!-- Runtime-Assets dependencies -->
144150
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25462.1</SystemRuntimeNumericsTestDataVersion>
145151
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25462.1</SystemComponentModelTypeConverterTestDataVersion>

src/tasks/Directory.Build.targets

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@
1212

1313
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net462'))">
1414
<!-- These assemblies and their dependencies are made available by MSBuild on .NET Framework, we only reference for compilation -->
15-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
16-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" ExcludeAssets="Runtime" PrivateAssets="All" NoWarn="NU1901;NU1902;NU1903;NU1904" />
15+
<PackageDownloadAndReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesToolsetVersion)" Folder="lib/net462" />
16+
<PackageDownloadAndReference Include="System.Buffers" Version="$(SystemBuffersToolsetVersion)" Folder="ref/net45" />
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" />
1723
</ItemGroup>
1824

1925
<Import Project="$(RepositoryEngineeringDir)PackageDownloadAndReference.targets" />

0 commit comments

Comments
 (0)