Skip to content

Commit 77147e7

Browse files
radicalakoeplinger
authored andcommitted
[2019-10] Bump msbuild+roslyn to track mono-2019-10 (#18093)
* [2019-10] Bump msbuild+roslyn to track mono-2019-10 - bumps roslyn to `3.5.0-beta1-19606-04` * roslyn: Delete reference to the now removed Microsoft.Managed.EditorConfig.targets
1 parent d7337e5 commit 77147e7

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6066,8 +6066,8 @@ fi
60666066
AC_SUBST(mono_runtime)
60676067
AC_SUBST(mono_runtime_wrapper)
60686068

6069-
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/csc.exe
6070-
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/VBCSCompiler.exe
6069+
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/csc.exe
6070+
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/VBCSCompiler.exe
60716071

60726072
if test $csc_compiler = mcs; then
60736073
CSC=$mcs_topdir/class/lib/build/mcs.exe

external/roslyn-binaries

Submodule roslyn-binaries updated 31 files

mcs/packages/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \
3030
$(ROSLYN_CSC_DIR)/Microsoft.Build.Tasks.CodeAnalysis.dll \
3131
$(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets \
3232
$(ROSLYN_CSC_DIR)/Microsoft.Managed.Core.targets \
33-
$(ROSLYN_CSC_DIR)/Microsoft.Managed.EditorConfig.targets \
3433
$(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets
3534

3635
DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx

packaging/MacSDK/msbuild.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class MSBuild (GitHubPackage):
44
def __init__ (self):
55
GitHubPackage.__init__ (self, 'mono', 'msbuild', '15', # note: fix scripts/ci/run-test-mac-sdk.sh when bumping the version number
6-
revision = '3495481fd0db507969134989f138bf89d6f56873')
6+
revision = '5310081448152f227bec72971e8f242f42ae84b4')
77

88
def build (self):
99
try:

0 commit comments

Comments
 (0)