diff options
author | Davis Goodin <dagood@users.noreply.github.com> | 2017-03-06 11:40:56 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-06 11:40:56 -0600 |
commit | 61619268805bace6b730de1237fd3c7545eb99b5 (patch) | |
tree | 88ab014e32723820014e813e22a7b5a2b071e8e9 /src | |
parent | ccf4cb343f6b9f47fc4b08d8811ead1caa3c706c (diff) | |
download | coreclr-61619268805bace6b730de1237fd3c7545eb99b5.tar.gz coreclr-61619268805bace6b730de1237fd3c7545eb99b5.tar.bz2 coreclr-61619268805bace6b730de1237fd3c7545eb99b5.zip |
Add stripSymbols argument; refactor symbol package build (#9664)
* Add argument to explicitly enable symbol stripping
* Refactor symbol package build
* Remove unnecessary native file distinctions
* Remove unnecessary WindowsSymbolFile step
Diffstat (limited to 'src')
21 files changed, 186 insertions, 376 deletions
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props index fa72b48619..a8019b21e6 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Linux.Microsoft.NETCore.ILAsm.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)ilasm" /> </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> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props index 9048ff7544..a8019b21e6 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.OSX.Microsoft.NETCore.ILAsm.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ilasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)ilasm" /> </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props index 478c4600de..e08b0241c5 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILAsm/runtime.Windows_NT.Microsoft.NETCore.ILAsm.props @@ -4,17 +4,6 @@ <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> </PropertyGroup> <ItemGroup> - <ArchitectureSpecificNativeFile Include="$(BinDir)ilasm.exe" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)ilasm.exe" /> </ItemGroup> - <ItemGroup> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup></Project> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props index 3e604c2538..f7ab15b664 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Linux.Microsoft.NETCore.ILDAsm.props @@ -1,20 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)ildasm" /> </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></Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props index c0a4d0f2b5..f7ab15b664 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.OSX.Microsoft.NETCore.ILDAsm.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)ildasm" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)ildasm" /> </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props index 850df28e6d..2f0e944982 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/runtime.Windows_NT.Microsoft.NETCore.ILDAsm.props @@ -4,19 +4,7 @@ <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> </PropertyGroup> <ItemGroup> - <ArchitectureSpecificNativeFile Include="$(BinDir)ildasm.exe" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)ildasmrc.dll" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> + <NativeBinary Include="$(BinDir)ildasm.exe" /> + <NativeBinary Include="$(BinDir)ildasmrc.dll" /> </ItemGroup> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props index cd0f45ea4f..b92d11ae59 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Linux.Microsoft.NETCore.Jit.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.so" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)libclrjit.so" /> </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> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props index 310f2a12a5..99cee0e68b 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.OSX.Microsoft.NETCore.Jit.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libclrjit.dylib" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)libclrjit.dylib" /> </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props index 49a2164401..1485fcca29 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props +++ b/src/.nuget/Microsoft.NETCore.Jit/runtime.Windows_NT.Microsoft.NETCore.Jit.props @@ -1,33 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ArchitectureSpecificNativeFile Include="$(BinDir)clrjit.dll" /> - <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' == 'x86'" Include="$(BinDir)compatjit.dll" /> - <CrossArchitectureSpecificNativeFile Include="$(BinDir)$(CrossTargetComponentFolder)\clrjit.dll" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - <File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(PackagePlatform)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup> + <NativeBinary Include="$(BinDir)clrjit.dll" /> + <NativeBinary Condition="'$(PackagePlatform)' == 'x86'" Include="$(BinDir)compatjit.dll" /> + <CrossArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)$(CrossTargetComponentFolder)\clrjit.dll" /> + <!-- prevent accidental inclusion in AOT projects. --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)-aot/native</TargetPath> </File> - - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <CrossArchitectureSpecificNativeSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - <File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(PackagePlatform)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> </ItemGroup> </Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props index 55a8deba19..87db2a7bd2 100644 --- a/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.Linux.Microsoft.NETCore.Native.props @@ -2,21 +2,6 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <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> + <NativeBinary Include="$(BinDir)System.Globalization.Native.so" /> </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> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props index e338eb445e..8ce70300e5 100644 --- a/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props +++ b/src/.nuget/Microsoft.NETCore.Native/runtime.OSX.Microsoft.NETCore.Native.props @@ -2,21 +2,6 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <NativeBinary Include="$(BinDir)libSystem.Globalization.Native.a" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.dylib" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile);@(NativeBinary)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)System.Globalization.Native.dylib" /> </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> 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 b42a05595e..f6f6a73bc9 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,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <Import Project="Microsoft.NETCore.Runtime.CoreCLR.props" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''"> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.props new file mode 100644 index 0000000000..0e1f9db1c5 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/netstandard1.0</TargetPath> + </File> + </ItemGroup> +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 4cce4c85f4..2ba18808aa 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -5,48 +5,20 @@ <_PlatformDoesNotSupportNiFiles Condition="'$(Platform)' == 'armel'">true</_PlatformDoesNotSupportNiFiles> </PropertyGroup> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.so" /> - <NativeSplittableBinary Condition="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" 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="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Condition="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <NativeBinary Include="$(BinDir)libcoreclr.so" /> + <NativeBinary Condition="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" Include="$(BinDir)libcoreclrtraceptprovider.so" /> + <NativeBinary Include="$(BinDir)libdbgshim.so" /> + <NativeBinary Include="$(BinDir)libmscordaccore.so" /> + <NativeBinary Include="$(BinDir)libmscordbi.so" /> + <NativeBinary Include="$(BinDir)libsos.so" /> + <NativeBinary Include="$(BinDir)libsosplugin.so" /> + <NativeBinary Include="$(BinDir)System.Globalization.Native.so" /> + <NativeBinary Include="$(BinDir)sosdocsunix.txt" /> + <NativeBinary Condition="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" Include="$(BinDir)mscorlib.ni.dll" /> + <NativeBinary Condition="'$(_PlatformDoesNotSupportNiFiles)' != 'true'" 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> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props index f8709fc55c..66f55bc6b3 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.OSX.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,47 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)libcoreclr.dylib" /> - <NativeSplittableBinary Include="$(BinDir)libdbgshim.dylib" /> - <NativeSplittableBinary Include="$(BinDir)libmscordaccore.dylib" /> - <NativeSplittableBinary Include="$(BinDir)libmscordbi.dylib" /> - <NativeSplittableBinary Include="$(BinDir)libsos.dylib" /> - <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.dylib" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <NativeBinary Include="$(BinDir)libcoreclr.dylib" /> + <NativeBinary Include="$(BinDir)libdbgshim.dylib" /> + <NativeBinary Include="$(BinDir)libmscordaccore.dylib" /> + <NativeBinary Include="$(BinDir)libmscordbi.dylib" /> + <NativeBinary Include="$(BinDir)libsos.dylib" /> + <NativeBinary Include="$(BinDir)System.Globalization.Native.dylib" /> + <NativeBinary Include="$(BinDir)sosdocsunix.txt" /> + <NativeBinary Include="$(BinDir)mscorlib.ni.dll" /> + <NativeBinary 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).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <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> - -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props index 533864ce87..3919178b2a 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props @@ -11,32 +11,16 @@ </PropertyGroup> <ItemGroup> - <LongNameFiles Include="mscordaccore.dll"/> - <LongNameFiles Include="sos.dll"/> - </ItemGroup> - - <Target Name="CopyLongNamedBinaries" BeforeTargets="CreatePackage"> - <Copy - SourceFiles="@(LongNameFiles -> '$(BinDir)%(Identity)')" - DestinationFiles="@(LongNameFiles -> '$(BinDir)%(FileName)$(LongNameSuffix)%(Extension)')"> - </Copy> - <Copy Condition="'$(HasCrossTargetComponents)' == 'true'" - SourceFiles="@(LongNameFiles -> '$(BinDir)$(CrossTargetComponentFolder)\%(Identity)')" - DestinationFiles="@(LongNameFiles -> '$(BinDir)$(CrossTargetComponentFolder)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)')"> - </Copy> - </Target> - - <ItemGroup> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)clretwrc.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)coreclr.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)dbgshim.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)mscordaccore.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)mscordbi.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)mscorrc.debug.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)mscorrc.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)sos.dll" /> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll" /> - <ArchitectureSpecificNativeFileAndSymbol Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <NativeBinary Include="$(BinDir)clretwrc.dll" /> + <NativeBinary Include="$(BinDir)coreclr.dll" /> + <NativeBinary Include="$(BinDir)dbgshim.dll" /> + <NativeBinary Include="$(BinDir)mscordaccore.dll" /> + <NativeBinary Include="$(BinDir)mscordbi.dll" /> + <NativeBinary Include="$(BinDir)mscorrc.debug.dll" /> + <NativeBinary Include="$(BinDir)mscorrc.dll" /> + <NativeBinary Include="$(BinDir)sos.dll" /> + <NativeBinary Include="$(BinDir)mscorlib.ni.dll" /> + <NativeBinary 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" /> @@ -45,20 +29,7 @@ <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll" /> <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordbi.dll" /> <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\sos.dll" /> - <ArchitectureSpecificNativeFile Include="@(ArchitectureSpecificNativeFileAndSymbol)" /> - <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> - <File Include="@(ArchitectureSpecificToolFile)"> - <TargetPath>tools</TargetPath> - </File> - <File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificToolFile)"> - <TargetPath>tools/$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath> - </File> + <!-- prevent accidental inclusion in AOT projects. --> <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)-aot/lib/netstandard1.0</TargetPath> @@ -66,29 +37,16 @@ <File Include="$(PlaceholderFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)-aot/native</TargetPath> </File> - <!-- No reference: don't permit reference to the implementation from lib --> - <File Include="$(PlaceholderFile)"> - <TargetPath>ref/netstandard1.0</TargetPath> - </File> - <!-- Symbols --> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFileAndSymbol -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificLibFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificToolFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <ArchitectureSpecificNativeSymbol Include="@(LongNameFiles -> '$(BinDir)%(FileName)$(LongNameSuffix)%(Extension)')" /> - <AdditionalLibPackageExcludes Include="@(LongNameFiles -> 'runtimes\$(PackageTargetRuntime)\native\%(FileName)$(LongNameSuffix)%(Extension)')" /> - <CrossArchitectureSpecificNativeSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" - Include="@(CrossArchitectureSpecificToolFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <CrossArchitectureSpecificNativeSymbol Condition="'$(HasCrossTargetComponents)' == 'true'" - Include="@(LongNameFiles -> '$(BinDir)$(CrossTargetComponentFolder)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)')" /> - <AdditionalLibPackageExcludes Condition="'$(HasCrossTargetComponents)' == 'true'" - Include="@(LongNameFiles -> 'tools\$(CrossTargetComponentFolder)_$(PackagePlatform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)')" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes\$(PackageTargetRuntime)\native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - <File Condition="'$(HasCrossTargetComponents)' == 'true'" Include="@(CrossArchitectureSpecificNativeSymbol)"> - <TargetPath>tools\$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> + + <!-- Create long-name files by including the same files again with a different target path. --> + <LongNameFile Include="$(BinDir)mscordaccore.dll; + $(BinDir)sos.dll"> + <TargetPath>runtimes\$(PackageTargetRuntime)\native\%(FileName)$(LongNameSuffix)%(Extension)</TargetPath> + </LongNameFile> + <LongNameFile Include="$(BinDir)$(CrossTargetComponentFolder)\mscordaccore.dll; + $(BinDir)$(CrossTargetComponentFolder)\sos.dll" + Condition="'$(HasCrossTargetComponents)'=='true'"> + <TargetPath>tools\$(CrossTargetComponentFolder)_$(PackagePlatform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension)</TargetPath> + </LongNameFile> </ItemGroup> </Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props index c48d595254..ce004bdac4 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Linux.Microsoft.NETCore.TestHost.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)corerun" /> </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> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props index b1cc2f8eef..ce004bdac4 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.OSX.Microsoft.NETCore.TestHost.props @@ -1,21 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <NativeSplittableBinary Include="$(BinDir)corerun" /> - <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> + <NativeBinary Include="$(BinDir)corerun" /> </ItemGroup> - <ItemGroup Condition="'$(__BuildType)' == 'Release'"> - <ArchitectureSpecificNativeSymbol Include="@(NativeSplittableBinary -> '%(Identity).dwarf')" /> - <AdditionalLibPackageExcludes Include="%2A%2A\%2A.dwarf" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dylib" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props index bab9b9f8ba..96c2595cf9 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props +++ b/src/.nuget/Microsoft.NETCore.TestHost/runtime.Windows_NT.Microsoft.NETCore.TestHost.props @@ -4,18 +4,6 @@ <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> </PropertyGroup> <ItemGroup> - <ArchitectureSpecificNativeFile Include="$(BinDir)CoreRun.exe" /> - <File Include="@(ArchitectureSpecificNativeFile)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - </File> - </ItemGroup> - <ItemGroup> - <ArchitectureSpecificNativeSymbol Include="@(ArchitectureSpecificNativeFile -> '%(RelativeDir)PDB\%(FileName).pdb')" /> - <AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" /> - <ArchitectureSpecificNativeSymbol Include="..\_.pdb" /> - <File Include="@(ArchitectureSpecificNativeSymbol)"> - <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> - <IsSymbolFile>true</IsSymbolFile> - </File> + <NativeBinary Include="$(BinDir)CoreRun.exe" /> </ItemGroup> </Project> diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index d304b818d6..c016b1165f 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -80,6 +80,23 @@ </Otherwise> </Choose> + <!-- Determine per-platform native binary extensions. --> + <Choose> + <When Condition="'$(_runtimeOSFamily)' == 'win'" /> + <When Condition="'$(_runtimeOSFamily)' == 'osx'"> + <PropertyGroup> + <LibraryFileExtension>.dylib</LibraryFileExtension> + <SymbolFileExtension>.dwarf</SymbolFileExtension> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <LibraryFileExtension>.so</LibraryFileExtension> + <SymbolFileExtension>.dbg</SymbolFileExtension> + </PropertyGroup> + </Otherwise> + </Choose> + <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))"> <OfficialBuildRID Include="alpine.3.4.3-x64" /> <OfficialBuildRID Include="debian.8-armel"> diff --git a/src/.nuget/dir.targets b/src/.nuget/dir.targets new file mode 100644 index 0000000000..6f7bae6b10 --- /dev/null +++ b/src/.nuget/dir.targets @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <!-- + Finds symbol files and injects them into the package build. + --> + <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles"> + <ItemGroup Condition="'$(SymbolFileExtension)' != ''"> + <AdditionalLibPackageExcludes Include="%2A%2A\%2A$(SymbolFileExtension)"/> + </ItemGroup> + + <ItemGroup> + <AdditionalLibPackageExcludes Include="@(LongNameFile -> '%(TargetPath)')" /> + </ItemGroup> + + <ItemGroup> + <NativeWithSymbolFile Include="@(NativeBinary)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </NativeWithSymbolFile> + <!-- Using lib/netstandard1.0 here. There is no TFM for this since it is a runtime itself. --> + <NativeWithSymbolFile Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/netstandard1.0</TargetPath> + </NativeWithSymbolFile> + <NativeWithSymbolFile Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </NativeWithSymbolFile> + </ItemGroup> + + <ItemGroup Condition="'$(HasCrossTargetComponents)'=='true'"> + <NativeWithSymbolFile Include="@(CrossArchitectureSpecificNativeFileAndSymbol)"> + <TargetPath>runtimes/$(CrossTargetComponentFolder)_$(PackagePlatform)/native</TargetPath> + </NativeWithSymbolFile> + <NativeWithSymbolFile Include="@(CrossArchitectureSpecificToolFile)"> + <TargetPath>tools/$(CrossTargetComponentFolder)_$(PackagePlatform)</TargetPath> + </NativeWithSymbolFile> + </ItemGroup> + + <ItemGroup> + <File Include="@(NativeWithSymbolFile)" /> + <File Include="@(LongNameFile)"> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <ItemGroup> + <!-- On Windows, trim ".dll" before adding ".pdb". --> + <WindowsNativeFile Include="@(NativeWithSymbolFile)" + Condition="'%(NativeWithSymbolFile.Extension)'=='.dll' OR '%(NativeWithSymbolFile.Extension)'=='.exe'" /> + <WindowsSymbolFile Include="@(WindowsNativeFile -> '%(RootDir)%(Directory)PDB\%(Filename).pdb')" /> + + <!-- + Search for all xplat symbol file extensions on every xplat native binary. Some binaries have + no ".so" or ".dylib" extension, so we can't tell which convention its symbol files would + use. On xplat, the symbol extension is simply appended. + --> + <NonWindowsNativeFile Include="@(NativeWithSymbolFile)" + Exclude="@(WindowsNativeFile)" /> + + <NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolFileExtension)')" /> + + <ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" /> + <ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" /> + + <!-- Include all found symbols. --> + <File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)"> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + + <PropertyGroup> + <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' AND '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb> + </PropertyGroup> + + <ItemGroup> + <File Include="$(MSBuildThisFileDirectory)\_.pdb" + Condition="'$(NeedsPlaceholderPdb)'=='true' AND '$(PackageTargetRuntime)'!=''"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + <IsSymbolFile>true</IsSymbolFile> + </File> + </ItemGroup> + </Target> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)\.., dir.targets))\dir.targets" /> +</Project> |