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.

Sign up for GitHub

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

Jump to bottom

port system.diagnostics.performanceCounter #55134

Merged
merged 2 commits into from
Jul 6, 2021
Merged

port system.diagnostics.performanceCounter #55134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74df68d
port system.diagnostics.performanceCounter
Anipik Jul 4, 2021
4137fe5
remvoing custom and private targets hook and remove unused package rf…
Anipik Jul 5, 2021
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
5 changes: 3 additions & 2 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand All @@ -76,8 +78,7 @@
<Target Name="AddNETStandardCompatErrorFileForPackaging"
Condition="'@(NETStandardCompatError)' != ''"
Inputs="%(NETStandardCompatError.Identity)"
Outputs="unused"
BeforeTargets="GetFiles">
Outputs="unused">
<PropertyGroup>
<_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterrors\%(NETStandardCompatError.Identity)\$(PackageId).targets</_NETStandardCompatErrorFilePath>
<_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_'))</_NETStandardCompatErrorFileTarget>
Expand Down
12 changes: 0 additions & 12 deletions ...s/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
View file
Open in desktop

This file was deleted.

124 changes: 124 additions & 0 deletions src/libraries/System.Diagnostics.PerformanceCounter/src/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 3 additions & 4 deletions ...es/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -149,9 +150,7 @@
<Reference Include="System.Threading" />
<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" />
<ItemGroup>
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
</ItemGroup>
</Project>