Skip to content

Commit

Permalink
Bump roslyn binaries to 3.1.0 and add VBCSCompiler.exe to the set of …
Browse files Browse the repository at this point in the history
…paths auto-detected by configure.ac (mono/mono#13518)

* Reconfigure bump for PR test

* Actually bump submodule this time probably

* Bump submodule

* Revert "Bump submodule"

This reverts commit mono/mono@b47679b.

* Bump submodule

* Modify csi-test.csx to manually reference netstandard 2.0, because this is required for some reason

* Checkpoint: Test modifying csi.rsp instead of csi-test

* Git

* Update submodule

* Update submodule compiler path

* Remove binaries-new submodule

* Update to latest roslyn-binaries revision and update path in configure.ac


Commit migrated from mono/mono@e9d847d
  • Loading branch information
kg authored and marek-safar committed Mar 27, 2019
1 parent 4d4c40c commit 93b7776
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/mono/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5787,7 +5787,8 @@ fi
AC_SUBST(mono_runtime)
AC_SUBST(mono_runtime_wrapper)

CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.1.0/csc.exe
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.1.0/VBCSCompiler.exe

if test $csc_compiler = mcs; then
CSC=$mcs_topdir/class/lib/build/mcs.exe
Expand All @@ -5803,6 +5804,7 @@ if test x$host_win32 = xyes; then
mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
CSC=`cygpath -m -a $CSC`
CSC_LOCATION=`cygpath -m -a $CSC_LOCATION`
VBCS_LOCATION=`cygpath -m -a $VBCS_LOCATION`
else
mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc
fi
Expand Down Expand Up @@ -6540,7 +6542,7 @@ fi

echo "STANDALONE_CSC_LOCATION=$CSC_LOCATION" >> $srcdir/$mcsdir/build/config.make
echo "SERVER_CSC_LOCATION?=$CSC_LOCATION" >> $srcdir/$mcsdir/build/config.make
echo "VBCS_LOCATION?=" >> $srcdir/$mcsdir/build/config.make
echo "VBCS_LOCATION?=$VBCS_LOCATION" >> $srcdir/$mcsdir/build/config.make

if test $csc_compiler = mcs; then
echo "MCS_MODE = 1" >> $srcdir/$mcsdir/build/config.make
Expand Down

0 comments on commit 93b7776

Please sign in to comment.