diff options
8 files changed, 110 insertions, 47 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 1b8f50277a..340408a6d4 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.25-prerelease-00307-04
\ No newline at end of file +1.0.25-prerelease-00308-04 @@ -158,6 +158,7 @@ <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform> <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform> <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath> + <SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath> </PropertyGroup> </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 6539826e2c..6189db2324 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 @@ -38,7 +38,6 @@ <ProjectReference Include="ubuntu\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/_.pdb b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/_.pdb new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/_.pdb @@ -0,0 +1,2 @@ + + 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 index 989d370b84..55498b9ce0 100644 --- 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 @@ -11,22 +11,21 @@ </PropertyGroup> <ItemGroup> - - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <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)System.Globalization.Native.so" /> - + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + <File Include="@(ArchitectureSpecificNativeFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> </File> @@ -46,5 +45,21 @@ </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/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index aac843b538..e7b4e876a5 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -11,20 +11,20 @@ </PropertyGroup> <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)libcoreclr.dylib"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.dylib"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.dylib"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.dylib"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.dylib"/> <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)System.Globalization.Native.dylib"/> - + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + <File Include="@(ArchitectureSpecificNativeFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> </File> @@ -44,5 +44,21 @@ </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> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> 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 index d17f607985..211d5502e2 100644 --- 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 @@ -11,22 +11,21 @@ </PropertyGroup> <ItemGroup> - - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <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)System.Globalization.Native.so" /> - + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + <File Include="@(ArchitectureSpecificNativeFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> </File> @@ -46,5 +45,21 @@ </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/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 174b823f5f..a49ea94d0c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -11,22 +11,21 @@ </PropertyGroup> <ItemGroup> - - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> - <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <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)System.Globalization.Native.so"/> - + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> - <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + <ArchitectureSpecificNativeFile Include="@(NativeSplittableBinary)"/> + <File Include="@(ArchitectureSpecificNativeFile)"> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> </File> @@ -46,5 +45,21 @@ </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> |