Merge pull request #1629 from filipw/feature/mono

raise minimum Mono version to 6.4.0
OmniSharp · Oct 10, 2019 · ae687ff · ae687ff
2 parents 1027f85 + f45056b
commit ae687ff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.json b/build.json
@@ -2,7 +2,7 @@
   "DotNetInstallScriptURL": "https://dot.net/v1",
   "DotNetChannel": "preview",
   "DotNetVersion": "2.1.505",
-  "RequiredMonoVersion": "6.0.0",
+  "RequiredMonoVersion": "6.4.0",
   "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
   "MonoRuntimeMacOS": "mono.macOS-5.18.1.0.zip",
   "MonoRuntimeLinux32": "mono.linux-x86-5.18.1.0.zip",

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/MonoInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/MonoInstanceProvider.cs
@@ -69,9 +69,9 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                 return NoInstances;
             }
 
-            if (monoVersion < new Version("5.18.1"))
+            if (monoVersion < new Version("6.4.0"))
             {
-                Logger.LogDebug($"Found Mono MSBuild but it could not be used because it is version {monoVersion} and in needs to be >= 5.18.1");
+                Logger.LogDebug($"Found Mono MSBuild but it could not be used because it is version {monoVersion} and in needs to be >= 6.4.0");
                 return NoInstances;
             }
 
@@ -91,7 +91,7 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
 
                 if (Platform.Current.OperatingSystem == Utilities.OperatingSystem.Linux)
                 {
-                    Logger.LogWarning(@"It looks like you have Mono 5.2.0 or greater installed but MSBuild could not be found.
+                    Logger.LogWarning(@"It looks like you have Mono 6.4.0 or greater installed but MSBuild could not be found.
 Try installing MSBuild into Mono (e.g. 'sudo apt-get install msbuild') to enable better MSBuild support.");
                 }
 
@@ -112,7 +112,7 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                 new MSBuildInstance(
                     nameof(DiscoveryType.Mono),
                     toolsPath,
-                    new Version(16, 0),
+                    new Version(16, 3),
                     DiscoveryType.Mono,
                     propertyOverrides.ToImmutable()));
         }

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/StandAloneInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/StandAloneInstanceProvider.cs
@@ -65,7 +65,7 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
                 new MSBuildInstance(
                     nameof(DiscoveryType.StandAlone),
                     toolsPath,
-                    new Version(16, 0), // we now ship with embedded MsBuild 16.x
+                    new Version(16, 3), // we now ship with embedded MsBuild 16.3
                     DiscoveryType.StandAlone,
                     propertyOverrides.ToImmutable(),
                     setMSBuildExePathVariable: true));

diff --git a/tests/OmniSharp.MSBuild.Tests/MSBuildSelectionTests.cs b/tests/OmniSharp.MSBuild.Tests/MSBuildSelectionTests.cs
@@ -187,7 +187,7 @@ private static MSBuildInstance GetStandAloneMSBuildInstance()
             return new MSBuildInstance(
                 "Stand Alone :(",
                 TestIO.GetRandomTempFolderPath(),
-                Version.Parse("16.0.0.0"),
+                Version.Parse("16.3.0.0"),
                 DiscoveryType.StandAlone
             );
         }