Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit fd7048c

Browse files
committed
Fix missing System.Memory dependency from Registry
Since Registry only targeted netcoreapp2.0 for Unix, only the Unix-specific dependencies were listed in the netcoreapp2.0 dependency group. This was a problem since the windows netstandard impl required System.Memory but the unix netcoreapp2.0 impl did not. As a result netcoreapp2.0 was missing the System.Memory dependency.
1 parent f78d8f5 commit fd7048c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/Microsoft.Win32.Registry/src/Configurations.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<PackageConfigurations>
55
netstandard-Windows_NT;
6+
netstandard-Unix;
67
netstandard;
7-
netcoreapp2.0-Unix;
88
netfx-Windows_NT;
99
</PackageConfigurations>
1010
<BuildConfigurations>

src/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
1010
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly>
11-
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsWindows)' != 'true' AND '$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
11+
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' == 'netstandard'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
1212
<!--
1313
Temporarily necessary as this is only being built for UWP due to an unwanted dependency on it
1414
https://github.com/dotnet/corefx/issues/15966
@@ -19,15 +19,15 @@
1919
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
22-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Debug|AnyCPU'" />
23-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Release|AnyCPU'" />
2422
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
2523
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
2624
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
2725
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
30-
<ItemGroup Condition="$(TargetGroup.StartsWith('netcoreapp')) OR ('$(TargetGroup)' == 'netstandard' AND '$(TargetsWindows)' == 'true')">
30+
<ItemGroup Condition="'$(TargetGroup)' != 'netfx' AND '$(OSGroup)' != 'AnyOS'">
3131
<Compile Include="$(CommonPath)\Interop\Windows\advapi32\Interop.RegistryOptions.cs">
3232
<Link>Common\Interop\Windows\Interop.RegistryOptions.cs</Link>
3333
</Compile>
@@ -44,7 +44,7 @@
4444
<Compile Include="System\Security\AccessControl\RegistryRights.cs" />
4545
<Compile Include="System\Security\AccessControl\RegistrySecurity.cs" />
4646
</ItemGroup>
47-
<ItemGroup Condition="($(TargetGroup.StartsWith('netcoreapp')) OR '$(TargetGroup)' == 'netstandard') AND '$(TargetsWindows)' == 'true'">
47+
<ItemGroup Condition="'$(TargetGroup)' != 'netfx' AND '$(TargetsWindows)' == 'true'">
4848
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
4949
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
5050
</Compile>

0 commit comments

Comments
 (0)