diff options
| author | Michelle McDaniel <adiaaida@gmail.com> | 2017-10-28 02:56:19 +0300 |
|---|---|---|
| committer | Dan Moseley <danmose@microsoft.com> | 2017-10-28 02:56:19 +0300 |
| commit | c17b2dd417eaacbf5640bb218f7d14b16826f86c (patch) | |
| tree | 9fe373e2e4619617101236c551ae8356243d2bad /src | |
| parent | 42582c350c33515ddea2f211afb23840dbab260a (diff) | |
Add pkg for System.Diagnostics.PerformanceCounter (#24811)
* Add pkg for System.Diagnostics.PerformanceCounter
This change adds System.Diagnostics.PerformanceCounter to the compat
pack.
* Add AllXamarinFrameworks to PerformanceCounter pkgproj
* Update PerformanceCounter pkgproj for xamarin/mono
* Change InboxOnTargetFramework to AllXamarinFrameworks
Diffstat (limited to 'src')
4 files changed, 19 insertions, 5 deletions
diff --git a/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj b/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj new file mode 100644 index 0000000000..ba710f6838 --- /dev/null +++ b/src/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <ItemGroup> + <ProjectReference Include="..\ref\System.Diagnostics.PerformanceCounter.csproj"> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> + </ProjectReference> + <ProjectReference Include="..\src\System.Diagnostics.PerformanceCounter.csproj" /> + </ItemGroup> + <ItemGroup> + <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/System.Diagnostics.PerformanceCounter/src/Configurations.props b/src/System.Diagnostics.PerformanceCounter/src/Configurations.props index 2155a36057..a24710668f 100644 --- a/src/System.Diagnostics.PerformanceCounter/src/Configurations.props +++ b/src/System.Diagnostics.PerformanceCounter/src/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp-Windows_NT; + netcoreapp2.0-Windows_NT; netstandard; netfx; </BuildConfigurations> diff --git a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index bf3ab5aa12..7bba321192 100644 --- a/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -12,13 +12,13 @@ <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_PerfCounters</GeneratePlatformNotSupportedAssemblyMessage> <UWPCompatible>false</UWPCompatible> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> - <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.0'"> <Compile Include="System\Diagnostics\DiagnosticsConfiguration.cs" /> <Compile Include="System\Diagnostics\CounterCreationData.cs" /> <Compile Include="System\Diagnostics\CounterCreationDataCollection.cs" /> diff --git a/src/System.Diagnostics.PerformanceCounter/tests/Configurations.props b/src/System.Diagnostics.PerformanceCounter/tests/Configurations.props index 51d1fc2309..15c20d2fc2 100644 --- a/src/System.Diagnostics.PerformanceCounter/tests/Configurations.props +++ b/src/System.Diagnostics.PerformanceCounter/tests/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp-Windows_NT; + netcoreapp2.0-Windows_NT; netfx; </BuildConfigurations> </PropertyGroup> |