Skip to content

Clean up STJ references Fixes #39902 #40645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 31, 2024
Merged

Clean up STJ references Fixes #39902 #40645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9763f0b
Reimplement STJ change
Forgind Jul 18, 2024
04482a8
Oops
Forgind Jul 18, 2024
9fe4889
PR feedback
Forgind Jul 19, 2024
3cf8751
Merge branch 'main' into stj-version
Forgind Jul 22, 2024
2d84bf5
Merge branch 'main' of https://github.com/dotnet/sdk into stj-version
Forgind Jul 23, 2024
bf21493
change base to toolset
Forgind Jul 23, 2024
091f0b4
Back up to 8.0.4
Forgind Jul 26, 2024
1a2fee1
Merge branch 'main' into stj-version
Forgind Jul 29, 2024
337965f
expect 8.0.0.4
Forgind Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@
<SystemSecurityPermissionsPackageVersion>9.0.0-rc.1.24378.5</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-rc.1.24378.5</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>9.0.0-rc.1.24378.5</SystemTextJsonPackageVersion>
<!-- This is a minimum version for various projects to work. It's used for netfx-targeted components that run in Visual Studio
because in those cases, Visual Studio is providing System.Text.Json, and we should work with whichever version it ships. -->
<SystemTextJsonToolsetPackageVersion>8.0.4</SystemTextJsonToolsetPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-rc.1.24378.5</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/BuiltInTools/dotnet-watch/dotnet-watch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
<PackageReference Include="Microsoft.NET.StringTools" ExcludeAssets="runtime" PrivateAssets="All" />

<!--
Explicit System.Text.Json package reference is required for source-build to pick up the live package.
Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
-->
<PackageReference Include="System.Text.Json" />
Copy link
Member

@marcpopMSFT marcpopMSFT Jul 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably want a review from @tmat but with CPM now enabled, this may not be required anymore like it was before.

Copy link
Contributor Author

@Forgind Forgind Jul 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having an explicit package reference is no longer required, or removing it is no longer required?

Copy link
Member

@marcpopMSFT marcpopMSFT Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having the explicit reference is no longer required, I think. If I understand the original issue per the comment, a transitive version was picked up that didn't work with source build and adding the explicit reference up-versioned to one that was supported. CPM should do the version change as well.

<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
<PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageReference Include="System.Text.Json" VersionOverride="8.0.3" />
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="System.Text.Json" VersionOverride="8.0.3" />
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
<Reference Include="System" />
<Reference Include="System.Core" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" />
Expand Down Expand Up @@ -137,7 +137,7 @@

<ItemGroup>
<ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<ExpectedDependencies Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Expand Down
2 changes: 1 addition & 1 deletion .../Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<!-- Netfx version builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
Comment on lines 29 to 30
Copy link
Contributor

@kasperk81 kasperk81 Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed?

Copy link
Contributor Author

@Forgind Forgind Jul 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was confused in looking at the 8.0.4xx-targeted version, as this wasn't needed then...but that's because it was using Newtonsoft.Json instead. Apparently it was fully switched to STJ, so now it became a problem. Thanks for catching that 🙂

<PackageReference Include="System.Text.Json" VersionOverride="8.0.3" />
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
Expand Down