Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 604513a

Browse files
author
Ian Hays
committed
[1.1] Fix Debian packaging bug.
- Fixes packaging for Debian8 and Debian9 - Further narrows down the scope of tool-runtime replacement with restored dotnetcli to only Debian9 and only the x509certififactes assembly.
1 parent 9ef4efc commit 604513a

File tree

11 files changed

+12
-13
lines changed

11 files changed

+12
-13
lines changed

‎init-tools.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then
112112
fi
113113

114114
# Replace the binaries restored by the tool runtime script with the portable binaries
115-
if [ "$__DISTRO_NAME" == 'fedora.28' ] ||
116-
[ "$__DISTRO_NAME" == 'debian.9' ]; then
117-
cp -r $__DOTNET_PATH/shared/Microsoft.NETCore.App/*/* $__TOOLRUNTIME_DIR
115+
if [ "$__DISTRO_NAME" == 'debian.9' ]; then
116+
cp -r $__DOTNET_PATH/shared/Microsoft.NETCore.App/*/System.Security.Cryptography.X509Certificates.dll $__TOOLRUNTIME_DIR
118117
fi
119118

120119
touch $__INIT_TOOLS_DONE_MARKER

‎src/.nuget/Microsoft.NETCore.ILAsm/debian/8/Microsoft.NETCore.ILAsm.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.ILAsm/debian/9/Microsoft.NETCore.ILAsm.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.ILDAsm/debian/8/Microsoft.NETCore.ILDAsm.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.ILDAsm/debian/9/Microsoft.NETCore.ILDAsm.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.Jit/debian/8/Microsoft.NETCore.Jit.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.Jit/debian/9/Microsoft.NETCore.Jit.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/8/Microsoft.NETCore.Runtime.CoreCLR.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
4747
<AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" />
4848
<AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" />
49-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
49+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
5050
<File Include="@(ArchitectureSpecificNativeSymbol)">
5151
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
5252
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/9/Microsoft.NETCore.Runtime.CoreCLR.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
4747
<AdditionalSymbolPackageExcludes Include="%2A%2A\sosdocsunix.txt" />
4848
<AdditionalSymbolPackageExcludes Include="%2A%2A\crossgen" />
49-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
49+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
5050
<File Include="@(ArchitectureSpecificNativeSymbol)">
5151
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
5252
<IsSymbolFile>true</IsSymbolFile>

‎src/.nuget/Microsoft.NETCore.TestHost/debian/8/Microsoft.NETCore.TestHost.pkgproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalLibPackageExcludes Include="%2A%2A\%2A.dbg" />
2020
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.so" />
2121
<AdditionalSymbolPackageExcludes Include="%2A%2A\%2A.dll" />
22-
<ArchitectureSpecificNativeSymbol Include="..\..\_.pdb" />
22+
<ArchitectureSpecificNativeSymbol Include="..\..\..\_.pdb" />
2323
<File Include="@(ArchitectureSpecificNativeSymbol)">
2424
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
2525
<IsSymbolFile>true</IsSymbolFile>

0 commit comments

Comments
 (0)