|
13 | 13 |
|
14 | 14 | <Nullable>Enable</Nullable>
|
15 | 15 |
|
16 |
| - <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='net472'">True</UseSystemTextJson> |
| 16 | + <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0'">True</UseSystemTextJson> |
17 | 17 | <DefineConstants Condition="'$(UseSystemTextJson)'=='True'">$(DefineConstants);USE_SYSTEM_TEXT_JSON</DefineConstants>
|
18 | 18 |
|
| 19 | + <!-- Netfx version of the resolver builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS --> |
| 20 | + <SystemTextJsonVersionOverride>8.0.0</SystemTextJsonVersionOverride> |
| 21 | + |
19 | 22 | <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
|
20 | 23 | <EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
|
21 | 24 |
|
|
100 | 103 | </ItemGroup>
|
101 | 104 |
|
102 | 105 | <ItemGroup>
|
103 |
| - <!-- No PackageReference to System.Text.Json necessary, because it's included in .NET 5.0 and higher --> |
| 106 | + <!-- No PackageReference to System.Text.Json necessary when targeting .NET, because it's included in .NET 5.0 and higher --> |
| 107 | + <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersionOverride)" Condition="'$(UseSystemTextJson)'=='True' and '$(TargetFramework)'=='net472'"/> |
104 | 108 | <PackageReference Include="Newtonsoft.Json" Condition="'$(UseSystemTextJson)'!='True'"/>
|
105 | 109 |
|
106 | 110 | <!-- Reference this package to avoid package downgrade errors. See https://github.com/dotnet/sdk/issues/3044 for details -->
|
|
139 | 143 |
|
140 | 144 | <ItemGroup>
|
141 | 145 | <ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
142 |
| - <ExpectedDependencies Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" /> |
| 146 | + <ExpectedDependencies Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" /> |
| 147 | + <ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" /> |
143 | 148 | <ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
144 | 149 | <ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
145 | 150 | <ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
|
146 | 151 | <ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
147 | 152 | <ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
148 | 153 | <ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
|
| 154 | + <ExpectedDependencies Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" /> |
| 155 | + <ExpectedDependencies Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" /> |
149 | 156 | </ItemGroup>
|
150 | 157 |
|
151 | 158 | <!-- Check that the dependencies of the output assembly match our expectations -->
|
|
0 commit comments