Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "4.2.0",
"version": "5.0.0",
"commands": [
"dotnet-cake"
]
}
}
}
}
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<MicrosoftTestPackageVersion>17.14.0-preview-25107-01</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
<NuGetPackageVersion>6.15.0-preview.1.86</NuGetPackageVersion>
<RoslynPackageVersion>5.0.0-2.25404.8</RoslynPackageVersion>
<RoslynPackageVersion>5.1.0-1.25475.3</RoslynPackageVersion>
<XunitPackageVersion>2.8.1</XunitPackageVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had changed this briefly to see if it would unblock dependabot for this repo but unfortunately it did not and also doesn't have all the necessary packages.

<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<clear />
<packageSource key="dotnet-public">
<packageSource key="NuGet">
<package pattern="Antlr4.*" />
<package pattern="BenchmarkDotNet" />
<package pattern="BenchmarkDotNet.*" />
Expand Down
6 changes: 3 additions & 3 deletions scripts/common.cake
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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"),
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OmniSharp.Abstractions/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Script.Tests/ScriptProjectProviderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<MetadataReference>(), 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);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay new C# version

}
}
}
Loading