Skip to content

Commit 488f62d

Browse files
[Infra] Remove SDK issue workaround (#6767)
1 parent 6648ff3 commit 488f62d

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
<ArtifactsPath>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'artifacts'))</ArtifactsPath>
44
<UseArtifactsOutput>true</UseArtifactsOutput>
55
</PropertyGroup>
6-
<!-- HACK Workaround for https://github.com/dotnet/sdk/issues/51265 -->
7-
<PropertyGroup>
8-
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
9-
</PropertyGroup>
106
</Project>

test/Directory.Build.targets

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,18 @@
55
<ItemGroup Condition="'$(ReferenceCoyotePackages)' == 'true'">
66
<PackageReference Include="Microsoft.Coyote" />
77

8-
<!-- System.Text.Json is an indirect reference through Coyote. This
9-
reference is needed to mitigate:
10-
https://github.com/advisories/GHSA-hh2w-p6rv-4g7w. Remove this if Coyote
11-
publishes a fixed version. -->
12-
<PackageReference Include="System.Text.Json" VersionOverride="8.0.6" />
8+
<!--
9+
System.Text.Json is an indirect reference through Coyote which flags
10+
the GitHub Security Advisories listed below. However, if we reference
11+
System.Text.Json directly, the .NET 10 SDK will generate a NU1510
12+
warning that the package reference is redundant and will be pruned,
13+
so instead just suppress the advisories as the in-box version will
14+
be selected and will be a patched version with no vulnerability.
15+
16+
Remove this if Coyote publishes a fixed version.
17+
-->
18+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-8g4q-xg66-9fp4" />
19+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hh2w-p6rv-4g7w" />
1320
</ItemGroup>
1421

1522
</Project>

0 commit comments

Comments
 (0)