diff options
25 files changed, 188 insertions, 36 deletions
@@ -256,6 +256,8 @@ <UAPPackageRefPath>$(BinDir)pkg\uap\ref</UAPPackageRefPath> <UAPPackageRuntimePath>$(BinDir)pkg\uap\lib</UAPPackageRuntimePath> <UAPAOTPackageRuntimePath>$(BinDir)pkg\uapaot\lib</UAPAOTPackageRuntimePath> + <NetFxPackageRefPath>$(BinDir)pkg\netfx\ref</NetFxPackageRefPath> + <NetFxPackageRuntimePath>$(BinDir)pkg\netfx\lib</NetFxPackageRuntimePath> <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms --> <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == 'netcoreapp'">true</BinPlaceTestSharedFramework> diff --git a/dir.targets b/dir.targets index d395f0ae9c..890c85f7e4 100644 --- a/dir.targets +++ b/dir.targets @@ -37,6 +37,7 @@ <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(SourceDir)/$(MSBuildProjectName)') and !Exists('$(SourceDir)/$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly> <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef> <IsUAPRef Condition="'$(IsUAPRef)' == ''">$(IsUAP)</IsUAPRef> + <IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef> <BuildingDesktopFacade Condition="'$(IsDesktopFacade)' == 'true' And ('$(TargetGroup)' == 'netfx' Or $(TargetGroup.StartsWith('net4')))" >true</BuildingDesktopFacade> @@ -70,6 +71,10 @@ <PackageFileRefPath Condition="'$(IsUAPRef)'=='true'">$(UAPPackageRefPath)</PackageFileRefPath> <PackageFileRuntimePath>$(UAPAOTPackageRuntimePath)</PackageFileRuntimePath> </BinPlaceConfiguration> + <BinPlaceConfiguration Condition="'$(IsNetFxNETStandard)' == 'true' AND '$(BuildingNETFxVertical)' == 'true'" Include="netfx-$(_bc_OSGroup)"> + <PackageFileRefPath Condition="'$(IsNetFxNETStandardRef)'=='true'">$(NetFxPackageRefPath)</PackageFileRefPath> + <PackageFileRuntimePath>$(NetFxPackageRuntimePath)</PackageFileRuntimePath> + </BinPlaceConfiguration> <!-- Setup the shared framework directory for testing --> <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)"> diff --git a/pkg/NETStandard.Library.NETFramework/Configurations.props b/pkg/NETStandard.Library.NETFramework/Configurations.props new file mode 100644 index 0000000000..064de9fd71 --- /dev/null +++ b/pkg/NETStandard.Library.NETFramework/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netfx; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.builds b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.builds new file mode 100644 index 0000000000..65816c1d8b --- /dev/null +++ b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.builds @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <ItemGroup> + <Project Include="$(MSBuildProjectName).pkgproj" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + +</Project>
\ No newline at end of file diff --git a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj new file mode 100644 index 0000000000..fd34d09277 --- /dev/null +++ b/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" InitialTargets="FillInPackageContent" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <PackageVersion>2.0.0</PackageVersion> + <TargetFrameworkName>net</TargetFrameworkName> + <TargetFrameworkVersion>461</TargetFrameworkVersion> + <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> + + <RefBinDir>$(NetFxPackageRefPath)</RefBinDir> + <LibBinDir>$(NetFxPackageRuntimePath)</LibBinDir> + + <IsFrameworkPackage>true</IsFrameworkPackage> + <IncludeLibFiles>true</IncludeLibFiles> + + <RefFileTargetPath>build/$(TargetFramework)/ref</RefFileTargetPath> + <LibFileTargetPath>build/$(TargetFramework)/lib</LibFileTargetPath> + </PropertyGroup> + + <ItemGroup> + <TargetsFile Include="targets\NETStandard.Library.NETFramework.targets"> + <TargetPath>build/$(TargetFramework)</TargetPath> + </TargetsFile> + </ItemGroup> + + <Import Project="$(SourceDir)\shims\netfxreference.props" /> + + <!-- runs as initial target --> + <Target Name="FillInPackageContent"> + <ItemGroup> + <_refFileNames Include="@(RefFile->'%(FileName)')" Condition="'%(Extension)' == '.dll'" /> + <_libFileNames Include="@(LibFile->'%(FileName)')" Condition="'%(Extension)' == '.dll'" /> + + <!-- remove any targeting pack assemblies that we build ourselves --> + <_netFxReference Include="@(NetFxReference)" Exclude="@(_refFileNames);@(_libFileNames)" /> + + <!-- ignore any assemblies we expect to come from the targeting pack --> + <IgnoredReference Include="@(_netFxReference)" /> + <SuppressNETStandardMissingFile Include="@(_netFxReference)" /> + + <!-- don't include shims for anything from the targeting pack or built explicitly --> + <_excludeShimsRef Include="@(_netFxReference);@(_refFileNames)"/> + <_excludeShimsLib Include="@(_netFxReference);@(_libFileNames)"/> + + <!-- fill in with netstandard.dll-based shims --> + <File Include="$(NETStandardPackageRefPath)\*.dll" Exclude="@(_excludeShimsRef->'$(NETStandardPackageRefPath)\%(Identity).dll')"> + <TargetPath>$(RefFileTargetPath)</TargetPath> + </File> + <File Include="$(NETStandardPackageRefPath)\*.dll" Exclude="@(_excludeShimsLib->'$(NETStandardPackageRefPath)\%(Identity).dll')"> + <TargetPath>$(LibFileTargetPath)</TargetPath> + </File> + </ItemGroup> + </Target> + + <Target Name="StampPackageVersion" BeforeTargets="GetFiles" DependsOnTargets="CalculatePackageVersion"> + <ItemGroup> + <TargetsFile> + <StampedFile>$(IntermediateOutputPath)%(TargetsFile.RelativeDir)%(TargetsFile.FileName)%(TargetsFile.Extension)</StampedFile> + </TargetsFile> + </ItemGroup> + + <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(TargetsFile.StampedFile)'))" /> + <!-- Update targets templates --> + <WriteLinesToFile + File="%(TargetsFile.StampedFile)" + Lines="$([System.IO.File]::ReadAllText('%(TargetsFile.FullPath)').Replace('{PACKAGE_VERSION}', $(PackageVersion)))" + Overwrite="true"/> + + <ItemGroup> + <File Include="@(TargetsFile->'%(StampedFile)')" /> + </ItemGroup> + </Target> + + <Target Name="AddNETStandardLibraryReference" AfterTargets="ApplyBaselineToStaticDependencies"> + <ItemGroup> + <!-- ApplyBaseline doesn't handle NuGet versions, so workaround that by + adding after we've baselined. + https://github.com/dotnet/buildtools/issues/1432 --> + <Dependency Include="$(NETStandardPackageId)"> + <Version>$(NETStandardPackageVersion)</Version> + <TargetFramework>$(TargetFramework)</TargetFramework> + </Dependency> + </ItemGroup> + </Target> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.targets new file mode 100644 index 0000000000..0dc72155fa --- /dev/null +++ b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.targets @@ -0,0 +1,23 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <NETStandardLibraryNETFrameworkPackageVersion>{PACKAGE_VERSION}</NETStandardLibraryNETFrameworkPackageVersion> + </PropertyGroup> + + <ItemGroup> + <Reference Include="$(MSBuildThisFileDirectory)\ref\*.dll"> + <!-- Private = false to make these reference only --> + <Private>false</Private> + <NuGetPackageId>NETStandard.Library.NETFramework</NuGetPackageId> + <NuGetPackageVersion>$(NETStandardLibraryNETFrameworkPackageVersion)</NuGetPackageVersion> + <NuGetIsFrameworkReference>false</NuGetIsFrameworkReference> + <NuGetSourceType>Package</NuGetSourceType> + </Reference> + <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)\lib\*.dll"> + <Private>false</Private> + <NuGetPackageId>NETStandard.Library.NETFramework</NuGetPackageId> + <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion> + <NuGetIsFrameworkReference>false</NuGetIsFrameworkReference> + <NuGetSourceType>Package</NuGetSourceType> + </ReferenceCopyLocalPaths> + </ItemGroup> +</Project> diff --git a/pkg/descriptions.json b/pkg/descriptions.json index 35d0e3c7cf..421744fca9 100644 --- a/pkg/descriptions.json +++ b/pkg/descriptions.json @@ -149,14 +149,8 @@ "CommonTypes": [] }, { - "Name": "NETStandard.Library", - "Description": "A set of standard .NET APIs that are prescribed to be used and supported together. This includes all of the APIs in the NETStandard.Platform package plus additional libraries that are core to .NET but built on top of NETStandard.Platform.", - "CommonTypes": [ - ] - }, - { - "Name": "NETStandard.Platform", - "Description": "A set of low level APIs that all .NET platforms must support.", + "Name": "NETStandard.Library.NETFramework", + "Description": "Adds NETStandard2.0 support to .NET Framework.", "CommonTypes": [ ] }, diff --git a/pkg/frameworkPackage.targets b/pkg/frameworkPackage.targets index de54df7275..a7a6f09d58 100644 --- a/pkg/frameworkPackage.targets +++ b/pkg/frameworkPackage.targets @@ -10,6 +10,7 @@ <SkipValidatePackage>true</SkipValidatePackage> <NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion> + <NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath> <IncludeReferenceFiles Condition="'$(IncludeReferenceFiles)' == '' AND '$(PackageTargetRuntime)' == ''">true</IncludeReferenceFiles> <IncludeLibFiles Condition="'$(IncludeLibFiles)' == '' AND '$(PackageTargetRuntime)' != ''">true</IncludeLibFiles> @@ -40,6 +41,7 @@ <Dependency Include="Microsoft.NETCore.Platforms"> <Version>$(PlatformPackageVersion)</Version> + <TargetFramework>$(TargetFramework)</TargetFramework> </Dependency> </ItemGroup> @@ -67,14 +69,14 @@ <Target Name="_getFinalFilesExisting"> <ItemGroup> - <_refFileExisting Include="@(File)" Condition="Exists('%(FullPath)') AND $([System.String]::new('%(File.TargetPath)').StartsWith('ref'))" /> + <_refFileExisting Include="@(File)" Condition="Exists('%(FullPath)') AND ($([System.String]::new('%(File.TargetPath)').StartsWith('ref')) OR '%(File.TargetPath)' == '$(RefFileTargetPath)')" /> <_refFileNames Include="@(_refFileExisting -> '%(FileName)')"> <Original>%(_refFileExisting.Identity)</Original> </_refFileNames> <_refFileNamesFiltered Include="@(_refFileNames)" Exclude="@(ExcludeFromClosure)" /> <_refFilesFiltered Include="@(_refFileNamesFiltered->'%(Original)')" /> - <_runtimeFileExisting Include="@(File)" Condition="Exists('%(FullPath)') AND ($([System.String]::new('%(File.TargetPath)').StartsWith('lib')) OR $([System.String]::new('%(File.TargetPath)').StartsWith('runtimes')))" /> + <_runtimeFileExisting Include="@(File)" Condition="Exists('%(FullPath)') AND ($([System.String]::new('%(File.TargetPath)').StartsWith('lib')) OR $([System.String]::new('%(File.TargetPath)').StartsWith('runtimes')) OR '%(File.TargetPath)' == '$(LibFileTargetPath)')" /> <_runtimeFileNames Include="@(_runtimeFileExisting -> '%(FileName)')"> <Original>%(_runtimeFileExisting.Identity)</Original> </_runtimeFileNames> @@ -101,9 +103,9 @@ <Target Name="VerifyNETStandard" DependsOnTargets="_getFinalFilesExisting" AfterTargets="Build"> <ItemGroup> - <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\*.dll" /> + <_NETStandardFile Include="$(NETStandardPackageRefPath)\*.dll" /> <!-- force a missing file there are no files found in the package --> - <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\MISSING_NETSTANDARD_PACKAGE" Condition="'@(_NETStandardFile)' == ''" /> + <_NETStandardFile Include="$(NETStandardPackageRefPath)\MISSING_NETSTANDARD_PACKAGE" Condition="'@(_NETStandardFile)' == ''" /> <_NETStandardRefMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(_refFileNames)" /> <_NETStandardRefMissingFileError Include="@(_NETStandardRefMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" /> diff --git a/src/System.Data.Common/dir.props b/src/System.Data.Common/dir.props index bc11e40367..6f7b96452d 100644 --- a/src/System.Data.Common/dir.props +++ b/src/System.Data.Common/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Diagnostics.StackTrace/dir.props b/src/System.Diagnostics.StackTrace/dir.props index e4aced0d59..09b7a57b96 100644 --- a/src/System.Diagnostics.StackTrace/dir.props +++ b/src/System.Diagnostics.StackTrace/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Diagnostics.Tracing/dir.props b/src/System.Diagnostics.Tracing/dir.props index bc11e40367..6f7b96452d 100644 --- a/src/System.Diagnostics.Tracing/dir.props +++ b/src/System.Diagnostics.Tracing/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Globalization.Extensions/dir.props b/src/System.Globalization.Extensions/dir.props index e4aced0d59..09b7a57b96 100644 --- a/src/System.Globalization.Extensions/dir.props +++ b/src/System.Globalization.Extensions/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.IO.Compression/dir.props b/src/System.IO.Compression/dir.props index 0ce54c025f..a081541768 100644 --- a/src/System.IO.Compression/dir.props +++ b/src/System.IO.Compression/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>ECMA</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Net.Http/dir.props b/src/System.Net.Http/dir.props index bc11e40367..6f7b96452d 100644 --- a/src/System.Net.Http/dir.props +++ b/src/System.Net.Http/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Net.Sockets/dir.props b/src/System.Net.Sockets/dir.props index bc11e40367..6f7b96452d 100644 --- a/src/System.Net.Sockets/dir.props +++ b/src/System.Net.Sockets/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props index 6b16377c8b..5e7423443f 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Runtime.Serialization.Primitives/dir.props b/src/System.Runtime.Serialization.Primitives/dir.props index bc11e40367..6f7b96452d 100644 --- a/src/System.Runtime.Serialization.Primitives/dir.props +++ b/src/System.Runtime.Serialization.Primitives/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Runtime.Serialization.Xml/dir.props b/src/System.Runtime.Serialization.Xml/dir.props index 4284ed3c6f..1a40a260be 100644 --- a/src/System.Runtime.Serialization.Xml/dir.props +++ b/src/System.Runtime.Serialization.Xml/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Security.Cryptography.Algorithms/dir.props b/src/System.Security.Cryptography.Algorithms/dir.props index 66119406db..7270914435 100644 --- a/src/System.Security.Cryptography.Algorithms/dir.props +++ b/src/System.Security.Cryptography.Algorithms/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Security.SecureString/dir.props b/src/System.Security.SecureString/dir.props index e4aced0d59..09b7a57b96 100644 --- a/src/System.Security.SecureString/dir.props +++ b/src/System.Security.SecureString/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Threading.Overlapped/dir.props b/src/System.Threading.Overlapped/dir.props index e4aced0d59..09b7a57b96 100644 --- a/src/System.Threading.Overlapped/dir.props +++ b/src/System.Threading.Overlapped/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.ValueTuple/dir.props b/src/System.ValueTuple/dir.props index 18bb622c2b..05a3da0776 100644 --- a/src/System.ValueTuple/dir.props +++ b/src/System.ValueTuple/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>Open</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/System.Xml.XPath.XDocument/dir.props b/src/System.Xml.XPath.XDocument/dir.props index e4aced0d59..09b7a57b96 100644 --- a/src/System.Xml.XPath.XDocument/dir.props +++ b/src/System.Xml.XPath.XDocument/dir.props @@ -6,5 +6,6 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project> diff --git a/src/shims/dir.props b/src/shims/dir.props index 4372109bde..5936acf95b 100644 --- a/src/shims/dir.props +++ b/src/shims/dir.props @@ -11,34 +11,12 @@ <Import Project="..\dir.props" /> - <ItemGroup> - <NetFxReference Include="mscorlib" /> - <NetFxReference Include="System" /> - <NetFxReference Include="System.Core" /> - <NetFxReference Include="System.ComponentModel.Composition" /> - <NetFxReference Include="System.ComponentModel.DataAnnotations"> - <StrongNameSig>MSSharedLib</StrongNameSig> - </NetFxReference> - <NetFxReference Include="System.Data" /> - <NetFxReference Include="System.Drawing" /> - <NetFxReference Include="System.IO.Compression.FileSystem" /> - <NetFxReference Include="System.Net" /> - <NetFxReference Include="System.Numerics" /> - <NetFxReference Include="System.Runtime.Serialization" /> - <NetFxReference Include="System.ServiceModel.Web"> - <StrongNameSig>MSSharedLib</StrongNameSig> - </NetFxReference> - <NetFxReference Include="System.Transactions" /> - <NetFxReference Include="System.Windows" /> - <NetFxReference Include="System.Web" /> - <NetFxReference Include="System.Xml" /> - <NetFxReference Include="System.Xml.Serialization" /> - <NetFxReference Include="System.Xml.Linq" /> - </ItemGroup> + <Import Project="netfxreference.props" /> <PropertyGroup> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> + <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> <PropertyGroup> diff --git a/src/shims/netfxreference.props b/src/shims/netfxreference.props new file mode 100644 index 0000000000..906be4ab36 --- /dev/null +++ b/src/shims/netfxreference.props @@ -0,0 +1,26 @@ +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <NetFxReference Include="mscorlib" /> + <NetFxReference Include="System" /> + <NetFxReference Include="System.Core" /> + <NetFxReference Include="System.ComponentModel.Composition" /> + <NetFxReference Include="System.ComponentModel.DataAnnotations"> + <StrongNameSig>MSSharedLib</StrongNameSig> + </NetFxReference> + <NetFxReference Include="System.Data" /> + <NetFxReference Include="System.Drawing" /> + <NetFxReference Include="System.IO.Compression.FileSystem" /> + <NetFxReference Include="System.Net" /> + <NetFxReference Include="System.Numerics" /> + <NetFxReference Include="System.Runtime.Serialization" /> + <NetFxReference Include="System.ServiceModel.Web"> + <StrongNameSig>MSSharedLib</StrongNameSig> + </NetFxReference> + <NetFxReference Include="System.Transactions" /> + <NetFxReference Include="System.Windows" /> + <NetFxReference Include="System.Web" /> + <NetFxReference Include="System.Xml" /> + <NetFxReference Include="System.Xml.Serialization" /> + <NetFxReference Include="System.Xml.Linq" /> + </ItemGroup> +</Project>
\ No newline at end of file |