Skip to content

Commit 667c170

Browse files
Refactor wasmappbuilder's System.Text.Json reference to use a versions.props property (#70582)
* Refactor wasmappbuilder's System.Text.Json version reference to use a versions.props property * Update per code review and refactor MetadataLoadContext version
1 parent 7c06020 commit 667c170

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<SystemMemoryVersion>4.5.4</SystemMemoryVersion>
101101
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
102102
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
103+
<SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
103104
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
104105
<SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
105106
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>

src/tasks/WasmAppBuilder/WasmAppBuilder.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020

2121
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
2222
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
23-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.1" />
24-
<PackageReference Include="System.Text.Json" Version="6.0.0" PrivateAssets="all" />
23+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
24+
25+
<!-- When we requested a version that is newer than what comes with Visual Studio version of msbuild, it causes problems with
26+
running the task from inside VS. Therefore, we are using the moving version only for source-build. -->
27+
<PackageReference Include="System.Text.Json" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="6.0.0" PrivateAssets="all" />
28+
<PackageReference Include="System.Text.Json" Condition="'$(DotNetBuildFromSource)' == 'true'" Version="$(SystemTextJsonVersion)" PrivateAssets="all" />
2529
</ItemGroup>
2630

2731
<Target Name="GetFilesToPackage" Returns="@(FilesToPackage)">

0 commit comments

Comments
 (0)