diff options
| author | Christopher Costa <chcosta@microsoft.com> | 2017-01-31 17:43:46 -0800 |
|---|---|---|
| committer | Christopher Costa <chcosta@microsoft.com> | 2017-01-31 17:43:46 -0800 |
| commit | 94979104494e1f6c19f94c91140e25afc6c1a006 (patch) | |
| tree | 198cccc37eecaff95ba9b33b94ab63fd6ac426af | |
| parent | 13593513cbabfc4cbbb50e62bedbe0ce6f93488a (diff) | |
| download | coreclr-94979104494e1f6c19f94c91140e25afc6c1a006.tar.gz coreclr-94979104494e1f6c19f94c91140e25afc6c1a006.tar.bz2 coreclr-94979104494e1f6c19f94c91140e25afc6c1a006.zip | |
Refactor coreclr packaging
95 files changed, 374 insertions, 3022 deletions
@@ -48,7 +48,7 @@ usage() echo "cmakeargs - user-settable additional arguments passed to CMake." echo "bindir - output directory (defaults to $__ProjectRoot/bin)" echo "buildstandalonegc - builds the GC in a standalone mode. Can't be used with \"cmakeargs\"." - + echo "msbuildonunsupportedplatform" exit 1 } @@ -304,42 +304,46 @@ isMSBuildOnNETCoreSupported() if [ "$__HostArch" == "x64" ]; then if [ "$__HostOS" == "Linux" ]; then - case "$__HostDistroRid" in - "centos.7-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "debian.8-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.23-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.24-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.13.2-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.42.1-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "rhel.7"*"-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.14.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.10-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "alpine.3.4.3-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - *) - esac + if [ "$__msbuildonunsupportedplatform" == "1" ]; then + __isMSBuildOnNETCoreSupported=1 + else + case "$__HostDistroRid" in + "centos.7-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "debian.8-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "fedora.23-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "fedora.24-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "opensuse.13.2-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "opensuse.42.1-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "rhel.7"*"-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.14.04-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.16.04-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "ubuntu.16.10-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + "alpine.3.4.3-x64") + __isMSBuildOnNETCoreSupported=1 + ;; + *) + esac + fi elif [ "$__HostOS" == "OSX" ]; then __isMSBuildOnNETCoreSupported=1 fi @@ -558,6 +562,7 @@ __cmakeargs="" __SkipGenerateVersion=0 __DoCrossArchBuild=0 __PortableLinux=0 +__msbuildonunsupportedplatform=0 while :; do if [ $# -le 0 ]; then @@ -728,6 +733,9 @@ while :; do buildstandalonegc) __cmakeargs="-DFEATURE_STANDALONE_GC=1" ;; + msbuildonunsupportedplatform) + __msbuildonunsupportedplatform=1 + ;; *) __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" ;; diff --git a/dir.traversal.targets b/dir.traversal.targets index fd8fb93d31..c0b284d791 100644 --- a/dir.traversal.targets +++ b/dir.traversal.targets @@ -18,4 +18,5 @@ <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> + <Target Name="Dump" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index e568ca57f5..93d9e296d4 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -1,89 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> - - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.ILAsm.pkgproj"> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>x86</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILAsm.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index c0b2134610..f863619c9c 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -1,69 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> - <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>arm64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>x86</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="linux\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - </ItemGroup> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 41a5b4c301..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index f821897b4f..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index ac8f53b4fe..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 3ad08a9b77..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/fedora/24/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 6181ab366e..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 85adbd6092..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 6410798f63..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/rhel/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/linux/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props index ce3bf6320e..a8692a781e 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/linux/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props index bee340b23c..bcd75f9c3a 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/osx/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props index 57364df706..478c4600de 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/win/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> - <SkipPackageFileCheck>true</SkipPackageFileCheck> </PropertyGroup> <ItemGroup> <ArchitectureSpecificNativeFile Include="$(BinDir)ilasm.exe" /> @@ -14,11 +12,9 @@ <ItemGroup> <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file + </ItemGroup></Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index cacadc78b1..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 818495e6e2..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj deleted file mode 100644 index 91ee7f3503..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILAsm/ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index 5939fdaf6e..3c8ff0810c 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -1,89 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> - - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.ILDAsm.pkgproj"> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>x86</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILDAsm.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 47683ef0a3..f863619c9c 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -1,69 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> - <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>arm64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>x86</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="linux\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.ILDAsm.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - </ItemGroup> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index b27fe08767..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/alpine/3.4.3/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index af9d384ae1..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/debian/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 8385c5d55a..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/23/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 20ad52225b..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/fedora/24/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index d91ef02df3..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/13.2/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 07370b4915..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/opensuse/42.1/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 355c1c9162..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/rhel/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/linux/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props index 7a7f82ddd5..70f2f46be5 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/linux/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props @@ -1,9 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> @@ -19,11 +16,9 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file + </ItemGroup></Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props index 9a17267a66..7629cae19f 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/osx/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props index d32b540b0b..850df28e6d 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/win/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> - <SkipPackageFileCheck>true</SkipPackageFileCheck> </PropertyGroup> <ItemGroup> <ArchitectureSpecificNativeFile Include="$(BinDir)ildasm.exe" /> @@ -15,11 +13,10 @@ <ItemGroup> <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index e087645962..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/14.04/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 776e59ba16..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.04/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj deleted file mode 100644 index 6c73eba240..0000000000 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/ubuntu/16.10/Microsoft.NETCore.ILDAsm.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index 61c690ebb1..372d8d8d64 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -1,89 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> - - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.Jit.pkgproj"> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>x86</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Jit.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index bcd4e4232f..27b0bc8c2b 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -1,68 +1,47 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> + + <!-- Add path globs specific to native binaries to exclude unnecessary files from packages. --> + <Choose> + <When Condition="$(PackageTargetRuntime.StartsWith('win'))"/> + <When Condition="$(PackageTargetRuntime.StartsWith('osx'))"> + <PropertyGroup> + <LibraryFileExtension>.dylib</LibraryFileExtension> + <SymbolFileExtension>.dwarf</SymbolFileExtension> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <LibraryFileExtension>.so</LibraryFileExtension> + <SymbolFileExtension>.dbg</SymbolFileExtension> + </PropertyGroup> + </Otherwise> + </Choose> <ItemGroup> - <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj"> - <Platform>arm64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj"> - <Platform>x86</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Jit.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="linux\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Jit.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Jit.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.Jit.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> + <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" /> + <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" /> </ItemGroup> + + <PropertyGroup> + <TargetFrameworkName>netcoreapp</TargetFrameworkName> + <TargetFrameworkVersion>2.0</TargetFrameworkVersion> + <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework> + + <LongNamePlatform>$(PackagePlatform)</LongNamePlatform> + <LongNamePlatform Condition="'$(LongNamePlatform)'=='x64'">amd64</LongNamePlatform> + <CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform> + <CrossTargetPlatform Condition="'$(CrossTargetPlatform)'=='x64'">amd64</CrossTargetPlatform> + <LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</LongNameSuffix> + <CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</CrossTargetLongNameSuffix> + </PropertyGroup> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 96851ff3ac..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/alpine/3.4.3/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 9d6043e465..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/debian/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 1dea18c33d..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/fedora/23/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 42f974ab96..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/fedora/24/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 28a8769d5e..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/opensuse/13.2/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 930606c175..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/opensuse/42.1/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index fa9f58c81b..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/rhel/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/linux/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props index 541b81e4ab..4f333eefe3 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/linux/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props @@ -1,11 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props index 87e7e2bffd..abc18a70eb 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/osx/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props @@ -1,11 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> + <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> <NativeSplittableBinary Include="$(BinDir)libclrjit.dylib" /> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props index 66106c30dc..49a2164401 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/win/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props @@ -1,11 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - </PropertyGroup> <ItemGroup> <ArchitectureSpecificNativeFile Include="$(BinDir)clrjit.dll" /> <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' == 'x86'" Include="$(BinDir)compatjit.dll" /> @@ -25,7 +19,7 @@ <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <CrossArchitectureSpecificNativeSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> @@ -36,5 +30,4 @@ <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 50d343f977..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/14.04/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index e57b7c51d5..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.04/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj deleted file mode 100644 index 338d23372f..0000000000 --- a/src/.nuget/Microsoft.NETCore.Jit/ubuntu/16.10/Microsoft.NETCore.Jit.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds index a178ddb961..976f64b1bf 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds @@ -1,65 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <Import Project="Microsoft.NETCore.Native.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.Native.pkgproj"> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Native.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj index 51b524a1c8..bcca6d20e5 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj @@ -1,50 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> + + <Import Project="Microsoft.NETCore.Native.props" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="linux\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.Native.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - </ItemGroup> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props new file mode 100644 index 0000000000..ff2f587a1c --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.props @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <SupportedPackageOSGroups>Linux;OSX</SupportedPackageOSGroups> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 90545a9001..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index c136a2c057..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 8547114cdd..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index f4987de01d..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index bf8307a0b3..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index 19ac91cd88..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index f9dc309a6b..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props index 8b1064f081..59628e4ccd 100644 --- a/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -20,11 +16,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props index b358c86799..23a12832ee 100644 --- a/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -20,11 +16,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index d1c5be74ff..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index b2b0f96587..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj deleted file mode 100644 index da4a03d668..0000000000 --- a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index c7bfdc3b04..372d8d8d64 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -1,88 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>x86</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> -</Project> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> +</Project>
\ No newline at end of file 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 a1405d5fff..b92deb69da 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 @@ -1,69 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> - <ItemGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> <ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj" /> - <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>arm64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>x86</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="linux\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> </ItemGroup> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index c779349b7c..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/alpine/3.4.3/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 4f95c2550f..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index a68fe2c0c6..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/23/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index d19a1dd80f..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/fedora/24/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index e5c70c93da..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/13.2/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 990a0526c5..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/opensuse/42.1/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index f12793fe73..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 31e719601d..50df04bc11 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,8 +15,8 @@ <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> @@ -46,11 +42,10 @@ <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props index 6425e8b6f1..7433a9460d 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -44,11 +40,11 @@ <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> + +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props index 844fb0b10f..533864ce87 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> - <SkipPackageFileCheck>true</SkipPackageFileCheck> <LongNamePlatform>$(PackagePlatform)</LongNamePlatform> <LongNamePlatform Condition="'$(LongNamePlatform)'=='x64'">amd64</LongNamePlatform> <CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform> @@ -94,6 +91,4 @@ <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 86cb61a264..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/14.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Condition="'$(PackagePlatform)' != 'arm'" Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)'!='arm'" Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)'!='arm'" Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 72c48ee459..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.04/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Condition="'$(PackagePlatform)' != 'arm'" Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'arm'" Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'arm'" Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj deleted file mode 100644 index 9f226f8530..0000000000 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/16.10/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Include="$(BinDir)libcoreclrtraceptprovider.so" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.so" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.so" /> - <NativeSplittableBinary Include="$(BinDir)libsos.so" /> - <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> - <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> - <File Include="@(ArchitectureSpecificLibFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> - </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index c1d076fb0e..93d9e296d4 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -1,89 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> - <PropertyGroup> - <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> - <OutputPath>$(PackageOutputPath)</OutputPath> - </PropertyGroup> - - <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> <ItemGroup> - <Project Include="Microsoft.NETCore.TestHost.pkgproj"> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm64</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>x86</Platform> - </Project> - <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Windows_NT</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>arm</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>Linux</OSGroup> - <Platform>amd64</Platform> - </Project> - <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.TestHost.pkgproj"> - <OSGroup>OSX</OSGroup> - <Platform>amd64</Platform> - </Project> + <!-- identity project, runtime specific projects are included by props above --> + <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index 325461d3ac..dae102f97d 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -1,68 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <SkipValidatePackage>true</SkipValidatePackage> - <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> - <OutputPath>$(PackagesOutputPath)</OutputPath> - <IncludeRuntimeJson>true</IncludeRuntimeJson> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" /> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms> + <IsLineupPackage>true</IsLineupPackage> </PropertyGroup> - <ItemGroup> - <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>arm64</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>x86</Platform> - </ProjectReference> - <ProjectReference Include="win\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="linux\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="debian\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\23\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="fedora\24\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\13.2\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="opensuse\42.1\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="rhel\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>arm</Platform> - </ProjectReference> - <ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - <ProjectReference Include="osx\Microsoft.NETCore.TestHost.pkgproj"> - <Platform>amd64</Platform> - </ProjectReference> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> + + <Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /></Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index dd142f6711..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/alpine/3.4.3/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>alpine.3.4.3-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 045b2e7569..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/debian/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>debian.8-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 2edb86a28a..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/fedora/23/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.23-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 219026c703..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/fedora/24/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>fedora.24-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 31740920e0..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/13.2/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.13.2-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 8aaec62373..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/opensuse/42.1/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>opensuse.42.1-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 1cfaf50d5d..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/rhel/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/linux/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props index 06a6f4ce10..59e6d63c34 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/linux/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>linux-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/osx/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props index cbcc805d8d..56a23f47f5 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/osx/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> <PackagePlatforms>x64;</PackagePlatforms> </PropertyGroup> <ItemGroup> @@ -19,11 +15,10 @@ <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/win/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props index 33ab15fb62..bab9b9f8ba 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/win/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> - <SkipPackageFileCheck>true</SkipPackageFileCheck> </PropertyGroup> <ItemGroup> <ArchitectureSpecificNativeFile Include="$(BinDir)CoreRun.exe" /> @@ -14,11 +12,10 @@ <ItemGroup> <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" /> + <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> <File Include="@(ArchitectureSpecificNativeSymbol)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <IsSymbolFile>true</IsSymbolFile> </File> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 8750e16817..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/14.04/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 3f1397f92f..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.04/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.04-$(PackagePlatform)</PackageTargetRuntime> - <!-- build for x64, arm --> - <PackagePlatforms>x64;arm;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj deleted file mode 100644 index 88ad98a4db..0000000000 --- a/src/.nuget/Microsoft.NETCore.TestHost/ubuntu/16.10/Microsoft.NETCore.TestHost.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - <PackageTargetRuntime>ubuntu.16.10-$(PackagePlatform)</PackageTargetRuntime> - <!-- only build for x64 --> - <PackagePlatforms>x64;</PackagePlatforms> - </PropertyGroup> - <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dbg')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json index 5440fde0de..5908fcc3f9 100644 --- a/src/.nuget/init/project.json +++ b/src/.nuget/init/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02", + "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02" }, "frameworks": { "dnxcore50": { diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props new file mode 100644 index 0000000000..7f1c5bcac4 --- /dev/null +++ b/src/.nuget/packaging.props @@ -0,0 +1,135 @@ +<?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> + <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups> + <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups> + + <ArchGroup Condition="'$(Platform)' != ''">$(Platform)</ArchGroup> + <ArchGroup Condition="'$(ArchGroup)' == ''">$(BuildArch)</ArchGroup> + <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex> + <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily> + <_isSupportedOSGroup>true</_isSupportedOSGroup> + </PropertyGroup> + + <!-- derive an OS Group based on the OS Family --> + <PropertyGroup Condition="'$(_runtimeOSFamily)' != ''"> + <_derivedPackageTargetOSGroup>Linux</_derivedPackageTargetOSGroup> + <_derivedPackageTargetOSGroup Condition="'$(_runtimeOSFamily)' == 'osx'">OSX</_derivedPackageTargetOSGroup> + <_derivedPackageTargetOSGroup Condition="'$(_runtimeOSFamily)' == 'win'">Windows_NT</_derivedPackageTargetOSGroup> + + <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup> + </PropertyGroup> + + <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for + an unsupported OS Group --> + <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'"> + <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup> + </PropertyGroup> + + <PropertyGroup> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <OutputPath>$(PackageOutputPath)</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> + <SkipValidatePackage>true</SkipValidatePackage> + <IncludeRuntimeJson>true</IncludeRuntimeJson> + <PackagePlatforms>x64;x86;arm64;arm;armel</PackagePlatforms> + </PropertyGroup> + + <Choose> + <When Condition="'$(PackageRID)' != ''" /> + <When Condition="'$(_runtimeOSFamily)' == 'win'"> + <PropertyGroup> + <PackageRID Condition="'$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64'">win7-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(ArchGroup)' == 'arm'">win8-$(ArchGroup)</PackageRID> + <PackageRID Condition="'$(ArchGroup)' == 'arm64'">win10-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> + <When Condition="'$(_runtimeOSFamily)' == 'osx'"> + <PropertyGroup> + <PackageRID>osx.10.10-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> + <When Condition="'$(_runtimeOSFamily)' == 'rhel'"> + <PropertyGroup> + <PackageRID>rhel.7-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID> + </PropertyGroup> + </Otherwise> + </Choose> + + <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))"> + <OfficialBuildRID Include="alpine.3.4.3-x64" /> + <OfficialBuildRID Include="debian.8-armel"> + <Platform>armel</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="debian.8-x64" /> + <OfficialBuildRID Include="fedora.23-x64" /> + <OfficialBuildRID Include="fedora.24-x64" /> + <OfficialBuildRID Include="linux-x64" /> + <OfficialBuildRID Include="opensuse.13.2-x64" /> + <OfficialBuildRID Include="opensuse.42.1-x64" /> + <OfficialBuildRID Include="rhel.7-x64" /> + <OfficialBuildRID Include="tizen.4.0.0-armel"> + <Platform>armel</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="ubuntu.14.04-arm"> + <Platform>arm</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="ubuntu.14.04-x64" /> + <OfficialBuildRID Include="ubuntu.16.04-arm"> + <Platform>arm</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="ubuntu.16.04-x64" /> + <OfficialBuildRID Include="ubuntu.16.10-arm"> + <Platform>arm</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="ubuntu.16.10-x64" /> + </ItemGroup> + <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';OSX;'))"> + <OfficialBuildRID Include="osx.10.10-x64" /> + </ItemGroup> + <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Windows_NT;'))"> + <OfficialBuildRID Include="win7-x86"> + <Platform>x86</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="win7-x64" /> + <OfficialBuildRID Include="win8-arm"> + <Platform>arm</Platform> + </OfficialBuildRID> + <OfficialBuildRID Include="win10-arm64"> + <Platform>arm64</Platform> + </OfficialBuildRID> + </ItemGroup> + <ItemGroup> + <!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set, but + don't build the RID-specific package if we're in an unsupported os family --> + <BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/> + <BuildRID Include="$(PackageRID)" + Condition="'$(_isSupportedOSGroup)' == 'true'"> + <Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform> + <Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform> + </BuildRID> + </ItemGroup> + + <ItemGroup> + <_project Include="@(BuildRID)"> + <Platform Condition="'%(Platform)' == ''">amd64</Platform> + <PackageTargetRuntime>%(Identity)</PackageTargetRuntime> + <AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties> + </_project> + + <Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" /> + </ItemGroup> + + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> + <ProjectReference Include="@(Project)" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/src/.nuget/packaging.targets b/src/.nuget/packaging.targets new file mode 100644 index 0000000000..8439616d82 --- /dev/null +++ b/src/.nuget/packaging.targets @@ -0,0 +1,19 @@ +<?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.traversal.targets))\dir.traversal.targets" /> + + <Target Name="FilterProjects" BeforeTargets="Build"> + <Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/> + + <!-- Only build packages for current RID --> + <ItemGroup> + <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' OR '%(Project.PackageTargetRuntime)' == ''" /> + </ItemGroup> + + <ItemGroup> + <Project Remove="@(Project)" /> + <Project Include="@(_projectsToBuild)" /> + </ItemGroup> + </Target> +</Project>
\ No newline at end of file |