diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-04-18 22:53:35 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-04-18 23:28:58 +0300 |
| commit | d7241ce8cd613d90b51e97e35b423ad5978d0d0a (patch) | |
| tree | 9806bc28581854edfb31038877fd51e2dfd5b18f /src/Microsoft.Win32.Registry | |
| parent | 1f3a10c5ba9562075a1e476426cd08fc48b38d72 (diff) | |
Fix Registry validation after UAP support removed
Diffstat (limited to 'src/Microsoft.Win32.Registry')
| -rw-r--r-- | src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj | 10 | ||||
| -rw-r--r-- | src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj index bf65e59080..4b05ca1b12 100644 --- a/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj +++ b/src/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj @@ -3,14 +3,14 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\Microsoft.Win32.Registry.csproj"> - <SupportedFramework>net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)</SupportedFramework> + <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Microsoft.Win32.Registry.csproj" /> - <NotSupportedOnTargetFramework Include="netcore50"> - <PackageTargetRuntime>win</PackageTargetRuntime> - </NotSupportedOnTargetFramework> <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" /> - <HarvestIncludePaths Include="ref/netstandard1.3;runtimes/win/lib/netstandard1.3" /> + <HarvestIncludePaths Include="ref/netstandard1.3"> + <SupportedFramework>netcore50</SupportedFramework> + </HarvestIncludePaths> + <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3" /> <HarvestIncludePaths Include="runtimes/unix/lib/netstandard1.3"> <!-- package unix impl (platform not supported) as RID agnostic --> <TargetPath>lib/netstandard1.3</TargetPath> diff --git a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index cfd48ae7a5..2e82e80268 100644 --- a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -3,8 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}</ProjectGuid> - <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> @@ -12,7 +10,6 @@ <Compile Include="Microsoft.Win32.Registry.cs" /> </ItemGroup> <ItemGroup> - <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> |