diff options
55 files changed, 111 insertions, 43 deletions
diff --git a/Packaging.props b/Packaging.props index 225ae6f3ea..a2377445c0 100644 --- a/Packaging.props +++ b/Packaging.props @@ -19,6 +19,10 @@ <XmlDocFileRoot>$(PackagesDir)$(XmlDocPackage.ToLowerInvariant())/$(XmlDocPackageVersion)/xmldocs</XmlDocFileRoot> <XmlDocDir>$(BinDir)docs</XmlDocDir> + <!-- By default the packaging targets will package dekstop facades as ref, + but we don't use this as we now build partial-reference-facades. --> + <PackageDesktopAsRef>false</PackageDesktopAsRef> + <!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline --> <SkipBaseLineCheck>true</SkipBaseLineCheck> <PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">2.0.0</PlatformPackageVersion> diff --git a/Tools-Override/resolveContract.targets b/Tools-Override/resolveContract.targets index 9466e251ec..1bce2266d3 100644 --- a/Tools-Override/resolveContract.targets +++ b/Tools-Override/resolveContract.targets @@ -20,7 +20,7 @@ </PropertyGroup> <ItemGroup Condition="'$(HasMatchingContract)' == 'true'"> - <ResolvedMatchingContract Condition="'$(IsDesktopFacade)' != 'true' and Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" /> + <ResolvedMatchingContract Condition="Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" /> <!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve --> <ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)"> diff --git a/buildvertical.targets b/buildvertical.targets index da00407796..2cc0b9bcd2 100644 --- a/buildvertical.targets +++ b/buildvertical.targets @@ -121,7 +121,6 @@ Returns="$(PackageConfigurations)"> <ItemGroup Condition="'$(PackageConfigurations)' == ''"> <_buildConfigurations Include="$(BuildConfigurations)" /> - <_excludeBuildConfigurations Include="@(_buildConfigurations)" Condition="'$(IsReferenceAssembly)' == 'true' AND ('%(Identity)' == 'netfx' OR $([System.String]::new('%(Identity)').StartsWith('net4'))) AND '$(IncludeDesktopRefInPackage)' != 'true'"/> <_excludeBuildConfigurations Include="mono" /> <_packageConfigurations Include="@(_buildConfigurations)" Exclude="@(_excludeBuildConfigurations)" /> </ItemGroup> diff --git a/dir.targets b/dir.targets index db532763fe..309bbfcc74 100644 --- a/dir.targets +++ b/dir.targets @@ -39,14 +39,8 @@ <IsUAPRef Condition="'$(IsUAPRef)' == ''">$(IsUAP)</IsUAPRef> <IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef> - <BuildingDesktopFacade Condition="'$(IsDesktopFacade)' == 'true' And ('$(TargetGroup)' == 'netfx' Or $(TargetGroup.StartsWith('net4')))" >true</BuildingDesktopFacade> - - <!-- if building desktop facade, we don't bin place the refs --> - <BinPlaceRef Condition="'$(BinPlaceRef)' == '' And '$(BuildingDesktopFacade)' != 'true' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> + <BinPlaceRef Condition="'$(BinPlaceRef)' == '' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' And ('$(IsRuntimeAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime> - - <!-- if building desktop facade and bin placing the runtime, then we need to bin place the refs too --> - <BinPlaceRef Condition="'$(BuildingDesktopFacade)' == 'true' And '$(BinPlaceRuntime)' == 'true'">true</BinPlaceRef> </PropertyGroup> <ItemGroup Condition="'@(BinPlaceConfiguration)' == ''"> diff --git a/src/Microsoft.Win32.Registry.AccessControl/dir.props b/src/Microsoft.Win32.Registry.AccessControl/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/dir.props +++ b/src/Microsoft.Win32.Registry.AccessControl/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props b/src/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props +++ b/src/Microsoft.Win32.Registry.AccessControl/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj index 3a06d98311..f69e911830 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj @@ -9,7 +9,10 @@ <ItemGroup> <Compile Include="Microsoft.Win32.Registry.AccessControl.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" /> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> </ItemGroup> diff --git a/src/Microsoft.Win32.Registry/dir.props b/src/Microsoft.Win32.Registry/dir.props index cfdd3c3550..db5b2a7bb3 100644 --- a/src/Microsoft.Win32.Registry/dir.props +++ b/src/Microsoft.Win32.Registry/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/Microsoft.Win32.Registry/ref/Configurations.props b/src/Microsoft.Win32.Registry/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/Microsoft.Win32.Registry/ref/Configurations.props +++ b/src/Microsoft.Win32.Registry/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj index 2e82e80268..214416a12e 100644 --- a/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj +++ b/src/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj @@ -3,13 +3,17 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Microsoft.Win32.Registry.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> diff --git a/src/System.CodeDom/dir.props b/src/System.CodeDom/dir.props index 916a941fcf..c149c4d67d 100644 --- a/src/System.CodeDom/dir.props +++ b/src/System.CodeDom/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <AssemblyKey>Open</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.CodeDom/ref/Configurations.props b/src/System.CodeDom/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.CodeDom/ref/Configurations.props +++ b/src/System.CodeDom/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.CodeDom/ref/System.CodeDom.csproj b/src/System.CodeDom/ref/System.CodeDom.csproj index b3c8557954..f906d162e3 100644 --- a/src/System.CodeDom/ref/System.CodeDom.csproj +++ b/src/System.CodeDom/ref/System.CodeDom.csproj @@ -3,13 +3,18 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{4CF42F1E-B5AC-4834-AE24-A1F285091377}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.CodeDom.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Security.Permissions\ref\System.Security.Permissions.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.ComponentModel.Annotations/dir.props b/src/System.ComponentModel.Annotations/dir.props index 827c79edd8..bc11e40367 100644 --- a/src/System.ComponentModel.Annotations/dir.props +++ b/src/System.ComponentModel.Annotations/dir.props @@ -5,7 +5,6 @@ <AssemblyVersion>4.2.0.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> - <IsDesktopFacade>true</IsDesktopFacade> <IsUAP>true</IsUAP> </PropertyGroup> </Project> diff --git a/src/System.ComponentModel.Annotations/ref/Configurations.props b/src/System.ComponentModel.Annotations/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.ComponentModel.Annotations/ref/Configurations.props +++ b/src/System.ComponentModel.Annotations/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj index f5314815f4..595f71d8ea 100644 --- a/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj +++ b/src/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj @@ -3,11 +3,16 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.ComponentModel.Annotations.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.ComponentModel.DataAnnotations" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Data.Odbc/dir.props b/src/System.Data.Odbc/dir.props index 916a941fcf..c149c4d67d 100644 --- a/src/System.Data.Odbc/dir.props +++ b/src/System.Data.Odbc/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> <AssemblyKey>Open</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.Data.Odbc/ref/Configurations.props b/src/System.Data.Odbc/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Data.Odbc/ref/Configurations.props +++ b/src/System.Data.Odbc/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Data.Odbc/ref/System.Data.Odbc.csproj b/src/System.Data.Odbc/ref/System.Data.Odbc.csproj index d864308858..d128c3b02a 100644 --- a/src/System.Data.Odbc/ref/System.Data.Odbc.csproj +++ b/src/System.Data.Odbc/ref/System.Data.Odbc.csproj @@ -3,11 +3,17 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{D589374B-3331-4660-8DFB-512D66F8EC63}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Data.Odbc.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + <Reference Include="System.Data" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/ref/Configurations.props b/src/System.Data.SqlClient/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Data.SqlClient/ref/Configurations.props +++ b/src/System.Data.SqlClient/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj index d723a5f4b1..3236b073e5 100644 --- a/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/ref/System.Data.SqlClient.csproj @@ -3,6 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{D58E8D2B-3331-4660-8DFB-512D66F8EC63}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> @@ -10,5 +11,11 @@ <Compile Include="System.Data.SqlClient.cs" /> <Compile Include="System.Data.SqlClient.Manual.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/dir.props b/src/System.IO.FileSystem.AccessControl/dir.props index dc6bdd9532..864708cdd6 100644 --- a/src/System.IO.FileSystem.AccessControl/dir.props +++ b/src/System.IO.FileSystem.AccessControl/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.IO.FileSystem.AccessControl/ref/Configurations.props b/src/System.IO.FileSystem.AccessControl/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.IO.FileSystem.AccessControl/ref/Configurations.props +++ b/src/System.IO.FileSystem.AccessControl/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj index 156748a398..55aa873bd1 100644 --- a/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj +++ b/src/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj @@ -3,13 +3,17 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{88A04AB0-F61E-4DD2-9E12-928DCA261263}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.IO.FileSystem.AccessControl.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> diff --git a/src/System.IO.Packaging/dir.props b/src/System.IO.Packaging/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/System.IO.Packaging/dir.props +++ b/src/System.IO.Packaging/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.IO.Packaging/ref/Configurations.props b/src/System.IO.Packaging/ref/Configurations.props index 76a4213097..e7e6149574 100644 --- a/src/System.IO.Packaging/ref/Configurations.props +++ b/src/System.IO.Packaging/ref/Configurations.props @@ -3,10 +3,12 @@ <PropertyGroup> <PackageConfigurations> netstandard1.3; + net46; </PackageConfigurations> <BuildConfigurations> $(PackageConfigurations); netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj index 61848052d6..87c4974e22 100644 --- a/src/System.IO.Packaging/ref/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/ref/System.IO.Packaging.csproj @@ -3,6 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{4DD91348-1D1F-4964-B5CB-047D916E79EE}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> @@ -11,6 +12,11 @@ <ItemGroup> <Compile Include="System.IO.Packaging.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + <Reference Include="WindowsBase" /> + </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.3'"> <Reference Include="System.Collections" /> <Reference Include="System.IO" /> diff --git a/src/System.IO.Pipes.AccessControl/dir.props b/src/System.IO.Pipes.AccessControl/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/System.IO.Pipes.AccessControl/dir.props +++ b/src/System.IO.Pipes.AccessControl/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.IO.Pipes.AccessControl/ref/Configurations.props b/src/System.IO.Pipes.AccessControl/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.IO.Pipes.AccessControl/ref/Configurations.props +++ b/src/System.IO.Pipes.AccessControl/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj index 3bb805c34c..7bb654119d 100644 --- a/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj +++ b/src/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj @@ -3,13 +3,18 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.IO.Pipes.AccessControl.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.Core" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> diff --git a/src/System.Net.Http/ref/System.Net.Http.csproj b/src/System.Net.Http/ref/System.Net.Http.csproj index 1c0561fadf..bd399cd31b 100644 --- a/src/System.Net.Http/ref/System.Net.Http.csproj +++ b/src/System.Net.Http/ref/System.Net.Http.csproj @@ -3,9 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{132BF813-FC40-4D39-8B6F-E55D7633F0ED}</ProjectGuid> - <!-- in most cases the desktop configuration of a contract is just for APICompat, - however in this case it is the actual ref we want to ship --> - <IncludeDesktopRefInPackage>true</IncludeDesktopRefInPackage> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Release|AnyCPU'" /> diff --git a/src/System.Numerics.Vectors/dir.props b/src/System.Numerics.Vectors/dir.props index 6c87c698a4..4284ed3c6f 100644 --- a/src/System.Numerics.Vectors/dir.props +++ b/src/System.Numerics.Vectors/dir.props @@ -5,7 +5,6 @@ <AssemblyVersion>4.1.3.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> - <IsDesktopFacade>true</IsDesktopFacade> <IsUAP>true</IsUAP> </PropertyGroup> </Project> diff --git a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj index 92397c80fd..e613f45d1c 100644 --- a/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj +++ b/src/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj @@ -3,6 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{650277B5-9423-4ACE-BB54-2659995B21C7}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46-Release|AnyCPU'" /> @@ -21,6 +22,7 @@ </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'"> <Reference Include="mscorlib" /> + <Reference Include="System.Numerics" /> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'"> <Reference Include="System.Runtime" /> diff --git a/src/System.Reflection.TypeExtensions/ref/Configurations.props b/src/System.Reflection.TypeExtensions/ref/Configurations.props index 6308641bd9..d9777d8275 100644 --- a/src/System.Reflection.TypeExtensions/ref/Configurations.props +++ b/src/System.Reflection.TypeExtensions/ref/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netstandard; netfx; - net461; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj index b0c949d722..9eb0a5a5f1 100644 --- a/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj +++ b/src/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj @@ -4,8 +4,6 @@ <PropertyGroup> <ProjectGuid>{C303A051-8D54-4460-8BFD-DE10F0473BDB}</ProjectGuid> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net461-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> @@ -13,7 +11,7 @@ <ItemGroup> <Compile Include="System.Reflection.TypeExtensions.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net461'"> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> <Reference Include="mscorlib" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Security.AccessControl/dir.props b/src/System.Security.AccessControl/dir.props index 5d6a94c96a..95b941577d 100644 --- a/src/System.Security.AccessControl/dir.props +++ b/src/System.Security.AccessControl/dir.props @@ -6,7 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsNETCoreAppRef>false</IsNETCoreAppRef> - <IsDesktopFacade>true</IsDesktopFacade> <IsUAP>true</IsUAP> <ISUAPRef>false</ISUAPRef> </PropertyGroup> diff --git a/src/System.Security.AccessControl/ref/Configurations.props b/src/System.Security.AccessControl/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Security.AccessControl/ref/Configurations.props +++ b/src/System.Security.AccessControl/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj index 9e430cb040..90a1792830 100644 --- a/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/ref/System.Security.AccessControl.csproj @@ -4,14 +4,18 @@ <PropertyGroup> <ProjectGuid>{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}</ProjectGuid> <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Security.AccessControl.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> diff --git a/src/System.Security.Cryptography.Cng/dir.props b/src/System.Security.Cryptography.Cng/dir.props index bacedaf5ae..66119406db 100644 --- a/src/System.Security.Cryptography.Cng/dir.props +++ b/src/System.Security.Cryptography.Cng/dir.props @@ -5,7 +5,6 @@ <AssemblyVersion>4.3.0.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> - <IsDesktopFacade>true</IsDesktopFacade> <IsUAP>true</IsUAP> </PropertyGroup> </Project> diff --git a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj index 1ace2fb895..b74fc1db2e 100644 --- a/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj +++ b/src/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj @@ -3,9 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <DefineConstants Condition="'$(TargetGroup)' == 'netfx'">$(DefineConstants);netfx</DefineConstants> - <NoWarn Condition="'$(TargetGroup)' == 'netfx'">$(NoWarn);0436</NoWarn> <ProjectGuid>{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}</ProjectGuid> - <DefineConstants Condition="'$(TargetGroup)' == 'uap' Or '$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_HASHDATA</DefineConstants> + <DefineConstants Condition="'$(TargetGroup)' == 'uap' Or '$(TargeGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_HASHDATA</DefineConstants> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> diff --git a/src/System.Security.Cryptography.Pkcs/dir.props b/src/System.Security.Cryptography.Pkcs/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/System.Security.Cryptography.Pkcs/dir.props +++ b/src/System.Security.Cryptography.Pkcs/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.Security.Cryptography.Pkcs/ref/Configurations.props b/src/System.Security.Cryptography.Pkcs/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Security.Cryptography.Pkcs/ref/Configurations.props +++ b/src/System.Security.Cryptography.Pkcs/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj index e1f398a0bb..a063a55c1c 100644 --- a/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj +++ b/src/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj @@ -3,11 +3,17 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{881269F5-9F22-4427-8DC5-63E2C05875BA}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Security.Cryptography.Pkcs.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + <Reference Include="System.Security" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/dir.props b/src/System.Security.Cryptography.ProtectedData/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/System.Security.Cryptography.ProtectedData/dir.props +++ b/src/System.Security.Cryptography.ProtectedData/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.Security.Cryptography.ProtectedData/ref/Configurations.props b/src/System.Security.Cryptography.ProtectedData/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Security.Cryptography.ProtectedData/ref/Configurations.props +++ b/src/System.Security.Cryptography.ProtectedData/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj index a753890bd4..08ab051aa9 100644 --- a/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj +++ b/src/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj @@ -3,11 +3,16 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{28AA66B1-615B-462F-BD63-DC0A20052998}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.Security.Cryptography.ProtectedData.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.Security" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/dir.props b/src/System.Security.Principal.Windows/dir.props index 868c1ebc21..9b35244f0a 100644 --- a/src/System.Security.Principal.Windows/dir.props +++ b/src/System.Security.Principal.Windows/dir.props @@ -8,6 +8,5 @@ <IsNETCoreAppRef>false</IsNETCoreAppRef> <IsUAP>true</IsUAP> <IsUAPRef>false</IsUAPRef> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.Security.Principal.Windows/ref/Configurations.props b/src/System.Security.Principal.Windows/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Security.Principal.Windows/ref/Configurations.props +++ b/src/System.Security.Principal.Windows/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj index 3ea40d933e..3de8c92115 100644 --- a/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj +++ b/src/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj @@ -4,7 +4,8 @@ <PropertyGroup> <ProjectGuid>{25A02E40-D12C-4184-B599-E4F954D142DB}</ProjectGuid> <!-- UAP10.1 is not yet mapped to netstandard2.0, manually duplicate this ref --> - <PackageTargetFramework>netstandard2.0;uap10.1</PackageTargetFramework> + <PackageTargetFramework Condition="'$(TargetGroup)' == 'netstandard'">netstandard2.0;uap10.1</PackageTargetFramework> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> @@ -12,5 +13,9 @@ <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> <Compile Include="System.Security.Principal.Windows.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/dir.props b/src/System.ServiceProcess.ServiceController/dir.props index 57dd1e0bd3..28faadc25b 100644 --- a/src/System.ServiceProcess.ServiceController/dir.props +++ b/src/System.ServiceProcess.ServiceController/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.2.0.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.ServiceProcess.ServiceController/ref/Configurations.props b/src/System.ServiceProcess.ServiceController/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.ServiceProcess.ServiceController/ref/Configurations.props +++ b/src/System.ServiceProcess.ServiceController/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj index 0298841527..aa864d0490 100644 --- a/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj +++ b/src/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj @@ -3,11 +3,16 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{8479566D-6FA5-4241-9D66-524BEC4C19BD}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <ItemGroup> <Compile Include="System.ServiceProcess.ServiceController.cs" /> </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System.ServiceProcess" /> + </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/dir.props b/src/System.Threading.AccessControl/dir.props index 6db54dff3c..83f160d2b4 100644 --- a/src/System.Threading.AccessControl/dir.props +++ b/src/System.Threading.AccessControl/dir.props @@ -4,6 +4,5 @@ <PropertyGroup> <AssemblyVersion>4.0.2.0</AssemblyVersion> <AssemblyKey>MSFT</AssemblyKey> - <IsDesktopFacade>true</IsDesktopFacade> </PropertyGroup> </Project> diff --git a/src/System.Threading.AccessControl/ref/Configurations.props b/src/System.Threading.AccessControl/ref/Configurations.props index c398e42e89..d9777d8275 100644 --- a/src/System.Threading.AccessControl/ref/Configurations.props +++ b/src/System.Threading.AccessControl/ref/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard; + netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj index 05977841d2..df1cdc9f30 100644 --- a/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj @@ -3,6 +3,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <ProjectGuid>{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}</ProjectGuid> + <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx'">true</IsPartialFacadeAssembly> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> @@ -10,7 +11,11 @@ <Compile Include="System.Threading.AccessControl.cs" /> <Compile Include="System.Threading.AccessControl.Manual.cs" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'netfx'"> + <Reference Include="mscorlib" /> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'netfx'"> <ProjectReference Include="..\..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj" /> <ProjectReference Include="..\..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" /> </ItemGroup> |