From 52190a3a3de6ef9a556583cbcb2381073e7197bc Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Sat, 4 Dec 2021 12:00:46 -0800
Subject: [PATCH] Enabling NuGet package validation (#2618)

---
 .../CompatibilitySuppressions.xml             | 104 ++++++++++++++++++
 Src/Newtonsoft.Json/Newtonsoft.Json.csproj    |   7 ++
 2 files changed, 111 insertions(+)
 create mode 100644 Src/Newtonsoft.Json/CompatibilitySuppressions.xml

diff --git a/Src/Newtonsoft.Json/CompatibilitySuppressions.xml b/Src/Newtonsoft.Json/CompatibilitySuppressions.xml
new file mode 100644
index 000000000..64d04acc5
--- /dev/null
+++ b/Src/Newtonsoft.Json/CompatibilitySuppressions.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <!--Types removed from lib/net35 which are present on lib/net20-->
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Func`1</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Func`2</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Func`3</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Func`4</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Func`5</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Action</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Action`2</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Action`3</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.Action`4</Target>
+    <Left>lib/net20/Newtonsoft.Json.dll</Left>
+    <Right>lib/net35/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <!--Types which were removed from lib/netstandard2.0 but are present in lib/netstandard1.3-->
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Runtime.Serialization.Formatters.FormatterAssemblyStyle</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.SerializationBinder</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Newtonsoft.Json.TraceLevel</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <!--Type inherits from Newtonsoft.Json.SerializationBinder in netstandard1.3 but not in netstandard2.0-->
+  <Suppression>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Newtonsoft.Json.Serialization.DefaultSerializationBinder</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <!--These members exist in netstandard1.3, but not on netstandard2.0-->
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception)</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Newtonsoft.Json.Serialization.MemoryTraceWriter.Trace(Newtonsoft.Json.TraceLevel,System.String,System.Exception)</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+  <!--Interface member got added in netstandard2.0-->
+  <Suppression>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Newtonsoft.Json.Serialization.ITraceWriter.Trace(System.Diagnostics.TraceLevel,System.String,System.Exception)</Target>
+    <Left>lib/netstandard1.3/Newtonsoft.Json.dll</Left>
+    <Right>lib/netstandard2.0/Newtonsoft.Json.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
index 6f4bea65f..fd834d77a 100644
--- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
+++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj
@@ -33,6 +33,13 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <CodeAnalysisRuleset>Newtonsoft.Json.ruleset</CodeAnalysisRuleset>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!--Package Validation-->
+    <EnablePackageValidation>true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>13.0.1</PackageValidationBaselineVersion>
+    <!--CP0003 will be logged when the assembly identity between baseline package and current don't match.
+    Disable that warning since local builds do not strong-name sign the assembly, causing a mistmatch when comparing
+    the previously shipped assemblies and current.-->
+    <NoWarn Condition="'$(SignAssembly)' != 'true'">$(NoWarn);CP0003</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="**\*.orig" />