diff options
| author | Ankit Jain <radical@gmail.com> | 2017-10-24 13:54:20 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-10-25 10:14:54 +0300 |
| commit | 96c088354914fed8f5fa1d7a7c6de7bdf06e77e8 (patch) | |
| tree | d6830860276b355ba8b7b4bb5677dee9e7228eea | |
| parent | 60b980b3bb37890184843bd2d330d87a2fbfc78f (diff) | |
[msbuild] Add symlink to csc.exe in msbuild bin dir2017-08
Roslyn looks only inside `$msbuild_bin/Roslyn/` and does not fallback to
the framework path. msbuild worked around this by setting `CscToolPath`:
https://github.com/mono/msbuild/commit/157a0f4d1a7aadd4e561e3ca8c784cbc2529926f
But this kicks in only if the default msbuild target files are imported!
If the `Csc` task is being used without importing them, then we fail
with
`error MSB3082: Task failed because "csc.exe" was not found.`
`Microsoft.CodeAnalysis.VisualBasic.dll` is the only file not being
symlinked, after this change. So, instead we will symlink all the files.
Fixes bxc #60340 .
Cherry-pick 26ccf75f069b52bfc34f722418892afd6afa9e0f
| -rw-r--r-- | mcs/packages/Makefile | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index 9980aa9be99..f946f9d7428 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -25,19 +25,6 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \ $(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets \ $(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets -ROSLYN_FILES_TO_LINK_FOR_MSBUILD = \ - csi.exe \ - csi.exe.config \ - csi.rsp \ - Microsoft.CodeAnalysis.dll \ - Microsoft.CodeAnalysis.CSharp.dll \ - Microsoft.CodeAnalysis.CSharp.Scripting.dll \ - Microsoft.CodeAnalysis.Scripting.dll \ - System.Collections.Immutable.dll \ - System.Reflection.Metadata.dll \ - VBCSCompiler.exe \ - VBCSCompiler.exe.config - DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) ifeq ($(PROFILE), $(DEFAULT_PROFILE)) @@ -51,7 +38,7 @@ install-local: $(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR) $(INSTALL_LIB) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) $(MSBUILD_ROSLYN_DIR) - (cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_TO_LINK_FOR_MSBUILD); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$asm . ; done) + (cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_FOR_MONO); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$(basename $$asm) . ; done) endif |