diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-07-28 21:58:26 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-08-04 01:01:12 +0300 |
| commit | e8a80b149efff2b3c664bf7a3a1a57981b62c80e (patch) | |
| tree | d6fc6f9b9cdf1d190335459a30bd3a1d01b40cc6 /src/System.Security.AccessControl | |
| parent | 2b93b71f00b6baebea82c718bbf6551f1c50d30b (diff) | |
Adding few libraries to UWP Metapackage
Diffstat (limited to 'src/System.Security.AccessControl')
4 files changed, 9 insertions, 3 deletions
diff --git a/src/System.Security.AccessControl/dir.props b/src/System.Security.AccessControl/dir.props index 0b90c056e3..4bb96edee4 100644 --- a/src/System.Security.AccessControl/dir.props +++ b/src/System.Security.AccessControl/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> + <IsUAP>true</IsUAP> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj index 88e09acb7c..634efabebf 100644 --- a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj +++ b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj @@ -5,6 +5,10 @@ <ProjectReference Include="..\ref\System.Security.AccessControl.csproj"> <SupportedFramework>net461;netcoreapp2.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> + <File Include="$(PlaceHolderFile)"> + <TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath> + </File> + <InboxOnTargetFramework Include="$(UAPvNextTFM)" /> <ProjectReference Include="..\src\System.Security.AccessControl.csproj" /> <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" /> <HarvestIncludePaths Include="ref/netstandard1.3"> diff --git a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 8e967b026d..47bdd6b6d3 100644 --- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}</ProjectGuid> - <!-- UAPvNext is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;$(UAPvNextTFM)</PackageTargetFramework> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> diff --git a/src/System.Security.AccessControl/src/Configurations.props b/src/System.Security.AccessControl/src/Configurations.props index 7a565a5243..a50eb8a6de 100644 --- a/src/System.Security.AccessControl/src/Configurations.props +++ b/src/System.Security.AccessControl/src/Configurations.props @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <BuildConfigurations> + <PackageConfigurations> netfx-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; netstandard; + </PackageConfigurations> + <BuildConfigurations> + $(PackageConfigurations) uap-Windows_NT; </BuildConfigurations> </PropertyGroup> |