Skip to content

Commit 915163d

Browse files
JoeRobichJoeRobich
authored
Merge pull request #2621 from OmniSharp/update-sdks-2
Update .NET SDKs
2 parents 3b721df + 1c0ccbd commit 915163d

File tree

13 files changed

+31
-25
lines changed

13 files changed

+31
-25
lines changed

‎.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
name: 'Build'
33
env:
4-
DotNetVersion: "9.0.100-preview.1.24101.2"
5-
DotNetVersion2: "8.0.201"
6-
DotNetVersion3: "7.0.406"
4+
DotNetVersion: "9.0.100-preview.6.24328.19"
5+
DotNetVersion2: "8.0.303"
6+
DotNetVersion3: "7.0.410"
77
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
88
NuGetVersion: "6.5.0"
99
MonoVersion: "6.12.0"

‎.github/workflows/tests-net6.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
name: 'Tests net6.0'
33
env:
4-
DotNetVersion: "9.0.100-preview.1.24101.2"
5-
DotNetVersion2: "8.0.201"
6-
DotNetVersion3: "7.0.406"
4+
DotNetVersion: "9.0.100-preview.6.24328.19"
5+
DotNetVersion2: "8.0.303"
6+
DotNetVersion3: "7.0.410"
77
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
88
NuGetVersion: "6.5.0"
99
MonoVersion: "6.12.0"

‎.github/workflows/tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
name: 'Tests'
33
env:
4-
DotNetVersion: "9.0.100-preview.1.24101.2"
5-
DotNetVersion2: "8.0.201"
6-
DotNetVersion3: "7.0.406"
4+
DotNetVersion: "9.0.100-preview.6.24328.19"
5+
DotNetVersion2: "8.0.303"
6+
DotNetVersion3: "7.0.410"
77
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
88
NuGetVersion: "6.5.0"
99
MonoVersion: "6.12.0"

‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Changelog
22
All changes to the project will be documented in this file.
33

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

713
## [1.39.11] - 2023-12-19
814
* Update changelog (PR: [#2591](https://github.com/OmniSharp/omnisharp-roslyn/pull/2591))

‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resources:
3232

3333
variables:
3434
Verbosity: Diagnostic
35-
DotNetVersion: "8.0.201"
35+
DotNetVersion: "8.0.303"
3636
CakeVersion: "3.0.0"
3737
NuGetVersion: "6.5.0"
3838
GitVersionVersion: "5.0.1"

‎build.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"DotNetChannel": "Preview",
44
"DotNetVersions": [
55
"6.0.203",
6-
"7.0.406",
7-
"8.0.201",
8-
"9.0.100-preview.1.24101.2"
6+
"7.0.410",
7+
"8.0.303",
8+
"9.0.100-preview.6.24328.19"
99
],
1010
"RequiredMonoVersion": "6.6.0",
1111
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.201",
3+
"version": "8.0.303",
44
"rollForward": "latestMinor"
55
}
66
}

‎test-assets/test-projects/Net70Project/global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.406"
3+
"version": "7.0.410"
44
}
5-
}
5+
}

‎test-assets/test-projects/Net80Project/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.201"
3+
"version": "8.0.303"
44
}
55
}

‎test-assets/test-projects/Net90Project/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.1.24101.2"
3+
"version": "9.0.100-preview.6.24328.19"
44
}
55
}

‎tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public async Task The_correct_sdk_version_is_emitted_NET7()
231231
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net70Project");
232232
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
233233
Assert.Single(emitter.ReceivedMessages);
234-
Assert.Equal(GetHashedFileExtension("7.0.406"), emitter.ReceivedMessages[0].SdkVersion);
234+
Assert.Equal(GetHashedFileExtension("7.0.410"), emitter.ReceivedMessages[0].SdkVersion);
235235
}
236236

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

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

261261
private string GetHashedFileExtension(string fileExtension)

‎tests/OmniSharp.Roslyn.CSharp.Tests/QuickInfoProviderFacts.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public async Task DisplayFormatForMethodSymbol_Invocation()
196196
var response = await GetTypeLookUpResponse(line: 6, column: 35);
197197

198198
#if NETCOREAPP
199-
Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 17 overloads)\n```", response.Markdown);
199+
Assert.Equal("```csharp\nvoid Console.WriteLine(string? value) (+ 18 overloads)\n```", response.Markdown);
200200
#else
201201
Assert.Equal("```csharp\nvoid Console.WriteLine(string value) (+ 18 overloads)\n```", response.Markdown);
202202
#endif

‎tests/OmniSharp.Tests/DotNetCliServiceFacts.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace OmniSharp.Tests
77
{
88
public class DotNetCliServiceFacts : AbstractTestFixture
99
{
10-
private const string DotNetVersion = "8.0.201";
10+
private const string DotNetVersion = "8.0.303";
1111
private int Major { get; }
1212
private int Minor { get; }
1313
private int Patch { get; }

0 commit comments

Comments
 (0)