diff options
author | Eric St. John <ericstj@microsoft.com> | 2017-08-24 00:51:05 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2017-08-29 18:46:22 +0300 |
commit | eade3b36725c8d463a40589ff749af5bb0cab8f4 (patch) | |
tree | 17df7865f763da20a2cb3ef13f2d5afe04c17123 | |
parent | afcbd9a5b9e4ecde2db3a69afd093631f1db91c5 (diff) |
Remove NetFx support libs
Now that we've shipped the NETStandard support package we will no longer build its content
from `master`.
It will be serviced from the `release/2.0.0` branch and the only netfx builds in `master` will
correspond to package content.
67 files changed, 85 insertions, 695 deletions
@@ -121,11 +121,6 @@ <NativeBinDir>$(BinDir)$(OSGroup).$(ArchGroup).$(ConfigurationGroup)/native</NativeBinDir> </PropertyGroup> - <PropertyGroup Condition="'$(TargetGroup)' == 'netfx' AND '$(IsTestProject)' != 'true'"> - <!-- when building for netfx (net461) we also need to build for net462 and net47 in order to produce the netfx netstandard2.0 support package --> - <AdditionalBuildConfigurations>$(AdditionalBuildConfigurations);net462-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup);net47-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</AdditionalBuildConfigurations> - </PropertyGroup> - <Import Project="$(BuildConfigurationImportFile)" Condition="Exists('$(BuildConfigurationImportFile)')" /> <PropertyGroup> <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> @@ -150,6 +145,12 @@ <PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID> <PackageRID Condition="'$(PackageRID)' == ''">$(RuntimeOS)-$(ArchGroup)</PackageRID> </PropertyGroup> + + <!-- Set some shortcuts for more terse conditions in project files --> + <PropertyGroup> + <TargetsNetCoreApp Condition="$(TargetGroup.StartsWith('netcoreapp'))">true</TargetsNetCoreApp> + <TargetsNetFx Condition="$(TargetGroup.StartsWith('net4')) OR '$(TargetGroup)' == 'netfx'">true</TargetsNetFx> + </PropertyGroup> <!-- Import packaging props --> <Import Project="$(MSBuildThisFileDirectory)Packaging.props"/> diff --git a/dir.targets b/dir.targets index 957482687d..ccfab8f1a1 100644 --- a/dir.targets +++ b/dir.targets @@ -47,11 +47,6 @@ <BinPlaceConfiguration Condition="'$(IsUAP)' == 'true' AND '$(BuildingUAPAOTVertical)' == 'true'" Include="uapaot-$(_bc_OSGroup)"> <PackageFileRuntimePath>$(UAPAOTPackageRuntimePath)</PackageFileRuntimePath> </BinPlaceConfiguration> - <BinPlaceConfiguration Condition="('$(IsNetFxNETStandard)' == 'true' OR '$(IsNetFxNETStandardRef)' == 'true') AND '$(BuildingNETFxVertical)' == 'true'" - Include="netfx-$(_bc_OSGroup);net462-$(_bc_OSGroup);net47-$(_bc_OSGroup)"> - <PackageFileRefPath Condition="'$(IsNetFxNETStandardRef)'=='true'">$(NetFxPackageRefPath)</PackageFileRefPath> - <PackageFileRuntimePath Condition="'$(IsNetFxNETStandard)'=='true'">$(NetFxPackageRuntimePath)</PackageFileRuntimePath> - </BinPlaceConfiguration> <!-- Setup the shared framework directory for testing --> <BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)"> diff --git a/external/netfx-conflicts/Configurations.props b/external/netfx-conflicts/Configurations.props deleted file mode 100644 index 064de9fd71..0000000000 --- a/external/netfx-conflicts/Configurations.props +++ /dev/null @@ -1,8 +0,0 @@ -<?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/external/netfx-conflicts/netfx-conflicts.depproj b/external/netfx-conflicts/netfx-conflicts.depproj deleted file mode 100644 index 51fc85b5d1..0000000000 --- a/external/netfx-conflicts/netfx-conflicts.depproj +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" TreatAsLocalProperty="TargetFramework"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <!-- netstandard 1.0 had the lowest version, we'll fallback to 1.1, 1.2, then 1.3 to pick up the lowest version of contracts - that only supported a later netstandard version --> - <TargetFramework>netstandard1.0</TargetFramework> - <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker> - <PackageTargetFallback>netstandard1.1;netstandard1.2;netstandard1.3</PackageTargetFallback> - <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <EnableBinPlacing>false</EnableBinPlacing> - </PropertyGroup> - - <ItemGroup> - <_contract Include="Microsoft.CSharp"/> - <_contract Include="System.Collections.Concurrent"/> - <_contract Include="System.Collections"/> - <_contract Include="System.ComponentModel.Annotations"/> - <_contract Include="System.ComponentModel"/> - <_contract Include="System.ComponentModel.EventBasedAsync"/> - <_contract Include="System.Diagnostics.Contracts"/> - <_contract Include="System.Diagnostics.Debug"/> - <_contract Include="System.Diagnostics.Tools"/> - <_contract Include="System.Diagnostics.Tracing"/> - <_contract Include="System.Dynamic.Runtime"/> - <_contract Include="System.Globalization"/> - <_contract Include="System.IO"/> - <_contract Include="System.IO.Compression"/> - <_contract Include="System.Linq"/> - <_contract Include="System.Linq.Expressions"/> - <_contract Include="System.Linq.Parallel"/> - <_contract Include="System.Linq.Queryable"/> - <_contract Include="System.Net.Http"/> - <_contract Include="System.Net.NetworkInformation"/> - <_contract Include="System.Net.Primitives"/> - <_contract Include="System.Net.Requests"/> - <_contract Include="System.Net.WebHeaderCollection"/> - <_contract Include="System.ObjectModel"/> - <_contract Include="System.Reflection"/> - <_contract Include="System.Reflection.Context"/> - <_contract Include="System.Reflection.Emit"/> - <_contract Include="System.Reflection.Emit.ILGeneration"/> - <_contract Include="System.Reflection.Emit.Lightweight"/> - <_contract Include="System.Reflection.Extensions"/> - <_contract Include="System.Reflection.Primitives"/> - <_contract Include="System.Resources.ResourceManager"/> - <_contract Include="System.Runtime"/> - <_contract Include="System.Runtime.Extensions"/> - <_contract Include="System.Runtime.Handles"/> - <_contract Include="System.Runtime.InteropServices"/> - <_contract Include="System.Runtime.InteropServices.WindowsRuntime"/> - <_contract Include="System.Runtime.Numerics"/> - <_contract Include="System.Runtime.Serialization.Json"/> - <_contract Include="System.Runtime.Serialization.Primitives"/> - <_contract Include="System.Runtime.Serialization.Xml"/> - <_contract Include="System.Security.Principal"/> - <_contract Include="System.ServiceModel.Duplex"/> - <_contract Include="System.ServiceModel.Http"/> - <_contract Include="System.ServiceModel.NetTcp"/> - <_contract Include="System.ServiceModel.Primitives"/> - <_contract Include="System.ServiceModel.Security"/> - <_contract Include="System.Text.Encoding"/> - <_contract Include="System.Text.Encoding.Extensions"/> - <_contract Include="System.Text.RegularExpressions"/> - <_contract Include="System.Threading"/> - <_contract Include="System.Threading.Tasks"/> - <_contract Include="System.Threading.Tasks.Parallel"/> - <_contract Include="System.Threading.Timer"/> - <_contract Include="System.Xml.ReaderWriter"/> - <_contract Include="System.Xml.XDocument"/> - <_contract Include="System.Xml.XmlSerializer"/> - <PackageReference Include="@(_contract)"> - <Version>4.3.0</Version> - </PackageReference> - <PackageReference Include="Microsoft.VisualBasic"> - <Version>10.1.0</Version> - </PackageReference> - </ItemGroup> - - <Target Name="DumpVersions" DependsOnTargets="ResolveReferences"> - <Message Text="%(ReferencePath.FusionName)" /> - </Target> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/external/netfx/Configurations.props b/external/netfx/Configurations.props index 47bdffcb28..93e6478e90 100644 --- a/external/netfx/Configurations.props +++ b/external/netfx/Configurations.props @@ -8,8 +8,8 @@ net46; net461; net462; - net463; net47; + net471; netfx; netcoreapp; uap; diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj index a860b41ed9..4f35754e7b 100644 --- a/external/netfx/netfx.depproj +++ b/external/netfx/netfx.depproj @@ -4,58 +4,98 @@ <Import Project="$(SourceDir)\shims\netfxreference.props" /> <PropertyGroup> <BinPlaceRef>true</BinPlaceRef> + <BinPlaceRuntime>true</BinPlaceRuntime> <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem> - <RefOutputPath>$(RefPath)</RefOutputPath> + <NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId> + <NETStandardSupportPackageVersion>2.0.0-preview2-25405-01</NETStandardSupportPackageVersion> + <NETStandardSupportRoot>$(PackagesDir)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot> + <AddNetStandardSupportPackage Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'net462' OR '$(TargetGroup)' == 'net47'">true</AddNetStandardSupportPackage> + <!-- temporary until we can get an updated 4.7.1 targeting pack --> + <AddNetStandardSupportPackage Condition="'$(TargetGroup)' == '471' ">true</AddNetStandardSupportPackage> </PropertyGroup> - <PropertyGroup Condition="'$(NuGetTargetMoniker)' == '.NETFramework,Version=v4.6.3'"> - <!-- Missing 4.6.3 targeting pack, use 462 for now --> - <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId> - </PropertyGroup> - <PropertyGroup Condition="!$(NuGetTargetMoniker.StartsWith('.NETFramework'))"> + <PropertyGroup Condition="'$(TargetsNetFx)' != 'true'"> <!-- For things not .NETFramework we need the net461 targeting pack to generate facades --> <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker> <NuGetTargetMonikerShort>net461</NuGetTargetMonikerShort> <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId> - <RefOutputPath>$(NetFxRefPath)</RefOutputPath> </PropertyGroup> + <PropertyGroup Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1'"> + <!-- Missing 4.7.1 targeting pack, use 4.7 for now --> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7</TargetingPackNugetPackageId> + </PropertyGroup> + + <ItemGroup> + <!-- For things not .NETFramework binplace to the NETFX ref path --> + <BinPlaceConfiguration Condition="'$(TargetsNetFx)' != 'true'" Include="$(Configuration)"> + <RefPath>$(NetFxRefPath)</RefPath> + </BinPlaceConfiguration> + + <!-- For things .NETFramework binplace to refpath --> + <BinPlaceConfiguration Condition="'$(TargetsNetFx)' == 'true'" Include="$(Configuration)"> + <RefPath>$(RefPath)</RefPath> + </BinPlaceConfiguration> + + <!-- For the netfx targetgroup, binplace NetStandardSupportLibs to runtime / test-runtime--> + <BinPlaceConfiguration Condition="'$(TargetGroup)' == 'netfx'" Include="$(Configuration)"> + <ItemName>NetStandardSupportLib</ItemName> + <RuntimePath>$(TestHostRootPath)</RuntimePath> + </BinPlaceConfiguration> + <BinPlaceConfiguration Condition="'$(TargetGroup)' == 'netfx'" Include="$(Configuration)"> + <ItemName>NetStandardSupportLib</ItemName> + <RuntimePath>$(RuntimePath)</RuntimePath> + </BinPlaceConfiguration> + </ItemGroup> + <ItemGroup> <PackageReference Include="$(TargetingPackNugetPackageId)"> <Version>1.0.1</Version> </PackageReference> - <PackageReference Include="NETStandard.Library" Condition="'$(TargetGroup)' == 'netfx'"> - <Version>$(NETStandardPackageVersion)</Version> + <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'"> + <Version>$(NETStandardSupportPackageVersion)</Version> </PackageReference> - </ItemGroup> - <ItemGroup> - <BinPlaceConfiguration Include="$(Configuration)"> - <RefPath>$(RefOutputPath)</RefPath> - </BinPlaceConfiguration> <FileToExclude Include="System.EnterpriseServices" /> <FileToExclude Include="System.EnterpriseServices.Thunk" /> <FileToExclude Include="System.EnterpriseServices.Wrapper" /> </ItemGroup> - <Target Name="FilterNETStandardShims" BeforeTargets="FilterNugetPackages" - Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'"> - <PropertyGroup> - <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard2.0\ref</_NETStandardRefFolder> - </PropertyGroup> - <ItemGroup> - <_excludeForNetFx Include="@(NetFxReference);netstandard" /> - <_netstandardShimAssemblies Include="$(_NETStandardRefFolder)\*.dll" Exclude="@(_excludeForNetFx->'$(_NETStandardRefFolder)\%(Identity).dll')" /> - <FileToExclude Include="@(_netstandardShimAssemblies->'%(FileName)')" /> - </ItemGroup> - </Target> - <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages" - Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'"> + Condition="'$(AddNetStandardSupportPackage)' == 'true'"> <ItemGroup> - <Reference Include="@(_netstandardShimAssemblies)"> + <_netStandardReference Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'" + Include="$(NETStandardSupportRoot)\net47\ref\*.dll" + Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\ref\%(FileName).dll')" /> + <_netStandardReference Condition="'$(TargetGroup)' != 'net461'" + Include="$(NETStandardSupportRoot)\net462\ref\*.dll" + Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net462\ref\%(FileName).dll')" /> + <_netStandardReference Include="$(NETStandardSupportRoot)\net461\ref\*.dll" + Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net461\ref\%(FileName).dll')" /> + + <NetStandardSupportLib Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'" + Include="$(NETStandardSupportRoot)\net47\lib\*.dll" + Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" /> + <NetStandardSupportLib Condition="'$(TargetGroup)' != 'net461'" + Include="$(NETStandardSupportRoot)\net462\lib\*.dll" + Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net462\lib\%(FileName).dll')" /> + <NetStandardSupportLib Include="$(NETStandardSupportRoot)\net461\lib\*.dll" + Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net461\lib\%(FileName).dll')" /> + + <_netStandardReference> <Private>False</Private> - <NuGetPackageId>$(NETStandardPackageId)</NuGetPackageId> - <NuGetPackageVersion>$(NETStandardPackageVersion)</NuGetPackageVersion> - </Reference> + <NuGetPackageId>$(NETStandardSupportPackageId)</NuGetPackageId> + <NuGetPackageVersion>$(NETStandardSupportPackageVersion)</NuGetPackageVersion> + </_netStandardReference> + + <_referenceByFileName Include="@(Reference->'%(FileName)%(Extension)')"> + <OriginalIdentity>%(Identity)</OriginalIdentity> + </_referenceByFileName> + <_netStandardReferenceByFileName Include="@(_netStandardReference->'%(FileName)%(Extension)')" /> + + <_remainingReferenceByFileName Include="@(_referenceByFileName)" Exclude="@(_netStandardReferenceByFileName)" /> + <_remainingReference Include="@(_remainingReferenceByFileName->'%(OriginalIdentity)')" /> + + <Reference Remove="@(Reference)" /> + <Reference Include="@(_remainingReference);@(_netStandardReference)" /> </ItemGroup> </Target> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/pkg/NETStandard.Library.NETFramework/Configurations.props b/pkg/NETStandard.Library.NETFramework/Configurations.props deleted file mode 100644 index 064de9fd71..0000000000 --- a/pkg/NETStandard.Library.NETFramework/Configurations.props +++ /dev/null @@ -1,8 +0,0 @@ -<?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 deleted file mode 100644 index 17bb6bfebc..0000000000 --- a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.builds +++ /dev/null @@ -1,12 +0,0 @@ -<?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" /> - - <!-- for official builds, only build during the AllConfigurations leg --> - <ItemGroup Condition="'$(OfficialBuildId)' == '' Or '$(BuildAllConfigurations)' == 'true'"> - <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 deleted file mode 100644 index 4d8402010c..0000000000 --- a/pkg/NETStandard.Library.NETFramework/NETStandard.Library.NETFramework.pkgproj +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" InitialTargets="IncludeFiles" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - - <PropertyGroup> - <PackageVersion>2.1.0</PackageVersion> - <TargetFrameworkName>net</TargetFrameworkName> - <TargetFrameworkVersion>461</TargetFrameworkVersion> - <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> - - <RefBinDir>$(NetFxPackageRefPath)</RefBinDir> - <LibBinDir>$(NetFxPackageRuntimePath)</LibBinDir> - - <IsFrameworkPackage>true</IsFrameworkPackage> - <IncludeLibFiles>true</IncludeLibFiles> - - <!-- ValidatePackage doesn't evaluate our targets/props so it does - not find any of the assets in this package --> - <SkipValidatePackage>true</SkipValidatePackage> - </PropertyGroup> - - <ItemGroup> - <StampFile Include="targets\NETStandard.Library.NETFramework.common.props"> - <TargetPath>build</TargetPath> - </StampFile> - <File Include="targets\**\*.*" Exclude="@(StampFile)"> - <TargetPath>build/%(RecursiveDir)</TargetPath> - </File> - <File Include="$(PlaceHolderFile)"> - <TargetPath>build/net471</TargetPath> - </File> - </ItemGroup> - - <ItemGroup> - <!-- this file is meant to have dangling references, it's purpose is to force conflicts with - any newer version of the original desktop contracts. --> - <ExcludeFromClosure Include="netfx.force.conflicts" /> - </ItemGroup> - - <Import Project="$(SourceDir)\shims\netfxreference.props" /> - - <Target Name="IncludeNETStandardShims"> - <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 --> - <RefFile Include="$(NETStandardPackageRefPath)\*.dll" Exclude="@(_excludeShimsRef->'$(NETStandardPackageRefPath)\%(Identity).dll')"> - <TargetFramework>$(TargetFramework)</TargetFramework> - </RefFile> - <LibFile Include="$(NETStandardPackageRefPath)\*.dll" Exclude="@(_excludeShimsLib->'$(NETStandardPackageRefPath)\%(Identity).dll')"> - <TargetFramework>$(TargetFramework)</TargetFramework> - </LibFile> - </ItemGroup> - </Target> - - <Target Name="StampPackageVersion" BeforeTargets="GetFiles" DependsOnTargets="CalculatePackageVersion"> - <ItemGroup> - <StampFile> - <StampedFile>$(IntermediateOutputPath)%(StampFile.RelativeDir)%(StampFile.FileName)%(StampFile.Extension)</StampedFile> - </StampFile> - </ItemGroup> - - <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(StampFile.StampedFile)'))" /> - <!-- Update targets templates --> - <WriteLinesToFile - File="%(StampFile.StampedFile)" - Lines="$([System.IO.File]::ReadAllText('%(StampFile.FullPath)').Replace('{PACKAGE_VERSION}', $(PackageVersion)))" - Overwrite="true"/> - - <ItemGroup> - <File Include="@(StampFile->'%(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> - - <Target Name="AddFrameworkClosureFiles" AfterTargets="ExpandClosureFilesByTargetFramework"> - <ItemGroup> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)netfx/%(Identity).dll')" > - <FileSet>reference-net461</FileSet> - </FrameworkClosureFile> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)netfx/%(Identity).dll')" > - <FileSet>runtime-net461</FileSet> - </FrameworkClosureFile> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net462/%(Identity).dll')" > - <FileSet>reference-net462</FileSet> - </FrameworkClosureFile> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net462/%(Identity).dll')" > - <FileSet>runtime-net462</FileSet> - </FrameworkClosureFile> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net47/%(Identity).dll')" > - <FileSet>reference-net47</FileSet> - </FrameworkClosureFile> - <FrameworkClosureFile Include="@(NetFxReference->'$(RefRootPath)net47/%(Identity).dll')" > - <FileSet>runtime-net47</FileSet> - </FrameworkClosureFile> - </ItemGroup> - </Target> - - <Target Name="ExpandClosureFilesByTargetFramework" - AfterTargets="GetClosureFiles" - Inputs="%(ClosureFile.FileSet)" - Outputs="batching-on-Closure-metadata"> - <ItemGroup> - <_closureFileByFileName Include="@(ClosureFile->'%(FileName)')"> - <Original>%(Identity)</Original> - </_closureFileByFileName> - - <!-- Create items by framework that fallback to previous framework for non-existent files --> - <!-- this could be done better if we used a test project that imported the actual shipping targets --> - <_closureFileNet461 Include="@(_closureFileByFileName)" Condition="'%(_closureFileByFileName.TargetFramework)' == 'net461'" /> - <_closureFileNet462 Include="@(_closureFileByFileName)" Condition="'%(_closureFileByFileName.TargetFramework)' == 'net462'" /> - <_closureFileNet462 Include="@(_closureFileNet461)" Exclude="@(_closureFileNet462)" /> - <_closureFileNet47 Include="@(_closureFileByFileName)" Condition="'%(_closureFileByFileName.TargetFramework)' == 'net47'" /> - <_closureFileNet47 Include="@(_closureFileNet462)" Exclude="@(_closureFileNet47)" /> - - <!-- remove all the ones we're operating on, we'll replace with framework-specific closure sets --> - <ClosureFile Remove="@(ClosureFile)" /> - - <ClosureFile Include="@(_closureFileNet461->'%(Original)')"> - <FileSet>%(FileSet)-net461</FileSet> - </ClosureFile> - - <ClosureFile Include="@(_closureFileNet462->'%(Original)')"> - <FileSet>%(FileSet)-net462</FileSet> - </ClosureFile> - - <ClosureFile Include="@(_closureFileNet47->'%(Original)')" > - <FileSet>%(FileSet)-net47</FileSet> - </ClosureFile> - </ItemGroup> - </Target> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - - <!-- runs as initial target, overrides IncludeFiles in frameworkPackage.targets to define TFM-specific TargetPath - under the build folder --> - <Target Name="IncludeFiles" DependsOnTargets="IncludeNETStandardShims"> - <PropertyGroup> - <_projectDirLength>$(ProjectDir.Length)</_projectDirLength> - </PropertyGroup> - - <ItemGroup> - <!-- Include refs --> - <File Include="@(RefFile)"> - <TargetPath Condition="'%(RefFile.TargetPath)' == ''">build/%(RefFile.TargetFramework)/ref%(RefFile.SubFolder)</TargetPath> - </File> - - <!-- Include lib --> - <File Include="@(LibFile)"> - <TargetPath Condition="'%(LibFile.TargetPath)' == '' ">build/%(LibFile.TargetFramework)/lib%(LibFile.SubFolder)</TargetPath> - </File> - </ItemGroup> - - <ItemGroup> - <!-- Set targetpath for sources to be under src so that it is excluded from the lib package --> - <File Condition="'%(File.IsSourceCodeFile)' == 'true'"> - <TargetPath>src</TargetPath> - <TargetPath Condition="$([System.String]::Copy('%(FullPath)').StartsWith('$(ProjectDir)'))">src/$([System.String]::Copy('%(FullPath)').Substring($(_projectDirLength)).Replace('\', '/'))</TargetPath> - </File> - </ItemGroup> - </Target> - - <ItemGroup> - <IgnoredReference Include="System.Memory" /> - </ItemGroup> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.props b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.props deleted file mode 100644 index 1019c11442..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.props +++ /dev/null @@ -1,7 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <NETStandardLibraryNETFrameworkPackageVersion>{PACKAGE_VERSION}</NETStandardLibraryNETFrameworkPackageVersion> - <PackageConflictPreferredPackages>NETStandard.Library.NETFramework;$(PackageConflictPreferredPackages)</PackageConflictPreferredPackages> - <ImplicitlyExpandNETStandardFacades Condition="'$(ImplicitlyExpandNETStandardFacades)' == ''">true</ImplicitlyExpandNETStandardFacades> - </PropertyGroup> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets b/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets deleted file mode 100644 index a8454df011..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/NETStandard.Library.NETFramework.common.targets +++ /dev/null @@ -1,63 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ImportedNETStandardLibraryNETFrameworkCommonTargets>true</ImportedNETStandardLibraryNETFrameworkCommonTargets> - </PropertyGroup> - <Choose> - <!-- Allow completely disabling the conflict resolution targets--> - <When Condition="'$(ImplicitlyExpandNETStandardFacades)' != 'true'" /> - <!-- Condition here is a hack until https://github.com/dotnet/sdk/issues/534 is fixed --> - <When Condition="'$(TargetFramework)' != '' or '$(TargetFrameworks)' != ''"> - <!-- NuGet 4, run after references are resolved --> - <PropertyGroup> - <ImplicitlyExpandNETStandardFacadesAfter>ResolveLockFileReferences</ImplicitlyExpandNETStandardFacadesAfter> - </PropertyGroup> - </When> - <When Condition="'$(ResolveNuGetPackages)' == 'true' and Exists('$(ProjectLockFile)')"> - <!-- NuGet 3, run after nuget assets are resolved --> - <PropertyGroup> - <ImplicitlyExpandNETStandardFacadesAfter>ResolveNuGetPackageAssets</ImplicitlyExpandNETStandardFacadesAfter> - </PropertyGroup> - </When> - <Otherwise> - <!-- NuGet 2, run before targets that consume references --> - <PropertyGroup> - <ResolveAssemblyReferencesDependsOn>ImplicitlyExpandNETStandardFacades;$(ResolveAssemblyReferencesDependsOn)</ResolveAssemblyReferencesDependsOn> - <PrepareResourcesDependsOn>ImplicitlyExpandNETStandardFacades;$(PrepareResourcesDependsOn)</PrepareResourcesDependsOn> - </PropertyGroup> - </Otherwise> - </Choose> - - <PropertyGroup> - <!-- Ensure this runs before conflict resolution since the added files may cause conflicts --> - <HandlePackageFileConflictsDependsOn>ImplicitlyExpandNETStandardFacades;$(HandlePackageFileConflictsDependsOn)</HandlePackageFileConflictsDependsOn> - </PropertyGroup> - - <ItemGroup Condition="'$(DontTrimNETStandardLibraryNETFramework)' != 'true'"> - <!-- mark this package as trimmable so that files in the same package aren't automatically rooted --> - <TrimmablePackages Include="NETStandard.Library.NETFramework" /> - </ItemGroup> - - <Target Name="ImplicitlyExpandNETStandardFacades" - AfterTargets="$(ImplicitlyExpandNETStandardFacadesAfter)"> - <ItemGroup> - <!-- Remove simple name references if we're directly providing a reference assembly to the compiler. For example, - consider a project with an Reference Include="System", and some NuGet package is providing System.dll. - Simple references can also come from NuGet framework assemblies, hence this statement should occur after - including all computed references. --> - <Reference Remove="%(_NETStandardLibraryNETFrameworkReference.FileName)" /> - - <Reference Include="@(_NETStandardLibraryNETFrameworkReference)"> - <!-- Private = false to make these reference only --> - <Private>false</Private> - <NuGetPackageId>NETStandard.Library.NETFramework</NuGetPackageId> - <NuGetPackageVersion>$(NETStandardLibraryNETFrameworkPackageVersion)</NuGetPackageVersion> - </Reference> - - <ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)"> - <Private>false</Private> - <NuGetPackageId>NETStandard.Library.NETFramework</NuGetPackageId> - <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion> - </ReferenceCopyLocalPaths> - </ItemGroup> - </Target> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.props b/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.props deleted file mode 100644 index e94b13d20f..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.props +++ /dev/null @@ -1,3 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\$(MSBuildThisFileName).common.props" /> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets deleted file mode 100644 index a01175375e..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net461/NETStandard.Library.NETFramework.targets +++ /dev/null @@ -1,11 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'"> - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - </ItemGroup> - - <Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" /> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.props b/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.props deleted file mode 100644 index e94b13d20f..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.props +++ /dev/null @@ -1,3 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\$(MSBuildThisFileName).common.props" /> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets deleted file mode 100644 index 2d0419841b..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net462/NETStandard.Library.NETFramework.targets +++ /dev/null @@ -1,12 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'"> - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - </ItemGroup> - - <Import Project="..\net461\$(MSBuildThisFile)" /> - <Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" /> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.props b/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.props deleted file mode 100644 index e94b13d20f..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.props +++ /dev/null @@ -1,3 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\$(MSBuildThisFileName).common.props" /> -</Project> diff --git a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets b/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets deleted file mode 100644 index a27d071d79..0000000000 --- a/pkg/NETStandard.Library.NETFramework/targets/net47/NETStandard.Library.NETFramework.targets +++ /dev/null @@ -1,12 +0,0 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Condition="'$(ImplicitlyExpandNETStandardFacades)' == 'true'"> - <_NETStandardLibraryNETFrameworkReference Include="$(MSBuildThisFileDirectory)\ref\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - - <_NETStandardLibraryNETFrameworkLib Include="$(MSBuildThisFileDirectory)\lib\*.dll" - Exclude="@(_NETStandardLibraryNETFrameworkLib->'$(MSBuildThisFileDirectory)\ref\%(FileName).dll')" /> - </ItemGroup> - - <Import Project="..\net462\$(MSBuildThisFile)" /> - <Import Project="..\$(MSBuildThisFileName).common.targets" Condition="'$(ImportedNETStandardLibraryNETFrameworkCommonTargets)' != 'true'" /> -</Project> diff --git a/src/System.Data.Common/dir.props b/src/System.Data.Common/dir.props index b5dea7fb76..b89fb6fc11 100644 --- a/src/System.Data.Common/dir.props +++ b/src/System.Data.Common/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Data.Common/ref/Configurations.props b/src/System.Data.Common/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Data.Common/ref/Configurations.props +++ b/src/System.Data.Common/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Data.Common/src/Configurations.props b/src/System.Data.Common/src/Configurations.props index c172e09c79..f1e1082d04 100644 --- a/src/System.Data.Common/src/Configurations.props +++ b/src/System.Data.Common/src/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> uap-Windows_NT; netcoreapp; - netfx; uapaot-Windows_NT; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Diagnostics.StackTrace/dir.props b/src/System.Diagnostics.StackTrace/dir.props index e09fa64586..e063359772 100644 --- a/src/System.Diagnostics.StackTrace/dir.props +++ b/src/System.Diagnostics.StackTrace/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.StackTrace/ref/Configurations.props b/src/System.Diagnostics.StackTrace/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Diagnostics.StackTrace/ref/Configurations.props +++ b/src/System.Diagnostics.StackTrace/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Diagnostics.StackTrace/src/Configurations.props b/src/System.Diagnostics.StackTrace/src/Configurations.props index 216b17ac28..527cedea19 100644 --- a/src/System.Diagnostics.StackTrace/src/Configurations.props +++ b/src/System.Diagnostics.StackTrace/src/Configurations.props @@ -6,7 +6,6 @@ netcoreapp-Windows_NT; netcoreapp-Unix; uap-Windows_NT; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/dir.props b/src/System.Diagnostics.Tracing/dir.props index b5dea7fb76..b89fb6fc11 100644 --- a/src/System.Diagnostics.Tracing/dir.props +++ b/src/System.Diagnostics.Tracing/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/ref/Configurations.props b/src/System.Diagnostics.Tracing/ref/Configurations.props index 7de0087598..c701755863 100644 --- a/src/System.Diagnostics.Tracing/ref/Configurations.props +++ b/src/System.Diagnostics.Tracing/ref/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netcoreapp; uap; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/src/Configurations.props b/src/System.Diagnostics.Tracing/src/Configurations.props index 11587136e3..aed58fb42e 100644 --- a/src/System.Diagnostics.Tracing/src/Configurations.props +++ b/src/System.Diagnostics.Tracing/src/Configurations.props @@ -6,7 +6,6 @@ uapaot-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; - netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/dir.props b/src/System.Globalization.Extensions/dir.props index e09fa64586..e063359772 100644 --- a/src/System.Globalization.Extensions/dir.props +++ b/src/System.Globalization.Extensions/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/ref/Configurations.props b/src/System.Globalization.Extensions/ref/Configurations.props index 7de0087598..c701755863 100644 --- a/src/System.Globalization.Extensions/ref/Configurations.props +++ b/src/System.Globalization.Extensions/ref/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netcoreapp; uap; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/src/Configurations.props b/src/System.Globalization.Extensions/src/Configurations.props index 72bafb787d..62eb1c4776 100644 --- a/src/System.Globalization.Extensions/src/Configurations.props +++ b/src/System.Globalization.Extensions/src/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netcoreapp-Unix; netcoreapp-Windows_NT; - netfx-Windows_NT; uap-Windows_NT; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.IO.Compression/dir.props b/src/System.IO.Compression/dir.props index 988a62597c..4d0d97a320 100644 --- a/src/System.IO.Compression/dir.props +++ b/src/System.IO.Compression/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>ECMA</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/ref/Configurations.props b/src/System.IO.Compression/ref/Configurations.props index 7de0087598..c701755863 100644 --- a/src/System.IO.Compression/ref/Configurations.props +++ b/src/System.IO.Compression/ref/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netcoreapp; uap; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.IO.Compression/src/Configurations.props b/src/System.IO.Compression/src/Configurations.props index 6b9a954087..62eb1c4776 100644 --- a/src/System.IO.Compression/src/Configurations.props +++ b/src/System.IO.Compression/src/Configurations.props @@ -5,7 +5,6 @@ netcoreapp-Unix; netcoreapp-Windows_NT; uap-Windows_NT; - netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http/dir.props b/src/System.Net.Http/dir.props index b5dea7fb76..b89fb6fc11 100644 --- a/src/System.Net.Http/dir.props +++ b/src/System.Net.Http/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Http/ref/Configurations.props b/src/System.Net.Http/ref/Configurations.props index 960bd47f9e..c701755863 100644 --- a/src/System.Net.Http/ref/Configurations.props +++ b/src/System.Net.Http/ref/Configurations.props @@ -3,8 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; - net46; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Net.Http/src/Configurations.props b/src/System.Net.Http/src/Configurations.props index 7306909691..8c59b78a84 100644 --- a/src/System.Net.Http/src/Configurations.props +++ b/src/System.Net.Http/src/Configurations.props @@ -6,8 +6,6 @@ netcoreapp-OSX; netcoreapp-Unix; netcoreapp-Windows_NT; - net46-Windows_NT; - netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project> diff --git a/src/System.Net.Sockets/dir.props b/src/System.Net.Sockets/dir.props index b5dea7fb76..b89fb6fc11 100644 --- a/src/System.Net.Sockets/dir.props +++ b/src/System.Net.Sockets/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/ref/Configurations.props b/src/System.Net.Sockets/ref/Configurations.props index 7de0087598..c701755863 100644 --- a/src/System.Net.Sockets/ref/Configurations.props +++ b/src/System.Net.Sockets/ref/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> netcoreapp; uap; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Net.Sockets/src/Configurations.props b/src/System.Net.Sockets/src/Configurations.props index 4149e4ad8d..1d686837b0 100644 --- a/src/System.Net.Sockets/src/Configurations.props +++ b/src/System.Net.Sockets/src/Configurations.props @@ -5,7 +5,6 @@ uap-Windows_NT; netcoreapp-Unix; netcoreapp-Windows_NT; - netfx-Windows_NT; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props index 20750540c2..85a6f1a497 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/dir.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props index a566650551..c701755863 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/ref/Configurations.props @@ -3,9 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; - net462; - net47; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props index 69dfbdb675..f11a8087a1 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props @@ -2,17 +2,8 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - win8-Windows_NT; - wpa81-Windows_NT; - net45-Windows_NT; - netfx-Windows_NT; - net462-Windows_NT; - net47-Windows_NT; uap-Windows_NT; uapaot-Windows_NT; - netstandard1.1-AnyOS; - netstandard1.1-Unix; - netstandard1.1-Windows_NT; netcoreapp-Unix; netcoreapp-Windows_NT; </BuildConfigurations> diff --git a/src/System.Runtime.Serialization.Primitives/dir.props b/src/System.Runtime.Serialization.Primitives/dir.props index b5dea7fb76..b89fb6fc11 100644 --- a/src/System.Runtime.Serialization.Primitives/dir.props +++ b/src/System.Runtime.Serialization.Primitives/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Primitives/ref/Configurations.props b/src/System.Runtime.Serialization.Primitives/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Runtime.Serialization.Primitives/ref/Configurations.props +++ b/src/System.Runtime.Serialization.Primitives/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Serialization.Primitives/src/Configurations.props b/src/System.Runtime.Serialization.Primitives/src/Configurations.props index 083bbc7b58..dcb70afd11 100644 --- a/src/System.Runtime.Serialization.Primitives/src/Configurations.props +++ b/src/System.Runtime.Serialization.Primitives/src/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> uapaot-Windows_NT; uap-Windows_NT; - netfx-Windows_NT; netcoreapp; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Serialization.Xml/dir.props b/src/System.Runtime.Serialization.Xml/dir.props index eed54a2340..b4fda06b13 100644 --- a/src/System.Runtime.Serialization.Xml/dir.props +++ b/src/System.Runtime.Serialization.Xml/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Serialization.Xml/ref/Configurations.props b/src/System.Runtime.Serialization.Xml/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Runtime.Serialization.Xml/ref/Configurations.props +++ b/src/System.Runtime.Serialization.Xml/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Serialization.Xml/src/Configurations.props b/src/System.Runtime.Serialization.Xml/src/Configurations.props index 2204d7da51..a8910ef718 100644 --- a/src/System.Runtime.Serialization.Xml/src/Configurations.props +++ b/src/System.Runtime.Serialization.Xml/src/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> uap-Windows_NT; - netfx-Windows_NT; netcoreapp; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Security.Cryptography.Algorithms/dir.props b/src/System.Security.Cryptography.Algorithms/dir.props index d3194fc7fe..70f807eaef 100644 --- a/src/System.Security.Cryptography.Algorithms/dir.props +++ b/src/System.Security.Cryptography.Algorithms/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.Cryptography.Algorithms/ref/Configurations.props b/src/System.Security.Cryptography.Algorithms/ref/Configurations.props index 492def5c96..c701755863 100644 --- a/src/System.Security.Cryptography.Algorithms/ref/Configurations.props +++ b/src/System.Security.Cryptography.Algorithms/ref/Configurations.props @@ -3,8 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; - net47; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Security.Cryptography.Algorithms/src/Configurations.props b/src/System.Security.Cryptography.Algorithms/src/Configurations.props index 3c676b5a95..057c22542f 100644 --- a/src/System.Security.Cryptography.Algorithms/src/Configurations.props +++ b/src/System.Security.Cryptography.Algorithms/src/Configurations.props @@ -5,8 +5,6 @@ netcoreapp-Unix; netcoreapp-OSX; netcoreapp-Windows_NT; - netfx-Windows_NT; - net47-Windows_NT; uap-Windows_NT; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Security.SecureString/dir.props b/src/System.Security.SecureString/dir.props index e09fa64586..e063359772 100644 --- a/src/System.Security.SecureString/dir.props +++ b/src/System.Security.SecureString/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Security.SecureString/ref/Configurations.props b/src/System.Security.SecureString/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Security.SecureString/ref/Configurations.props +++ b/src/System.Security.SecureString/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Security.SecureString/src/Configurations.props b/src/System.Security.SecureString/src/Configurations.props index dec427aa16..a8910ef718 100644 --- a/src/System.Security.SecureString/src/Configurations.props +++ b/src/System.Security.SecureString/src/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> uap-Windows_NT; netcoreapp; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/dir.props b/src/System.Threading.Overlapped/dir.props index e09fa64586..e063359772 100644 --- a/src/System.Threading.Overlapped/dir.props +++ b/src/System.Threading.Overlapped/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Threading.Overlapped/ref/Configurations.props b/src/System.Threading.Overlapped/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Threading.Overlapped/ref/Configurations.props +++ b/src/System.Threading.Overlapped/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Threading.Overlapped/src/Configurations.props b/src/System.Threading.Overlapped/src/Configurations.props index 2f43c22f78..aed58fb42e 100644 --- a/src/System.Threading.Overlapped/src/Configurations.props +++ b/src/System.Threading.Overlapped/src/Configurations.props @@ -4,7 +4,6 @@ <BuildConfigurations> uap-Windows_NT; uapaot-Windows_NT; - netfx-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; </BuildConfigurations> diff --git a/src/System.ValueTuple/dir.props b/src/System.ValueTuple/dir.props index 3c0e06e0cc..637f027bee 100644 --- a/src/System.ValueTuple/dir.props +++ b/src/System.ValueTuple/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>Open</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/dir.props b/src/System.Xml.XPath.XDocument/dir.props index e09fa64586..e063359772 100644 --- a/src/System.Xml.XPath.XDocument/dir.props +++ b/src/System.Xml.XPath.XDocument/dir.props @@ -6,6 +6,5 @@ <AssemblyKey>MSFT</AssemblyKey> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Xml.XPath.XDocument/ref/Configurations.props b/src/System.Xml.XPath.XDocument/ref/Configurations.props index 192309fce5..c701755863 100644 --- a/src/System.Xml.XPath.XDocument/ref/Configurations.props +++ b/src/System.Xml.XPath.XDocument/ref/Configurations.props @@ -3,7 +3,6 @@ <PropertyGroup> <BuildConfigurations> netcoreapp; - netfx; uap; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Xml.XPath.XDocument/src/Configurations.props b/src/System.Xml.XPath.XDocument/src/Configurations.props index 988a1a18ca..bbb5be814e 100644 --- a/src/System.Xml.XPath.XDocument/src/Configurations.props +++ b/src/System.Xml.XPath.XDocument/src/Configurations.props @@ -5,7 +5,6 @@ uap-Windows_NT; netcoreapp-Windows_NT; netcoreapp-Unix; - netfx; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/netfx.force.conflict/dir.props b/src/netfx.force.conflict/dir.props deleted file mode 100644 index e3457a3688..0000000000 --- a/src/netfx.force.conflict/dir.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\dir.props" /> - <PropertyGroup> - <!-- this assembly is not versioned, it only contains type forwards and will never be referenced by another assembly --> - <AssemblyVersion>0.0.0.0</AssemblyVersion> - <AssemblyKey>Open</AssemblyKey> - <!-- this assembly only appears in ref --> - <IsNetFxNETStandard>false</IsNetFxNETStandard> - <IsNetFxNETStandardRef>true</IsNetFxNETStandardRef> - </PropertyGroup> -</Project> diff --git a/src/netfx.force.conflict/netfx.force.conflict.sln b/src/netfx.force.conflict/netfx.force.conflict.sln deleted file mode 100644 index 600c2cc8c3..0000000000 --- a/src/netfx.force.conflict/netfx.force.conflict.sln +++ /dev/null @@ -1,26 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "netfx.force.conflicts", "ref\netfx.force.conflicts.csproj", "{85139F71-BF0C-4DC2-8306-53CE1D10E351}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {85139F71-BF0C-4DC2-8306-53CE1D10E351}.Debug|Any CPU.ActiveCfg = netfx-Debug|Any CPU - {85139F71-BF0C-4DC2-8306-53CE1D10E351}.Debug|Any CPU.Build.0 = netfx-Debug|Any CPU - {85139F71-BF0C-4DC2-8306-53CE1D10E351}.Release|Any CPU.ActiveCfg = netfx-Release|Any CPU - {85139F71-BF0C-4DC2-8306-53CE1D10E351}.Release|Any CPU.Build.0 = netfx-Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {85139F71-BF0C-4DC2-8306-53CE1D10E351} = {2E666815-2EDB-464B-9DF6-380BF4789AD4} - EndGlobalSection -EndGlobal diff --git a/src/netfx.force.conflict/ref/Configurations.props b/src/netfx.force.conflict/ref/Configurations.props deleted file mode 100644 index 064de9fd71..0000000000 --- a/src/netfx.force.conflict/ref/Configurations.props +++ /dev/null @@ -1,8 +0,0 @@ -<?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/src/netfx.force.conflict/ref/TypeForwards.cs b/src/netfx.force.conflict/ref/TypeForwards.cs deleted file mode 100644 index 90c15fe80f..0000000000 --- a/src/netfx.force.conflict/ref/TypeForwards.cs +++ /dev/null @@ -1,117 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; -// Microsoft.CSharp -[assembly: TypeForwardedTo(typeof(Microsoft.CSharp.RuntimeBinder.Binder))] -// Microsoft.VisualBasic -[assembly: TypeForwardedTo(typeof(Microsoft.VisualBasic.Strings))] -// System.Collections -[assembly: TypeForwardedTo(typeof(System.Collections.Generic.List<>))] -// System.Collections.Concurrent -[assembly: TypeForwardedTo(typeof(System.Collections.Concurrent.ConcurrentDictionary<,>))] -// System.ComponentModel -[assembly: TypeForwardedTo(typeof(System.ComponentModel.CancelEventArgs))] -// System.ComponentModel.Annotations -[assembly: TypeForwardedTo(typeof(System.ComponentModel.DataAnnotations.ValidationResult))] -// System.ComponentModel.EventBasedAsync -[assembly: TypeForwardedTo(typeof(System.ComponentModel.AsyncCompletedEventArgs))] -// System.Diagnostics.Contracts -[assembly: TypeForwardedTo(typeof(System.Diagnostics.Contracts.Contract))] -// System.Diagnostics.Debug -[assembly: TypeForwardedTo(typeof(System.Diagnostics.Debug))] -// System.Diagnostics.Tools -[assembly: TypeForwardedTo(typeof(System.CodeDom.Compiler.GeneratedCodeAttribute))] -// System.Diagnostics.Tracing -[assembly: TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventSource))] -// System.Dynamic.Runtime -[assembly: TypeForwardedTo(typeof(System.Dynamic.DynamicObject))] -// System.Globalization -[assembly: TypeForwardedTo(typeof(System.Globalization.CultureInfo))] -// System.IO -[assembly: TypeForwardedTo(typeof(System.IO.Stream))] -// System.IO.Compression -[assembly: TypeForwardedTo(typeof(System.IO.Compression.GZipStream))] -// System.Linq -[assembly: TypeForwardedTo(typeof(System.Linq.Enumerable))] -// System.Linq.Expressions -[assembly: TypeForwardedTo(typeof(System.Linq.Expressions.Expression))] -// System.Linq.Parallel -[assembly: TypeForwardedTo(typeof(System.Linq.ParallelEnumerable))] -// System.Linq.Queryable -[assembly: TypeForwardedTo(typeof(System.Linq.Queryable))] -// System.Net.Http -[assembly: TypeForwardedTo(typeof(System.Net.Http.HttpClient))] -// System.Net.Http.Rtc -// not supported on desktop -// System.Net.NetworkInformation -[assembly: TypeForwardedTo(typeof(System.Net.NetworkInformation.NetworkInterface))] -// System.Net.Primitives -[assembly: TypeForwardedTo(typeof(System.Net.HttpStatusCode))] -// System.Net.Requests -[assembly: TypeForwardedTo(typeof(System.Net.HttpWebRequest))] -// System.ObjectModel -[assembly: TypeForwardedTo(typeof(System.ComponentModel.INotifyPropertyChanged))] -// System.Reflection -[assembly: TypeForwardedTo(typeof(System.Reflection.MethodInfo))] -// System.Reflection.Context -[assembly: TypeForwardedTo(typeof(System.Reflection.Context.CustomReflectionContext))] -// System.Reflection.Extensions -[assembly: TypeForwardedTo(typeof(System.Reflection.InterfaceMapping))] -// System.Reflection.Primitives -[assembly: TypeForwardedTo(typeof(System.Reflection.TypeAttributes))] -// System.Resources.ResourceManager -[assembly: TypeForwardedTo(typeof(System.Resources.ResourceManager))] -// System.Runtime -[assembly: TypeForwardedTo(typeof(string))] -// System.Runtime.Extensions -[assembly: TypeForwardedTo(typeof(System.Environment))] -// System.Runtime.InteropServices -[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.DllImportAttribute))] -// System.Runtime.InteropServices.WindowsRuntime -[assembly: TypeForwardedTo(typeof(System.Runtime.InteropServices.WindowsRuntime.ReadOnlyArrayAttribute))] -// System.Runtime.Numerics -[assembly: TypeForwardedTo(typeof(System.Numerics.BigInteger))] -// System.Runtime.Serialization.Json -[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer))] -// System.Runtime.Serialization.Primitives -[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.DataContractAttribute))] -// System.Runtime.Serialization.Xml -[assembly: TypeForwardedTo(typeof(System.Runtime.Serialization.DataContractSerializer))] -// System.Runtime.WindowsRuntime -// not supported on desktop -// System.Runtime.WindowsRuntime.UI.Xaml -// not supported on desktop -// System.Security.Principal -[assembly: TypeForwardedTo(typeof(System.Security.Principal.IPrincipal))] -// System.ServiceModel.Duplex -[assembly: TypeForwardedTo(typeof(System.ServiceModel.DuplexClientBase<>))] -// System.ServiceModel.Http -[assembly: TypeForwardedTo(typeof(System.ServiceModel.BasicHttpBinding))] -// System.ServiceModel.NetTcp -[assembly: TypeForwardedTo(typeof(System.ServiceModel.NetTcpBinding))] -// System.ServiceModel.Primitives -[assembly: TypeForwardedTo(typeof(System.ServiceModel.ClientBase<>))] -// System.ServiceModel.Security -[assembly: TypeForwardedTo(typeof(System.ServiceModel.Channels.LocalClientSecuritySettings))] -// System.Text.Encoding -[assembly: TypeForwardedTo(typeof(System.Text.Encoding))] -// System.Text.Encoding.Extensions -[assembly: TypeForwardedTo(typeof(System.Text.UTF8Encoding))] -// System.Text.RegularExpressions -[assembly: TypeForwardedTo(typeof(System.Text.RegularExpressions.Regex))] -// System.Threading -[assembly: TypeForwardedTo(typeof(System.Threading.Mutex))] -// System.Threading.Tasks -[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.Task))] -// System.Threading.Tasks.Parallel -[assembly: TypeForwardedTo(typeof(System.Threading.Tasks.Parallel))] -// System.Threading.Timer -[assembly: TypeForwardedTo(typeof(System.Threading.Timer))] -// System.Xml.ReaderWriter -[assembly: TypeForwardedTo(typeof(System.Xml.XmlReader))] -// System.Xml.XDocument -[assembly: TypeForwardedTo(typeof(System.Xml.Linq.XDocument))] -// System.Xml.XmlSerializer -[assembly: TypeForwardedTo(typeof(System.Xml.Serialization.XmlSerializer))] diff --git a/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj b/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj deleted file mode 100644 index 754adff6d3..0000000000 --- a/src/netfx.force.conflict/ref/netfx.force.conflicts.csproj +++ /dev/null @@ -1,15 +0,0 @@ -<?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" /> - <PropertyGroup> - <ProjectGuid>{85139F71-BF0C-4DC2-8306-53CE1D10E351}</ProjectGuid> - <AssemblyName>netfx.force.conflicts</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netfx-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netfx-Release|AnyCPU'" /> - <ItemGroup> - <Compile Include="TypeForwards.cs" /> - <ProjectReference Include="..\..\..\external\netfx-conflicts\netfx-conflicts.depproj" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/shims/dir.props b/src/shims/dir.props index b8f2c8d749..42378f6ef4 100644 --- a/src/shims/dir.props +++ b/src/shims/dir.props @@ -6,7 +6,6 @@ $(BuildConfigurations); netcoreapp; uap; - netfx; </BuildConfigurations> </PropertyGroup> @@ -17,7 +16,6 @@ <PropertyGroup> <IsNETCoreApp>true</IsNETCoreApp> <IsUAP>true</IsUAP> - <IsNetFxNETStandard>true</IsNetFxNETStandard> </PropertyGroup> <PropertyGroup> diff --git a/tools-local/targetgroups.props b/tools-local/targetgroups.props index 0c68e0c9de..cf998c3dbc 100644 --- a/tools-local/targetgroups.props +++ b/tools-local/targetgroups.props @@ -209,6 +209,13 @@ <Imports>net462</Imports> <CompatibleWith>netstandard</CompatibleWith> </TargetGroups> + <TargetGroups Include="net471"> + <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7.1</TargetingPackNugetPackageId> + <NuGetTargetMoniker>.NETFramework,Version=v4.7.1</NuGetTargetMoniker> + <NuGetTargetMonikerShort>net471</NuGetTargetMonikerShort> + <Imports>net47</Imports> + <CompatibleWith>netstandard</CompatibleWith> + </TargetGroups> <TargetGroups Include="win8"> <NuGetTargetMoniker>Windows,Version=v8.0</NuGetTargetMoniker> <NuGetTargetMonikerShort>win8</NuGetTargetMonikerShort> |