From cd5121ca48784af441ab900fb27541bcb855e521 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 16 Jan 2025 19:50:33 +0100
Subject: [PATCH] Suppress CP1002 temporarily via NoWarn

The NoWarn can be removed when https://github.com/dotnet/sdk/pull/46059 got merged and consumed with a new .NET SDK.
---
 .../src/Microsoft.Extensions.Caching.SqlServer.csproj |  3 ++-
 .../DataProtection/src/CompatibilitySuppressions.xml  | 11 -----------
 .../src/Microsoft.AspNetCore.DataProtection.csproj    |  2 ++
 .../Extensions/src/CompatibilitySuppressions.xml      | 11 -----------
 ...rosoft.AspNetCore.DataProtection.Extensions.csproj |  2 ++
 .../src/CompatibilitySuppressions.xml                 | 11 -----------
 ...spNetCore.DataProtection.StackExchangeRedis.csproj |  2 ++
 .../JsonPatch/src/CompatibilitySuppressions.xml       | 11 -----------
 .../src/Microsoft.AspNetCore.JsonPatch.csproj         |  2 ++
 .../Embedded/src/CompatibilitySuppressions.xml        |  8 --------
 ...Microsoft.Extensions.FileProviders.Embedded.csproj |  2 ++
 .../src/CompatibilitySuppressions.xml                 | 11 -----------
 ...ft.AspNetCore.SignalR.Protocols.MessagePack.csproj |  2 ++
 .../src/CompatibilitySuppressions.xml                 | 11 -----------
 ...AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj |  2 ++
 15 files changed, 16 insertions(+), 75 deletions(-)
 delete mode 100644 src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml
 delete mode 100644 src/DataProtection/Extensions/src/CompatibilitySuppressions.xml
 delete mode 100644 src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml
 delete mode 100644 src/Features/JsonPatch/src/CompatibilitySuppressions.xml
 delete mode 100644 src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml
 delete mode 100644 src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml

diff --git a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj
index 3088ff699532..8ebea21bcbbd 100644
--- a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj
+++ b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj
@@ -6,7 +6,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>cache;distributedcache;sqlserver</PackageTags>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <NoWarn>$(NoWarn);PKG0001</NoWarn>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);PKG0001;CP1002</NoWarn>
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
diff --git a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml b/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
index 92fa8a526a84..d0b826767e15 100644
--- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
+++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
@@ -12,6 +12,8 @@
     <Nullable>annotations</Nullable>
     <Nullable Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">enable</Nullable>
     <IsTrimmable>true</IsTrimmable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml b/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/Extensions/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
index 5b44128f30b5..9ad2c00076a9 100644
--- a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
+++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
@@ -8,6 +8,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;dataprotection</PackageTags>
     <IsTrimmable>true</IsTrimmable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml b/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
index a53ec8f13207..dbe92b50cefc 100644
--- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
+++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj
@@ -7,6 +7,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;dataprotection;redis</PackageTags>
     <IsTrimmable>true</IsTrimmable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml b/src/Features/JsonPatch/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/Features/JsonPatch/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
index 57cc0737ff21..4ec43204abcb 100644
--- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
+++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj
@@ -8,6 +8,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;json;jsonpatch</PackageTags>
     <Nullable>disable</Nullable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
index d8abf08409d2..9487263e1b4d 100644
--- a/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
+++ b/src/FileProviders/Embedded/src/CompatibilitySuppressions.xml
@@ -1,13 +1,5 @@
 <?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP1003</DiagnosticId>
     <Target>lib/net7.0/Microsoft.Extensions.FileProviders.Embedded.dll</Target>
diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
index 590c4e980042..2a5f0036e254 100644
--- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
+++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj
@@ -13,6 +13,8 @@
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <Nullable>enable</Nullable>
     <IsTrimmable>true</IsTrimmable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
index be6f0bab32e3..884abff931b6 100644
--- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
+++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj
@@ -6,6 +6,8 @@
     <RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml b/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml
deleted file mode 100644
index aeb07dcc013f..000000000000
--- a/src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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">
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>SMDiagnostics.dll</Target>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP1002</DiagnosticId>
-    <Target>System.ServiceModel.Internals.dll</Target>
-  </Suppression>
-</Suppressions>
\ No newline at end of file
diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
index 6b621b28bc00..4253fe9c92d3 100644
--- a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
+++ b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj
@@ -6,6 +6,8 @@
     <RootNamespace>Microsoft.AspNetCore.SignalR</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
+    <!-- Temporarily suppress APICompat CP1002 which warns on .NET Framework as it can't find load internal assemblies: SMDiagnostics.dll and System.ServiceModel.Internals.dll -->
+    <NoWarn>$(NoWarn);CP1002</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>