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/.nuget/Microsoft.NETCore.TestHost | |
| 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/.nuget/Microsoft.NETCore.TestHost')
3 files changed, 5 insertions, 47 deletions
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> |