Skip to content

Commit 8192651

Browse files
committed
Merged PR 51089: Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will...
Add back the STJ pinning as DependencyModel has a 8.0.6 dependency which will break in VS tasks ---- #### AI description (iteration 1) #### PR Classification This pull request reintroduces dependency version pinning for System.Text.Json to ensure compatibility with ComponentModel's 8.0.6 dependency. #### PR Summary The changes add a new pinned version property and update multiple project files to explicitly reference the pinned System.Text.Json version. This ensures consistency with Microsoft.Extensions.DependencyModel and avoids conflicts with the version unified by MSBuild in VS 17.10. - `eng/Versions.props`: Added `<PinnedSystemTextJsonPackageVersion>` with value 8.0.5 and an explanatory comment. - `src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj`: Updated the System.Text.Json PackageReference to use the pinned version. - `src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj`: Modified the System.Text.Json PackageReference with the VersionOverride attribute. - `src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj`: Updated the System.Text.Json PackageReference to include the VersionOverride. - `src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj`: Applied the VersionOverride to the System.Text.Json PackageReference. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
1 parent 88a05a0 commit 8192651

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

eng/Versions.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
<SystemSecurityPermissionsPackageVersion>8.0.0</SystemSecurityPermissionsPackageVersion>
8282
<SystemServiceProcessServiceControllerVersion>8.0.1</SystemServiceProcessServiceControllerVersion>
8383
<SystemTextJsonPackageVersion>8.0.6</SystemTextJsonPackageVersion>
84+
<!-- Match the version used by Microsoft.Extensions.DependencyModel which is higher than what MSBuild in VS 17.10 unifies to -->
85+
<PinnedSystemTextJsonPackageVersion>8.0.5</PinnedSystemTextJsonPackageVersion>
8486
<SystemWindowsExtensionsPackageVersion>8.0.0</SystemWindowsExtensionsPackageVersion>
8587
<SystemFormatsAsn1Version>8.0.2</SystemFormatsAsn1Version>
8688
</PropertyGroup>

src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4040
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
4141
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
42-
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
42+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
4343
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4444
</ItemGroup>
4545

src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4040
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
4141
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
42-
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
42+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
4343
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4444
<PackageReference Include="Microsoft.Css.Parser" />
4545
</ItemGroup>

src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
7373
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
7474
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="$(SystemReflectionMetadataVersion)" />
75-
<PackageReference Include="System.Text.Json" />
75+
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
7676
</ItemGroup>
7777

7878
<!-- These are loaded from the CLI's copy on .NET Core, we don't need to duplicate them on disk -->

src/WebSdk/Publish/Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Reference Include="System.Net.Http" />
3939
<Reference Include="System.Xml" />
4040
<PackageReference Include="Microsoft.Web.Deployment" />
41-
<PackageReference Include="System.Text.Json" />
41+
<PackageReference Include="System.Text.Json" VersionOverride="$(PinnedSystemTextJsonPackageVersion)" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<Compile Include="**\*.cs" />

0 commit comments

Comments
 (0)