diff options
author | Eric StJohn <ericstj@microsoft.com> | 2017-04-04 19:04:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 19:04:49 +0300 |
commit | 997f641dde13dc2f89f9e4f45e1b1254aa644ebd (patch) | |
tree | 8259e5ceb580b79d0f7c6a5cbcc7554c753ff307 /pkg | |
parent | f044fc90e46e0905c12104bc0ab1a880570ff981 (diff) |
Ensure we build all of pkg folder (#17838)
* Ensure we build all of packages folder
This turns back on Microsoft.NETCore.Targets and
Microsoft.Private.PackageBaseline.
* Delete Microsoft.NETCore.Targets
Previously this package shipped a runtime.json with 2 things in it.
1. Lineup for all of CoreFx packages.
2. Supports clauses
1 is no longer needed since we've flattened the package graph.
2 is irrelevant now that NuGet has disabled guardrails checks.
Diffstat (limited to 'pkg')
3 files changed, 0 insertions, 135 deletions
diff --git a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds deleted file mode 100644 index a280e2a666..0000000000 --- a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds +++ /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"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup> - <Project Include="Microsoft.NETCore.Targets.pkgproj"/> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project>
\ No newline at end of file diff --git a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj deleted file mode 100644 index 0b95f5441f..0000000000 --- a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj +++ /dev/null @@ -1,35 +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> - <PackageVersion>$(LineupPackageVersion)</PackageVersion> - <IsLineupPackage>true</IsLineupPackage> - <RuntimeFileSource>runtime.json</RuntimeFileSource> - <SkipValidatePackage>true</SkipValidatePackage> - </PropertyGroup> - - <Import Project="..\NETStandard.Library\NETStandard.Library.packages.targets" /> - - <ItemGroup> - <!-- make this package installable and noop in a packages.config-based project --> - <File Include="$(PlaceHolderFile)"> - <TargetPath>lib/netstandard1.0</TargetPath> - </File> - - <Package Include="System.Private.Uri" /> - <NativePackage Include="runtime.native.System.IO.Compression" /> - <NativePackage Include="runtime.native.System" /> - <NativePackage Include="runtime.native.System.Net.Http" /> - <NativePackage Include="runtime.native.System.Security.Cryptography" /> - <NativePackage Include="runtime.native.System.Security.Cryptography.Apple" /> - <NativePackage Include="runtime.native.System.Security.Cryptography.OpenSsl" /> - <NativePackage Include="runtime.native.System.Net.Security" /> - </ItemGroup> - - <ItemGroup> - <LineupProjectReference Include="@(Package->'$(SourceDir)%(Identity)/pkg/%(Identity).pkgproj')" /> - <LineupProjectReference Include="@(NativePackage->'$(SourceDir)Native/pkg/%(Identity)/%(Identity).pkgproj')" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/pkg/Microsoft.NETCore.Targets/runtime.json b/pkg/Microsoft.NETCore.Targets/runtime.json deleted file mode 100644 index 925514c361..0000000000 --- a/pkg/Microsoft.NETCore.Targets/runtime.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "supports": { - "uwp.10.0.app": { - "uap10.0": [ - "win10-x86", - "win10-x86-aot", - "win10-x64", - "win10-x64-aot", - "win10-arm", - "win10-arm-aot" - ] - }, - "net45.app": { - "net45": [ - "", - "win-x86", - "win-x64" - ] - }, - "net451.app": { - "net451": [ - "", - "win-x86", - "win-x64" - ] - }, - "net452.app": { - "net452": [ - "", - "win-x86", - "win-x64" - ] - }, - "net46.app": { - "net46": [ - "", - "win-x86", - "win-x64" - ] - }, - "net461.app": { - "net461": [ - "", - "win-x86", - "win-x64" - ] - }, - "net462.app": { - "net462": [ - "", - "win-x86", - "win-x64" - ] - }, - "netcoreapp1.0.app": { - "netcoreapp1.0": [ - "win7-x86", - "win7-x64", - "osx.10.11-x64", - "centos.7-x64", - "debian.8-x64", - "linuxmint.17-x64", - "opensuse.13.2-x64", - "rhel.7.2-x64", - "ubuntu.14.04-x64", - "ubuntu.16.04-x64" - ] - }, - "win8.app": { - "win8": "" - }, - "win81.app": { - "win81": "" - }, - "wp8.app": { - "wp8": "" - }, - "wp81.app": { - "wp81": "" - }, - "wpa81.app": { - "wpa81": "" - }, - "dnxcore50.app": { - "dnxcore50": [ - "win7-x86", - "win7-x64" - ] - } - } - } - |