diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-02-09 16:17:57 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-09 16:17:57 -0800 |
| commit | 89ba46aa6e113486428ac7528f662e3a0a5a55eb (patch) | |
| tree | 37814daf0d27a8183015c991cecd5047a358692d /src/.nuget/Microsoft.NETCore.Runtime.CoreCLR | |
| parent | b0bb85dab475f28cd782a8075ce8bc2e6871965d (diff) | |
| download | coreclr-89ba46aa6e113486428ac7528f662e3a0a5a55eb.tar.gz coreclr-89ba46aa6e113486428ac7528f662e3a0a5a55eb.tar.bz2 coreclr-89ba46aa6e113486428ac7528f662e3a0a5a55eb.zip | |
Revert "Delete mscorlib from packages (#9313)"
This reverts commit 4fe623c9235e4df42be810d09ca7f282956e3cec.
# Conflicts:
# src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
Diffstat (limited to 'src/.nuget/Microsoft.NETCore.Runtime.CoreCLR')
13 files changed, 26 insertions, 0 deletions
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 index 841a851cdd..c779349b7c 100644 --- 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 @@ -17,7 +17,9 @@ <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" /> 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 73bebe0c8f..f982188fb3 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 @@ -17,7 +17,9 @@ <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" /> <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" /> <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" /> + <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'armel'" Include="$(BinDir)mscorlib.ni.dll" /> <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'armel'" 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" /> 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 index b9a0192275..a68fe2c0c6 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> 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 index ee3201cc70..d19a1dd80f 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 8d3b70306c..31e719601d 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/linux/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -17,8 +17,10 @@ <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)" /> 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 index eb46212bd6..e5c70c93da 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> 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 index 8b54c02c90..990a0526c5 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> 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 cf9426e2c2..6425e8b6f1 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 @@ -15,7 +15,9 @@ <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" /> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" /> 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 c5d6d2eae3..f12793fe73 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 @@ -17,8 +17,10 @@ <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)" /> 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 index 2c4a453974..86cb61a264 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> 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 index 80dd877bc5..72c48ee459 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> 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 index 745ebbe496..9f226f8530 100644 --- 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 @@ -17,8 +17,10 @@ <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)" /> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 393d46f58d..844fb0b10f 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -38,8 +38,10 @@ <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" /> <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe" /> <CrossArchitectureSpecificToolFile Include="$(BinDir)$(CrossTargetComponentFolder)\crossgen.exe" /> |