From 74df68d2064d0bc51d5d1941f28e78c4ff983f59 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Sat, 3 Jul 2021 19:18:57 -0700
Subject: [PATCH 1/2] port system.diagnostics.performanceCounter

---
 Directory.Build.targets                       |   2 +-
 ...tem.Diagnostics.PerformanceCounter.pkgproj |  12 --
 .../src/CompatibilitySuppressions.xml         | 124 ++++++++++++++++++
 ...stem.Diagnostics.PerformanceCounter.csproj |  11 +-
 4 files changed, 133 insertions(+), 16 deletions(-)
 delete mode 100644 src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
 create mode 100644 src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0460647e6de5da..1e042103dbcc5a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -77,7 +77,7 @@
           Condition="'@(NETStandardCompatError)' != ''"
           Inputs="%(NETStandardCompatError.Identity)"
           Outputs="unused"
-          BeforeTargets="GetFiles">
+          BeforeTargets="_GetPackageFiles;GetFiles">
     <PropertyGroup>
       <_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterrors\%(NETStandardCompatError.Identity)\$(PackageId).targets</_NETStandardCompatErrorFilePath>
       <_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_'))</_NETStandardCompatErrorFileTarget>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj b/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
deleted file mode 100644
index 2fef4179be2b76..00000000000000
--- a/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <ItemGroup>
-    <ProjectReference Include="..\ref\System.Diagnostics.PerformanceCounter.csproj">
-      <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Diagnostics.PerformanceCounter.csproj" />
-    <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
-    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml b/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
new file mode 100644
index 00000000000000..fe46e5dfbd636d
--- /dev/null
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <!-- These types are forwarded on net461 https://github.com/dotnet/sdk/issues/18203-->
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.CounterCreationData</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.CounterCreationDataCollection</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.CounterSample</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.CounterSampleCalculator</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.ICollectData</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.InstanceData</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.InstanceDataCollection</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.InstanceDataCollectionCollection</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounter</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounterCategory</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounterCategoryType</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounterInstanceLifetime</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounterManager</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceCounterType</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterData</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterSet</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstance</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstanceCounterDataSet</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterSetInstanceType</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.PerformanceData.CounterType</Target>
+    <Left>lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll</Left>
+    <Right>lib/net461/System.Diagnostics.PerformanceCounter.dll</Right>
+  </Suppression>
+</Suppressions>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index 600f6fc58b993a..4da39faf27b705 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -3,6 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1847</NoWarn>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
@@ -150,8 +151,12 @@
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
+    <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" PrivateAssets="all" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
   </ItemGroup>
 </Project>

From 4137fe543fd0410f9a7924f0eda0ca99311d10e2 Mon Sep 17 00:00:00 2001
From: Anipik <anirudhagnihotry098@gmail.com>
Date: Mon, 5 Jul 2021 14:45:16 -0700
Subject: [PATCH 2/2] remvoing custom and private targets hook and remove
 unused package rferences

---
 Directory.Build.targets                                     | 5 +++--
 .../src/System.Diagnostics.PerformanceCounter.csproj        | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 1e042103dbcc5a..e390cc3dda3204 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -54,7 +54,9 @@
     <PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription>
     <!-- Keep in sync as required by the Packaging SDK in Arcade. -->
     <Description>$(PackageDescription)</Description>
+    <!-- BeforePack hook should be removed after porting all the projects to dotnet pack. -->
     <BeforePack>$(BeforePack);AddNETStandardCompatErrorFileForPackaging</BeforePack>
+    <GenerateNuspecDependsOn>AddNETStandardCompatErrorFileForPackaging;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
   </PropertyGroup>
 
   <!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. -->
@@ -76,8 +78,7 @@
   <Target Name="AddNETStandardCompatErrorFileForPackaging"
           Condition="'@(NETStandardCompatError)' != ''"
           Inputs="%(NETStandardCompatError.Identity)"
-          Outputs="unused"
-          BeforeTargets="_GetPackageFiles;GetFiles">
+          Outputs="unused">
     <PropertyGroup>
       <_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterrors\%(NETStandardCompatError.Identity)\$(PackageId).targets</_NETStandardCompatErrorFilePath>
       <_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_'))</_NETStandardCompatErrorFileTarget>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index 4da39faf27b705..8f68e23f04d1fa 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -150,12 +150,6 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" PrivateAssets="all" />
-    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" PrivateAssets="all" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
   </ItemGroup>