diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-04-14 22:55:35 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-04-18 23:28:50 +0300 |
| commit | 72002dbb7e3e657adaeb002feca0399d9667a54b (patch) | |
| tree | d4470d1d8dbcb42b88e2ef22fc8e77b776a1388d /src/System.ServiceProcess.ServiceController | |
| parent | ec4d6f868eb6497216791fc158173e7123d6e73f (diff) | |
Re-enable package validation and clean up package content
Diffstat (limited to 'src/System.ServiceProcess.ServiceController')
3 files changed, 9 insertions, 4 deletions
diff --git a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj index 4e1b558590..6cce67c27b 100644 --- a/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj +++ b/src/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj @@ -3,14 +3,19 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.ServiceProcess.ServiceController.csproj"> - <SupportedFramework>net461;netcoreapp2.0</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ServiceProcess.ServiceController.csproj" /> <NotSupportedOnTargetFramework Include="netcore50"> <PackageTargetRuntime>win</PackageTargetRuntime> </NotSupportedOnTargetFramework> <HarvestIncludePaths Include="ref/netstandard1.4" /> - <HarvestIncludePaths Include="runtimes/unix/lib/netstandard1.5;runtimes/win/lib/netstandard1.5" /> + <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.5" /> + <HarvestIncludePaths Include="runtimes/unix/lib/netstandard1.5"> + <!-- package unix impl (platform not supported) as RID agnostic --> + <!-- this was previously packaged as netstandard1.5 but its dependencies are compatible with ns1.4 --> + <TargetPath>lib/netstandard1.4</TargetPath> + </HarvestIncludePaths> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/src/Configurations.props b/src/System.ServiceProcess.ServiceController/src/Configurations.props index 2ae1f7141e..4e5de27086 100644 --- a/src/System.ServiceProcess.ServiceController/src/Configurations.props +++ b/src/System.ServiceProcess.ServiceController/src/Configurations.props @@ -3,7 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard-Windows_NT; - netstandard-Unix; + netstandard; netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj index 4e0b11f085..65c3ec80cd 100644 --- a/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj @@ -8,7 +8,7 @@ <ProjectGuid>{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}</ProjectGuid> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'netfx'">None</ResourcesSourceOutputDirectory> - <GeneratePlatformNotSupportedAssembly Condition="'$(TargetsUnix)' == 'true'">true</GeneratePlatformNotSupportedAssembly> + <GeneratePlatformNotSupportedAssembly Condition="'$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' != 'true'">true</GeneratePlatformNotSupportedAssembly> <!-- Although we have a netstandard configuration, we know we are not currently UAP compatible--> <UWPCompatible>false</UWPCompatible> </PropertyGroup> |