Skip to content

Commit

Permalink
Merge pull request #1025 from dotnet/dev/jmarolf/json-library-load-error
Browse files Browse the repository at this point in the history
Fix Microsoft.CodeAnalysis.Analyzer.Testing nuget package dependencies for downstream clients
  • Loading branch information
jmarolf authored Oct 11, 2022
2 parents cbcc3f0 + d848ffe commit 0689edc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Microsoft.CodeAnalysis.Testing/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

<!-- Needed to override the transitive 9.0.1 version brought in by the 16.1.1 Microsoft.NET.Test.Sdk -->
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" ExcludeAssets="all" />
</ItemGroup>

<!-- Use a different versioning scheme for nuget packages -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</When>
<Otherwise>
<PropertyGroup>
<NuGetApiVersion>5.6.0</NuGetApiVersion>
<NuGetApiVersion>6.3.0</NuGetApiVersion>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<TestTargetFrameworks>netcoreapp3.1;net472;net46</TestTargetFrameworks>
<TestTargetFrameworks>netcoreapp3.1;net472</TestTargetFrameworks>
<SourceGeneratorTestTargetFrameworks>netcoreapp3.1;net472</SourceGeneratorTestTargetFrameworks>

<!-- Workaround dependencies that do not yet support netcoreapp3.1 https://github.com/dotnet/roslyn/issues/45114 -->
Expand Down

0 comments on commit 0689edc

Please sign in to comment.