From d5d9954ac52ae1ca3e7104f2aea2cae8c6d753ba Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 21 Nov 2022 18:05:41 +0100
Subject: [PATCH] Update APICompat to be able to pass in multiple suppression
 files (#78610)

* Update APICompat to be able to pass in multiple suppression files
---
 eng/Version.Details.xml                        |  4 ----
 eng/Versions.props                             |  3 +--
 .../ref/System.Threading.Thread.csproj         |  3 ++-
 .../src/System.Threading.Thread.csproj         | 11 +++++------
 .../ref/System.Threading.ThreadPool.csproj     |  5 +++--
 .../src/System.Threading.ThreadPool.csproj     | 18 +++++++++++-------
 src/libraries/apicompat/ApiCompat.proj         | 12 ++++++------
 .../Wasm.Browser.EventPipe.Sample.csproj       |  2 +-
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f6a15966d05fa6..8f1419c12ac434 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -102,10 +102,6 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22554.2">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22554.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 66b7ad3d92e74d..60722fbdeed41b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,9 +80,8 @@
   <PropertyGroup>
     <StaticCsVersion>0.2.0</StaticCsVersion>
     <!-- SDK dependencies -->
-    <MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22511.23</MicrosoftDotNetApiCompatTaskVersion>
+    <MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22571.3</MicrosoftDotNetApiCompatTaskVersion>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22554.2</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22554.2</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22554.2</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftDotNetGenAPIVersion>8.0.0-beta.22554.2</MicrosoftDotNetGenAPIVersion>
diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
index 66bf728fff7292..a013e7ba3d9692 100644
--- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <FeatureWasmThreads>false</FeatureWasmThreads>
     <DefineConstants Condition="'$(FeatureWasmThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_THREADS</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="System.Threading.Thread.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Threading\ref\System.Threading.csproj" />
diff --git a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
index ab203741b92b2e..aaf9db8a29fd4e 100644
--- a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
@@ -2,16 +2,15 @@
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
-    <FeatureWasmThreads>false</FeatureWasmThreads>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(WasmEnableThreads)' == 'true' or
-                            '$(MonoWasmBuildVariant)' == 'multithread'">
+  <ItemGroup Condition="'$(WasmEnableThreads)' == 'true' or
+                        '$(MonoWasmBuildVariant)' == 'multithread'">
     <!-- when wasm threading is enabled the implementation in CoreLib won't have the UnsupportedOSAttribute for browser,
          but this contract still does since we only expose the wasm threading through System.Diagnostics.Threading.Thread.WebAssembly.Threading
-         so we need to baseline the ApiCompat errors related to that -->
-    <CompatibilitySuppressionFilePath>$(MSBuildThisFileDirectory)CompatibilitySuppressions.Threading.xml</CompatibilitySuppressionFilePath>
-  </PropertyGroup>
+         so we need to baseline the ApiCompat errors related to that. -->
+    <ApiCompatSuppressionFile Include="$(MSBuildThisFileDirectory)CompatibilitySuppressions.Threading.xml" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />
diff --git a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
index 8db89a9f99d7dd..4c918c153ba698 100644
--- a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
+++ b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <FeatureWasmThreads>false</FeatureWasmThreads>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants Condition="'$(FeatureWasmThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_THREADS</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="System.Threading.ThreadPool.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Threading.Overlapped\ref\System.Threading.Overlapped.csproj" />
diff --git a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
index 7f5ca51a52c5d5..f20973b1c8c181 100644
--- a/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
+++ b/src/libraries/System.Threading.ThreadPool/src/System.Threading.ThreadPool.csproj
@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
   </PropertyGroup>
+
+  <ItemGroup Condition="'$(WasmEnableThreads)' == 'true' or
+                        '$(MonoWasmBuildVariant)' == 'multithread'">
+    <!-- when wasm threading is enabled the implementation in CoreLib won't have the UnsupportedOSAttribute for browser,
+         but this contract still does since we only expose the wasm threading through System.Diagnostics.Threading.ThreadPool.WebAssembly.Threading
+         so we need to baseline the ApiCompat errors related to that. -->
+    <ApiCompatSuppressionFile Include="$(MSBuildThisFileDirectory)CompatibilitySuppressions.Threading.xml" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />
   </ItemGroup>
-  <PropertyGroup Condition="'$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread'">
-    <!-- when wasm threading is enabled the implementation in CoreLib won't have the UnsupportedOSAttribute for browser,
-         but this contract still does since we only expose the wasm threading through System.Diagnostics.Threading.ThreadPool.WebAssembly.Threading
-         so we need to baseline the ApiCompat errors related to that -->
-    <CompatibilitySuppressionFilePath>$(MSBuildThisFileDirectory)CompatibilitySuppressions.Threading.xml</CompatibilitySuppressionFilePath>
-  </PropertyGroup>
+
 </Project>
diff --git a/src/libraries/apicompat/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj
index 1ef37e902d976c..aae70ebfbb9c9e 100644
--- a/src/libraries/apicompat/ApiCompat.proj
+++ b/src/libraries/apicompat/ApiCompat.proj
@@ -51,8 +51,8 @@
       LeftAssemblies="$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.netcore.app.ref', '$(NetCoreAppLatestStablePackageBaselineVersion)', 'ref', '$(NetCoreAppLatestStable)'))"
       RightAssemblies="@(ReferencePathWithRefAssemblies)"
       RoslynAssembliesPath="$(RoslynAssembliesPath)"
-      GenerateCompatibilitySuppressionFile="$(GenerateCompatibilitySuppressionFile)"
-      CompatibilitySuppressionFilePath="$(ApiCompatNetCoreAppLatestStableBaselineFile)"
+      GenerateSuppressionFile="$(ApiCompatGenerateSuppressionFile)"
+      SuppressionFiles="$(ApiCompatNetCoreAppLatestStableBaselineFile)"
       EnableRuleAttributesMustMatch="$(ApiCompatEnableRuleAttributesMustMatch)"
       ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
       LeftAssembliesTransformationPattern="@(ApiCompatNetCoreAppLatestStableLeftAssembliesTransformationPattern)"
@@ -63,8 +63,8 @@
       LeftAssemblies="$(NETStandard21RefPath)netstandard.dll"
       RightAssemblies="@(ReferencePathWithRefAssemblies)"
       RoslynAssembliesPath="$(RoslynAssembliesPath)"
-      GenerateCompatibilitySuppressionFile="$(GenerateCompatibilitySuppressionFile)"
-      CompatibilitySuppressionFilePath="$(ApiCompatNetStandard21BaselineFile)"
+      GenerateSuppressionFile="$(ApiCompatGenerateSuppressionFile)"
+      SuppressionFiles="$(ApiCompatNetStandard21BaselineFile)"
       EnableRuleAttributesMustMatch="$(ApiCompatEnableRuleAttributesMustMatch)"
       ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
       LeftAssembliesTransformationPattern="@(ApiCompatNetStandard21LeftAssembliesTransformationPattern)"
@@ -75,8 +75,8 @@
       LeftAssemblies="$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibraryVersion)', 'build', 'netstandard2.0', 'ref'))"
       RightAssemblies="@(ReferencePathWithRefAssemblies)"
       RoslynAssembliesPath="$(RoslynAssembliesPath)"
-      GenerateCompatibilitySuppressionFile="$(GenerateCompatibilitySuppressionFile)"
-      CompatibilitySuppressionFilePath="$(ApiCompatNetStandard20BaselineFile)"
+      GenerateSuppressionFile="$(ApiCompatGenerateSuppressionFile)"
+      SuppressionFiles="$(ApiCompatNetStandard20BaselineFile)"
       EnableRuleAttributesMustMatch="$(ApiCompatEnableRuleAttributesMustMatch)"
       ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
       LeftAssembliesTransformationPattern="@(ApiCompatNetStandard20LeftAssembliesTransformationPattern)"
diff --git a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
index 4dd51a99c1b113..9b8cf06ad1ac03 100644
--- a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
+++ b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj
@@ -4,7 +4,7 @@
     <WasmBuildNative>true</WasmBuildNative>
     <FeatureWasmPerfTracing>true</FeatureWasmPerfTracing>
     <WasmEnablePerfTracing>true</WasmEnablePerfTracing>
-    <FeatureWasmThreads Condition="false">true</FeatureWasmThreads>
+    <!-- <FeatureWasmThreads>true</FeatureWasmThreads> -->
     <NoWarn>$(NoWarn);CA2007</NoWarn> <!-- consider ConfigureAwait() -->
   </PropertyGroup>