Skip to content

Commit 989f62c

Browse files
authored
Keep our System.Text.Json version used in HostModel in sync with MSBuild (#101199)
1 parent 7f2e028 commit 989f62c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Directory.Build.targets

+3-2
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,10 @@
8686
</PropertyGroup>
8787

8888
<PropertyGroup>
89-
<!-- when building from source we need to use the current version of MetadataLoadContext as the toolset version, but source-build imports
90-
another props file which overrides the SystemReflectionMetadataLoadContextVersion from Version.props so we can't set it there -->
89+
<!-- when building from source we need to use the current version of various packages as the toolset version, but source-build imports
90+
another props file which overrides the versions from Version.props so we can't set it there -->
9191
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
92+
<SystemTextJsonToolsetVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SystemTextJsonVersion)</SystemTextJsonToolsetVersion>
9293
</PropertyGroup>
9394

9495
<Target Name="ValidateTargetOSLowercase"

eng/Versions.props

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
<runtimenativeSystemIOPortsVersion>9.0.0-preview.4.24215.1</runtimenativeSystemIOPortsVersion>
135135
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
136136
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
137+
<SystemTextJsonToolsetVersion>8.0.0</SystemTextJsonToolsetVersion>
137138
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
138139
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
139140
<!-- Runtime-Assets dependencies -->

src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
23-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
23+
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
@@ -35,5 +35,3 @@
3535

3636

3737
</Project>
38-
39-

0 commit comments

Comments
 (0)