Skip to content

Commit

Permalink
Merge pull request #2621 from OmniSharp/update-sdks-2
Browse files Browse the repository at this point in the history
Update .NET SDKs
  • Loading branch information
JoeRobich authored Jul 26, 2024
2 parents 3b721df + 1c0ccbd commit 915163d
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

name: 'Build'
env:
DotNetVersion: "9.0.100-preview.1.24101.2"
DotNetVersion2: "8.0.201"
DotNetVersion3: "7.0.406"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-net6.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

name: 'Tests net6.0'
env:
DotNetVersion: "9.0.100-preview.1.24101.2"
DotNetVersion2: "8.0.201"
DotNetVersion3: "7.0.406"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

name: 'Tests'
env:
DotNetVersion: "9.0.100-preview.1.24101.2"
DotNetVersion2: "8.0.201"
DotNetVersion3: "7.0.406"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Expand Down
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# Changelog
All changes to the project will be documented in this file.

## [1.39.12] - Not Released
* Update SDKs and Roslyn ([#2603](https://github.com/OmniSharp/omnisharp-roslyn/pull/2603))
## [1.39.12] - 2024-07-26
* Update .NET SDKs (PR: [#2621](https://github.com/OmniSharp/omnisharp-roslyn/pull/2621))
* Update Roslyn to 4.12.0-1.24358.3 (PR: [#2619](https://github.com/OmniSharp/omnisharp-roslyn/pull/2619))
* Fix code fix construction (PR: [#2620](https://github.com/OmniSharp/omnisharp-roslyn/pull/2620))
* Remove NuGet.Packaging.Core, as it's an assembly that only contains forwarders (PR: [#2610](https://github.com/OmniSharp/omnisharp-roslyn/pull/2610))
* Fix inlay hints lambdas parameter type null reference exception (PR: [#2604](https://github.com/OmniSharp/omnisharp-roslyn/pull/2604))
* Update SDKs and Roslyn (PR: [#2603](https://github.com/OmniSharp/omnisharp-roslyn/pull/2603))
* Pass project path when performing a restore (PR: [#2593](https://github.com/OmniSharp/omnisharp-roslyn/pull/2593))

## [1.39.11] - 2023-12-19
* Update changelog (PR: [#2591](https://github.com/OmniSharp/omnisharp-roslyn/pull/2591))
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resources:

variables:
Verbosity: Diagnostic
DotNetVersion: "8.0.201"
DotNetVersion: "8.0.303"
CakeVersion: "3.0.0"
NuGetVersion: "6.5.0"
GitVersionVersion: "5.0.1"
Expand Down
6 changes: 3 additions & 3 deletions build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"DotNetChannel": "Preview",
"DotNetVersions": [
"6.0.203",
"7.0.406",
"8.0.201",
"9.0.100-preview.1.24101.2"
"7.0.410",
"8.0.303",
"9.0.100-preview.6.24328.19"
],
"RequiredMonoVersion": "6.6.0",
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.201",
"version": "8.0.303",
"rollForward": "latestMinor"
}
}
4 changes: 2 additions & 2 deletions test-assets/test-projects/Net70Project/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.406"
"version": "7.0.410"
}
}
}
2 changes: 1 addition & 1 deletion test-assets/test-projects/Net80Project/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.201"
"version": "8.0.303"
}
}
2 changes: 1 addition & 1 deletion test-assets/test-projects/Net90Project/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-preview.1.24101.2"
"version": "9.0.100-preview.6.24328.19"
}
}
6 changes: 3 additions & 3 deletions tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public async Task The_correct_sdk_version_is_emitted_NET7()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net70Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("7.0.406"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("7.0.410"), emitter.ReceivedMessages[0].SdkVersion);
}

[ConditionalFact(typeof(DotnetRuntimeOnly))]
Expand All @@ -243,7 +243,7 @@ public async Task The_correct_sdk_version_is_emitted_NET8()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net80Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("8.0.201"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("8.0.303"), emitter.ReceivedMessages[0].SdkVersion);
}

[ConditionalFact(typeof(DotnetRuntimeOnly))]
Expand All @@ -255,7 +255,7 @@ public async Task The_correct_sdk_version_is_emitted_NET9()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net90Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("9.0.100-preview.1.24101.2"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("9.0.100-preview.6.24328.19"), emitter.ReceivedMessages[0].SdkVersion);
}

private string GetHashedFileExtension(string fileExtension)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public async Task DisplayFormatForMethodSymbol_Invocation()
var response = await GetTypeLookUpResponse(line: 6, column: 35);

#if NETCOREAPP
Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 17 overloads)\n```", response.Markdown);
Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 18 overloads)\n```", response.Markdown);
#else
Assert.Equal("```csharp\nvoid Console.WriteLine(string value) (+ 18 overloads)\n```", response.Markdown);
#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Tests/DotNetCliServiceFacts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace OmniSharp.Tests
{
public class DotNetCliServiceFacts : AbstractTestFixture
{
private const string DotNetVersion = "8.0.201";
private const string DotNetVersion = "8.0.303";
private int Major { get; }
private int Minor { get; }
private int Patch { get; }
Expand Down

0 comments on commit 915163d

Please sign in to comment.