diff options
21 files changed, 3 insertions, 55 deletions
@@ -77,7 +77,6 @@ <Platform Condition="'$(Platform)' == ''">$(BuildArch)</Platform> <Platform Condition="'$(Platform)' == 'amd64'">x64</Platform> - </PropertyGroup> <!-- Output paths --> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index cf5d9094b3..4eb8428f8f 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props index b71169cc6a..fa72b48619 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.14.04'">x64;arm;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.16.04'">x64;arm;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ilasm" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props index bcd75f9c3a..9048ff7544 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ilasm" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 73c27ae8c2..ff688a73a1 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props index 681e935689..3e604c2538 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.14.04'">x64;arm;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.16.04'">x64;arm;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ildasm" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props index 7629cae19f..c0a4d0f2b5 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)ildasm" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index a0ef5c99ac..2b3e7417b2 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props index 1c4a5b2402..cd0f45ea4f 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.14.04'">x64;arm;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.16.04'">x64;arm;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props index abc18a70eb..310f2a12a5 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.dylib" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj index ddaa191622..12119621ac 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj @@ -6,7 +6,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props index 59628e4ccd..55a8deba19 100644 --- a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props index 23a12832ee..e338eb445e 100644 --- a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.dylib" /> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 5c933c167c..71d6584245 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 57ca7cdaa8..15cfe5f0c1 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.14.04'">x64;arm;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.16.04'">x64;arm;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props index 7433a9460d..f8709fc55c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libcoreclr.dylib" /> <NativeSplittableBinary Include="$(BinDir)libdbgshim.dylib" /> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index d65f0ec714..80de0bc708 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> - <PackagePlatforms>x64;x86;arm64;arm;armel;</PackagePlatforms> <IsLineupPackage Condition="'$(IsLineupPackage)' == ''">true</IsLineupPackage> </PropertyGroup> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props index 472863f0e7..c48d595254 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.14.04'">x64;arm;</PackagePlatforms> - <PackagePlatforms Condition="'$(RuntimeOS)' == 'ubuntu.16.04'">x64;arm;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)corerun" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props index 56a23f47f5..b1cc2f8eef 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)corerun" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> diff --git a/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj b/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj index 0d4fb18ea0..45d5d5e097 100644 --- a/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj @@ -4,7 +4,6 @@ <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;</PackagePlatforms> <OutputPath>$(PackagesOutputPath)</OutputPath> </PropertyGroup> <ItemGroup> diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 5408171509..bdae27a40a 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -3,6 +3,9 @@ <Import Project="$(MSBuildThisFileDirectory)..\..\dir.props" /> <PropertyGroup> + <!-- defined in buildtools packaging.targets, but we need this before targets are imported --> + <PackagePlatform>AnyCPU</PackagePlatform> + <!-- Distro rid is passed as runtimeos-arch--> <_parseDistroRid>$(__DistroRid)</_parseDistroRid> <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.10-x64</_parseDistroRid> @@ -49,7 +52,6 @@ <PropertyGroup Condition="'$(IsLineupPackage)' == 'true'"> <SkipValidatePackage>true</SkipValidatePackage> <IncludeRuntimeJson>true</IncludeRuntimeJson> - <PackagePlatforms>x64;x86;arm64;arm;armel</PackagePlatforms> </PropertyGroup> <Choose> |