diff options
| author | Jo Shields <joshield@microsoft.com> | 2019-10-07 23:36:13 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-10-07 23:36:13 +0300 |
| commit | d28d72cb960111e038a54e7b7ea1f897cebe12a1 (patch) | |
| tree | 3189ab9f606d69280d4839119d4d9bf0ef0ccab0 /mcs/tools | |
| parent | 1d18c27dbe99a5b5e8489ce6a9c9113023f056e3 (diff) | |
Bump version to 6.9 (#17207)
* Bump version to 6.9
* Add missing new linker source file
* [csproj] Update project files
* No monolinker on MCS mode, new linker version needs Roslyn
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/linker/Makefile | 6 | ||||
| -rw-r--r-- | mcs/tools/linker/monolinker.csproj | 1 | ||||
| -rw-r--r-- | mcs/tools/linker/monolinker.exe.sources | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mcs/tools/linker/Makefile b/mcs/tools/linker/Makefile index 09d805fd557..e408fab7d6f 100644 --- a/mcs/tools/linker/Makefile +++ b/mcs/tools/linker/Makefile @@ -45,6 +45,12 @@ TEST_CASES += \ System.Core/test-queryable-02.cs endif +ifdef MCS_MODE +NO_INSTALL=1 +NO_BUILD=1 +NO_TEST=1 +endif + TESTS_COMPILER = $(MCS) -nologo -noconfig -unsafe -nostdlib -debug:portable -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll MARSHALING_TEST_NATIVE = mscorlib/test-marshaling-native.so diff --git a/mcs/tools/linker/monolinker.csproj b/mcs/tools/linker/monolinker.csproj index deecaee30d2..6e2ce4d2746 100644 --- a/mcs/tools/linker/monolinker.csproj +++ b/mcs/tools/linker/monolinker.csproj @@ -95,6 +95,7 @@ <Compile Include="..\..\..\external\linker\src\linker\Linker\MethodBodyScanner.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker\MethodDefinitionExtensions.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker\MethodReferenceExtensions.cs" /> + <Compile Include="..\..\..\external\linker\src\linker\Linker\OutputException.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker\OverrideInformation.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker\Pipeline.cs" /> <Compile Include="..\..\..\external\linker\src\linker\Linker\Tracer.cs" /> diff --git a/mcs/tools/linker/monolinker.exe.sources b/mcs/tools/linker/monolinker.exe.sources index e436b3e03ed..0eb26205569 100644 --- a/mcs/tools/linker/monolinker.exe.sources +++ b/mcs/tools/linker/monolinker.exe.sources @@ -18,6 +18,7 @@ ../../../external/linker/src/linker/Linker/MarkingHelpers.cs ../../../external/linker/src/linker/Linker/MethodAction.cs ../../../external/linker/src/linker/Linker/MethodBodyScanner.cs +../../../external/linker/src/linker/Linker/OutputException.cs ../../../external/linker/src/linker/Linker/OverrideInformation.cs ../../../external/linker/src/linker/Linker/MethodDefinitionExtensions.cs ../../../external/linker/src/linker/Linker/MethodReferenceExtensions.cs |