mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-11 18:20:26 +09:00
port system.diagnostics.performanceCounter (#55134)
* port system.diagnostics.performanceCounter * remvoing custom and private targets hook and remove unused package rferences
This commit is contained in:
Anirudh Agnihotry
parent
566b53a66b
commit
8e3d6cd3fe
GPG key ID:
4AEE18F83AFDEB23
4 changed files with 130 additions and 18 deletions
|
|
@ -54,7 +54,9 @@
|
||||||
<PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription>
|
<PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription>
|
||||||
<!-- Keep in sync as required by the Packaging SDK in Arcade. -->
|
<!-- Keep in sync as required by the Packaging SDK in Arcade. -->
|
||||||
<Description>$(PackageDescription)</Description>
|
<Description>$(PackageDescription)</Description>
|
||||||
|
<!-- BeforePack hook should be removed after porting all the projects to dotnet pack. -->
|
||||||
<BeforePack>$(BeforePack);AddNETStandardCompatErrorFileForPackaging</BeforePack>
|
<BeforePack>$(BeforePack);AddNETStandardCompatErrorFileForPackaging</BeforePack>
|
||||||
|
<GenerateNuspecDependsOn>AddNETStandardCompatErrorFileForPackaging;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. -->
|
<!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. -->
|
||||||
|
|
@ -76,8 +78,7 @@
|
||||||
<Target Name="AddNETStandardCompatErrorFileForPackaging"
|
<Target Name="AddNETStandardCompatErrorFileForPackaging"
|
||||||
Condition="'@(NETStandardCompatError)' != ''"
|
Condition="'@(NETStandardCompatError)' != ''"
|
||||||
Inputs="%(NETStandardCompatError.Identity)"
|
Inputs="%(NETStandardCompatError.Identity)"
|
||||||
Outputs="unused"
|
Outputs="unused">
|
||||||
BeforeTargets="GetFiles">
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterrors\%(NETStandardCompatError.Identity)\$(PackageId).targets</_NETStandardCompatErrorFilePath>
|
<_NETStandardCompatErrorFilePath>$(BaseIntermediateOutputPath)netstandardcompaterrors\%(NETStandardCompatError.Identity)\$(PackageId).targets</_NETStandardCompatErrorFilePath>
|
||||||
<_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_'))</_NETStandardCompatErrorFileTarget>
|
<_NETStandardCompatErrorFileTarget>NETStandardCompatError_$(PackageId.Replace('.', '_'))_$([System.String]::new('%(NETStandardCompatError.Supported)').Replace('.', '_'))</_NETStandardCompatErrorFileTarget>
|
||||||
|
|
|
||||||
|
|
@ -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>
|
|
||||||
|
|
@ -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>
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
|
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0;net461</TargetFrameworks>
|
||||||
<NoWarn>$(NoWarn);CA1847</NoWarn>
|
<NoWarn>$(NoWarn);CA1847</NoWarn>
|
||||||
|
<IsPackable>true</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
|
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
@ -149,9 +150,7 @@
|
||||||
<Reference Include="System.Threading" />
|
<Reference Include="System.Threading" />
|
||||||
<Reference Include="System.Threading.Thread" />
|
<Reference Include="System.Threading.Thread" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
<ItemGroup>
|
||||||
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
|
<NETStandardCompatError Include="netcoreapp2.0" Supported="$(NetCoreAppMinimum)" />
|
||||||
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
|
|
||||||
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue