diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1f95b27bf6..278f2d7185 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,10 +3,10 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "4.2.0", + "version": "5.0.0", "commands": [ "dotnet-cake" ] } } -} \ No newline at end of file +} diff --git a/Directory.Packages.props b/Directory.Packages.props index 59dc55d56e..511313776d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ 17.14.0-preview-25107-01 17.3.2 6.15.0-preview.1.86 - 5.0.0-2.25404.8 + 5.1.0-1.25475.3 2.8.1 diff --git a/NuGet.Config b/NuGet.Config index 5dc24a67d1..c46eb65533 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,13 +2,13 @@ - + - + diff --git a/scripts/common.cake b/scripts/common.cake index b8053854a4..76b5f1393f 100644 --- a/scripts/common.cake +++ b/scripts/common.cake @@ -1,5 +1,5 @@ #addin "nuget:?package=Newtonsoft.Json&version=11.0.2" -#tool "nuget:?package=GitVersion.CommandLine&prerelease&version=5.0.1" +#tool "nuget:?package=GitVersion.Tool&version=5.12.0" #load "platform.cake" @@ -200,7 +200,7 @@ public class BuildEnvironment this.ShellCommand = Platform.Current.IsWindows ? "powershell" : "bash"; this.ShellArgument = Platform.Current.IsWindows ? "-NoProfile -ExecutionPolicy Bypass /Command" : "-C"; this.ShellScriptFileExtension = Platform.Current.IsWindows ? "ps1" : "sh"; - this.MonoRuntimes = new [] + this.MonoRuntimes = new[] { new MonoRuntime("osx", "mono"), new MonoRuntime("linux-x86", "mono"), @@ -211,7 +211,7 @@ public class BuildEnvironment if (Platform.Current.IsMacOS) { this.CurrentMonoRuntime = this.MonoRuntimes[0]; - this.BuildMonoRuntimes = new [] { this.CurrentMonoRuntime }; + this.BuildMonoRuntimes = new[] { this.CurrentMonoRuntime }; } else if (Platform.Current.IsLinux) { diff --git a/src/OmniSharp.Abstractions/Configuration.cs b/src/OmniSharp.Abstractions/Configuration.cs index 9b93160dce..d8e81d468a 100644 --- a/src/OmniSharp.Abstractions/Configuration.cs +++ b/src/OmniSharp.Abstractions/Configuration.cs @@ -4,7 +4,7 @@ internal static class Configuration { public static bool ZeroBasedIndices = false; - public const string RoslynVersion = "5.0.0.0"; + public const string RoslynVersion = "5.1.0.0"; public const string RoslynPublicKeyToken = "31bf3856ad364e35"; public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features"); diff --git a/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs b/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs index 92fd268ed6..83fa2ad3f3 100644 --- a/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs +++ b/tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs @@ -17,7 +17,7 @@ public void DefaultLanguageVersionShouldBeLatest() var scriptProjectProvider = new ScriptProjectProvider(new ScriptOptions(), new OmniSharpEnvironment(), new LoggerFactory(), true, false); var scriptProjectInfo = scriptProjectProvider.CreateProject("test.csx", Enumerable.Empty(), Path.GetTempPath(), typeof(CommandLineScriptGlobals)); Assert.Equal(LanguageVersion.Latest, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).SpecifiedLanguageVersion); - Assert.Equal(LanguageVersion.CSharp13, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).LanguageVersion); + Assert.Equal(LanguageVersion.CSharp14, ((CSharpParseOptions)scriptProjectInfo.ParseOptions).LanguageVersion); } } }