Skip to content

Commit

Permalink
Merge pull request #1173 from microsoft/fix1163
Browse files Browse the repository at this point in the history
Reference and ship the same version of System.Text.Encodings.Web
  • Loading branch information
AArnott authored May 4, 2024
2 parents 4714ffd + e15541a commit 29bba46
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Reflection.Metadata" Version="7.0.0" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.2" />
<PackageVersion Include="System.Text.Encodings.Web" Version="4.7.1" />
<PackageVersion Include="System.Text.Json" Version="4.7.2" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/nonsdk/NativeMethods.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
// This file may be blank, but it exercises the analyzer's System.Text.Json and dependencies.
}
3 changes: 3 additions & 0 deletions integration-tests/sdk/NativeMethods.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
// This file may be blank, but it exercises the analyzer's System.Text.Json and dependencies.
}

0 comments on commit 29bba46

Please sign in to comment.