Skip to content
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

Exclude Newtonsoft.Json dependency from pkg #6997

Closed
wants to merge 4 commits into from
Closed

Exclude Newtonsoft.Json dependency from pkg #6997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ab1303
Exclude Newtonsoft.Json dependency from pkg
ViktorHofer Feb 23, 2021
2afd6b2
Exclude NuGet assemblies as well
ViktorHofer Feb 23, 2021
3475319
Build fix
ViktorHofer Feb 23, 2021
d99e763
Test build fix
ViktorHofer Feb 23, 2021
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
14 changes: 10 additions & 4 deletions src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,21 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
<!--Need to reference version 2.8.2 of CodeAnalysis so that we don't have downgrade issues with System.Reflection.Metadata version-->
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="NuGet.Commands" Version="$(NuGetVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetVersion)" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>

<!-- Don't include dependencies that are part of the SDK itself to avoid unification issues during load.
The SDK currently uses Newtonsoft.Json 11.0.1. -->
<ItemGroup>
<ExcludedPackageReferenceFromPublish Include="Newtonsoft.Json" Version="11.0.1" />
<ExcludedPackageReferenceFromPublish Include="NuGet.Commands" Version="$(NuGetVersion)" />
<ExcludedPackageReferenceFromPublish Include="NuGet.Packaging" Version="$(NuGetVersion)" />
<ExcludedPackageReferenceFromPublish Include="NuGet.ProjectModel" Version="$(NuGetVersion)" />
<PackageReference Include="@(ExcludedPackageReferenceFromPublish)" Publish="$(TargetFramework.StartsWith('net4'))" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Compile Include="..\..\Common\Internal\AssemblyResolver.cs" />
<Compile Include="..\..\Common\Internal\BuildTask.Desktop.cs" />
Expand Down
2 changes: 1 addition & 1 deletion ...ft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)"/>
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="NuGet.Commands" Version="$(NuGetVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetVersion)" />
Expand Down