diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| m--------- | external/roslyn-binaries | 0 | ||||
| -rw-r--r-- | mcs/packages/Makefile | 1 | ||||
| -rw-r--r-- | packaging/MacSDK/msbuild.py | 2 | ||||
| -rw-r--r-- | packaging/MacSDK/nuget.py | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 9e7be97ce6b..339bedc5d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -6065,8 +6065,8 @@ fi AC_SUBST(mono_runtime) AC_SUBST(mono_runtime_wrapper) -CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/csc.exe -VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.4.0/VBCSCompiler.exe +CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/csc.exe +VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/VBCSCompiler.exe if test $csc_compiler = mcs; then CSC=$mcs_topdir/class/lib/build/mcs.exe diff --git a/external/roslyn-binaries b/external/roslyn-binaries -Subproject 419b2452de8d0d4bb8eaeaacaf71479c2bf4749 +Subproject 27c352d6edab16db939423b54683a75fcdae30a diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index c1e6d367090..342cdc62df8 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -30,7 +30,6 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \ $(ROSLYN_CSC_DIR)/Microsoft.Build.Tasks.CodeAnalysis.dll \ $(ROSLYN_CSC_DIR)/Microsoft.CSharp.Core.targets \ $(ROSLYN_CSC_DIR)/Microsoft.Managed.Core.targets \ - $(ROSLYN_CSC_DIR)/Microsoft.Managed.EditorConfig.targets \ $(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx diff --git a/packaging/MacSDK/msbuild.py b/packaging/MacSDK/msbuild.py index eea11546f57..ebb660acbef 100644 --- a/packaging/MacSDK/msbuild.py +++ b/packaging/MacSDK/msbuild.py @@ -3,7 +3,7 @@ import fileinput class MSBuild (GitHubPackage): def __init__ (self): GitHubPackage.__init__ (self, 'mono', 'msbuild', '15', # note: fix scripts/ci/run-test-mac-sdk.sh when bumping the version number - revision = '00c938dad6a1562f54ef2e4887d29a517522cfdd') + revision = '46823e117f5d4b2fead50d2691709820e9e43e13') def build (self): try: diff --git a/packaging/MacSDK/nuget.py b/packaging/MacSDK/nuget.py index fa766cf5415..4b2bcc748bc 100644 --- a/packaging/MacSDK/nuget.py +++ b/packaging/MacSDK/nuget.py @@ -4,7 +4,7 @@ import fileinput class NuGetBinary (Package): def __init__(self): - Package.__init__(self, name='NuGet', version='5.4.0', sources=[ + Package.__init__(self, name='NuGet', version='5.5.0-preview1', sources=[ 'https://dist.nuget.org/win-x86-commandline/v%{version}/nuget.exe']) def build(self): |