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.

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

Revert "Update NuGet to use Newtonsoft.Json 11.0.1 (#3347)" #3383

Merged
merged 1 commit into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build/bootstrap.proj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageDownload Include="Microsoft.VisualStudio.Composition" version="[15.8.98]" />
<PackageDownload Include="Microsoft.VisualStudio.ProjectSystem" version="[16.0.201-pre-g7d366164d0]" />
<PackageDownload Include="Microsoft.Web.Xdt" version="[2.1.2]" />
<PackageDownload Include="Newtonsoft.Json" version="[11.0.1]" />
<PackageDownload Include="Newtonsoft.Json" version="[9.0.1]" />
<PackageDownload Include="NuGet.Build.Tasks.Pack" version="[4.9.2]" />
<PackageDownload Include="NuGet.Client.EndToEnd.TestData" version="[1.0.0]" />
<PackageDownload Include="NuGet.Core" version="[2.14.0-rtm-832]" />
Expand Down
2 changes: 1 addition & 1 deletion build/packages.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<MicrosoftBuildPackageVersion Condition="'$(MicrosoftBuildPackageVersion)' == ''">16.5.0-preview-19606-01</MicrosoftBuildPackageVersion>
<NewtonsoftJsonPackageVersion Condition="$(NewtonsoftJsonPackageVersion) == ''">11.0.1</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion Condition="$(NewtonsoftJsonPackageVersion) == ''">9.0.1</NewtonsoftJsonPackageVersion>
<SystemPackagesVersion>4.3.0</SystemPackagesVersion>
<VSComponentsVersion>16.4.280</VSComponentsVersion>
<VSFrameworkVersion>16.5.29714.20</VSFrameworkVersion>
Expand Down
2 changes: 1 addition & 1 deletion build/sign.proj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<FilesToSign Include="$(SolutionPackagesFolder)lucene.net\3.0.3\lib\NET40\Lucene.Net.dll">
<Authenticode>3PartySHA2</Authenticode>
</FilesToSign>
<FilesToSign Include="$(SolutionPackagesFolder)newtonsoft.json\11.0.1\lib\net45\Newtonsoft.Json.dll">
<FilesToSign Include="$(SolutionPackagesFolder)newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll">
<Authenticode>3PartySHA2</Authenticode>
</FilesToSign>
<FilesToSign Include="$(ArtifactsDirectory)microsoft.web.xdt\2.1.2\lib\net40\**\Microsoft.Web.XmlTransform.resources.dll">
Expand Down
2 changes: 1 addition & 1 deletion setup/Microsoft.VisualStudio.NuGet.BuildTools.swixproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ReferenceOutputPath>$(ArtifactsDirectory)NuGet.VisualStudio.Client\$(VisualStudioVersion)\bin\$(Configuration)\</ReferenceOutputPath>
<NuGetTargetsBasePath>$(RepositoryRootDirectory)src\NuGet.Core\NuGet.Build.Tasks\</NuGetTargetsBasePath>
<XmlTransformPath>$(ArtifactsDirectory)microsoft.web.xdt\2.1.2\lib\net40\</XmlTransformPath>
<NewtonsoftJsonPath>$(SolutionPackagesFolder)newtonsoft.json\11.0.1\lib\net45\</NewtonsoftJsonPath>
<NewtonsoftJsonPath>$(SolutionPackagesFolder)newtonsoft.json\9.0.1\lib\net45\</NewtonsoftJsonPath>

</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<Link>Modules\NuGet\NuGet.PackageManagement.PowerShellCmdlets.dll-Help.xml</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(SolutionPackagesFolder)newtonsoft.json\11.0.1\lib\net45\Newtonsoft.Json.dll">
<Content Include="$(SolutionPackagesFolder)newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll">
<Link>Newtonsoft.Json.dll</Link>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.ServiceHub.Framework" NoWarn="NU1605"/>
<PackageReference Include="Microsoft.VisualStudio.RpcContracts" />
<PackageReference Include="Newtonsoft.Json" NoWarn="NU1605" PrivateAssets="all" ExcludeAssets="all" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersionCore)" NoWarn="NU1605" PrivateAssets="all" ExcludeAssets="all" />
</ItemGroup>
<Import Project="$(BuildCommonDirectory)common.targets" />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.VisualStudio.Common\NuGet.VisualStudio.Common.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" NoWarn="NU1605" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<Description>Unit tests for the utilities included using shared compilation.</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<!-- Include shared files for netcore projects -->
<ItemGroup>
<Compile Include="$(SharedDirectory)\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<ProjectReference Include="$(NuGetCoreSrcDirectory)NuGet.Versioning\NuGet.Versioning.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<ItemGroup>
<ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.Console\NuGet.Console.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" NoWarn="NU1605" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<ItemGroup>
<ProjectReference Include="$(NuGetClientsSrcDirectory)NuGet.PackageManagement.UI\NuGet.PackageManagement.UI.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" NoWarn="NU1605" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Test.Apex.VisualStudio" />
<PackageReference Include="Newtonsoft.Json" NoWarn="NU1605" />
<PackageReference Include="Xunit.StaFact" />
</ItemGroup>
<ItemGroup>
Expand Down