/coreclr

Permalink
Browse files

Remove PackagePlatforms property

  • Loading branch information...
1 parent f361873 commit 8dcf9665feabee339029c79b9d86dd24c71905d1 @chcosta chcosta committed Feb 14, 2017
Unified Split
Showing with 3 additions and 55 deletions.
  1. +0 −1 dir.props
  2. +0 −1 src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
  3. +0 −5 src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props
  4. +0 −3 src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props
  5. +0 −1 src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
  6. +0 −5 src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props
  7. +0 −3 src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props
  8. +0 −1 src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj
  9. +0 −5 src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props
  10. +0 −3 src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props
  11. +0 −1 src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj
  12. +0 −3 src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props
  13. +0 −3 src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props
  14. +0 −1 src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
  15. +0 −5 src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props
  16. +0 −3 src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props
  17. +0 −1 src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj
  18. +0 −5 src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props
  19. +0 −3 src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props
  20. +0 −1 src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj
  21. +3 −1 src/.nuget/dir.props
View
1 dir.props
@@ -77,7 +77,6 @@
<Platform Condition="'$(Platform)' == ''">$(BuildArch)</Platform>
<Platform Condition="'$(Platform)' == 'amd64'">x64</Platform>
-
</PropertyGroup>
<!-- Output paths -->
View
1 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>
View
5 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)" />
View
3 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)" />
View
1 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>
View
5 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)" />
View
3 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)" />
View
1 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>
View
5 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)" />
View
3 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)" />
View
1 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>
View
3 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" />
View
3 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" />
View
1 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>
View
5 ...t/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" />
View
3 ...get/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" />
View
1 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>
View
5 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)" />
View
3 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)" />
View
1 ...t/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>
View
4 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>

0 comments on commit 8dcf966

Please sign in to comment.