From 57a79b9389f8178f954e5c52d42f71005909028d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Bj=C3=B6rkstr=C3=B6m?= Date: Thu, 6 Oct 2022 08:27:05 +0300 Subject: [PATCH 1/3] Update .NET 7 to RC1 --- .github/workflows/build.yml | 2 +- .github/workflows/tests-net6.yml | 2 +- .github/workflows/tests.yml | 2 +- .pipelines/init.yml | 2 +- build.json | 2 +- global.json | 2 +- test-assets/test-projects/Net70Project/global.json | 2 +- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 2 +- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- tests/OmniSharp.Tests/DotNetVersionFacts.cs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7aafc31938..1d7a3de617 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: 'Build' env: - DotNetVersion: "7.0.100-preview.7.22377.5" + DotNetVersion: "7.0.100-rc.1.22431.12" DotNetVersion2: "3.1.422" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml index e1ec3622fe..612d239a11 100644 --- a/.github/workflows/tests-net6.yml +++ b/.github/workflows/tests-net6.yml @@ -1,7 +1,7 @@ name: 'Tests net6.0' env: - DotNetVersion: "7.0.100-preview.7.22377.5" + DotNetVersion: "7.0.100-rc.1.22431.12" DotNetVersion2: "3.1.422" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fbfab364f6..f4a2e84156 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,7 @@ name: 'Tests' env: - DotNetVersion: "7.0.100-preview.7.22377.5" + DotNetVersion: "7.0.100-rc.1.22431.12" DotNetVersion2: "3.1.422" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.pipelines/init.yml b/.pipelines/init.yml index db4c409018..92467e6080 100644 --- a/.pipelines/init.yml +++ b/.pipelines/init.yml @@ -1,7 +1,7 @@ parameters: # Configuration: Release Verbosity: Normal - DotNetVersion: "7.0.100-preview.7.22377.5" + DotNetVersion: "7.0.100-rc.1.22431.12" DotNetVersion2: "3.1.422" CakeVersion: "1.1.0" NuGetVersion: "5.7.0" diff --git a/build.json b/build.json index 405c884714..7682f7d25b 100644 --- a/build.json +++ b/build.json @@ -4,7 +4,7 @@ "DotNetVersions": [ "3.1.422", "6.0.400", - "7.0.100-preview.7.22377.5" + "7.0.100-rc.1.22431.12" ], "RequiredMonoVersion": "6.6.0", "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext", diff --git a/global.json b/global.json index 265a3a1de0..0e4bf1e91e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.100-preview.7.22377.5", + "version": "7.0.100-rc.1.22431.12", "rollForward": "patch" } } diff --git a/test-assets/test-projects/Net70Project/global.json b/test-assets/test-projects/Net70Project/global.json index 56187be55a..5ea7808c65 100644 --- a/test-assets/test-projects/Net70Project/global.json +++ b/test-assets/test-projects/Net70Project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-preview.7.22377.5" + "version": "7.0.100-rc.1.22431.12" } } diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 38335946b9..7e291476c3 100644 --- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs +++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs @@ -242,7 +242,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.100-preview.7.22377.5"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("7.0.100-rc.1.22431.12"), emitter.ReceivedMessages[0].SdkVersion); } private string GetHashedFileExtension(string fileExtension) diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs index 692690fd73..fb781dc538 100644 --- a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs +++ b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs @@ -7,7 +7,7 @@ namespace OmniSharp.Tests { public class DotNetCliServiceFacts : AbstractTestFixture { - private const string DotNetVersion = "7.0.100-preview.7.22377.5"; + private const string DotNetVersion = "7.0.100-rc.1.22431.12"; private int Major { get; } private int Minor { get; } private int Patch { get; } diff --git a/tests/OmniSharp.Tests/DotNetVersionFacts.cs b/tests/OmniSharp.Tests/DotNetVersionFacts.cs index 76cbd041fd..a4b42af028 100644 --- a/tests/OmniSharp.Tests/DotNetVersionFacts.cs +++ b/tests/OmniSharp.Tests/DotNetVersionFacts.cs @@ -46,7 +46,7 @@ public void ParseErrorMessage() "6.0.105 [/usr/local/share/dotnet/sdk]", "6.0.202 [/usr/local/share/dotnet/sdk]", "6.0.400 [/usr/local/share/dotnet/sdk]", - "7.0.100-preview.7.22377.5 [/usr/local/share/dotnet/sdk]", + "7.0.100-rc.1.22431.12 [/usr/local/share/dotnet/sdk]", "", $"Install the [{RequestedSdkVersion}] .NET SDK or update [{GlobalJsonFile}] to match an installed SDK.", "", From 4571a7da140dc4b377f7f53cf2feb5433d23126d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Bj=C3=B6rkstr=C3=B6m?= Date: Thu, 6 Oct 2022 08:36:31 +0300 Subject: [PATCH 2/3] Update Roslyn to 4.4.0-3.22429.3 --- build/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Packages.props b/build/Packages.props index c7823fd4ce..fe097dda96 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -6,7 +6,7 @@ 17.3.0 17.3.1 6.3.0-rc.128 - 4.4.0-1.22369.1 + 4.4.0-3.22429.3 2.4.1 From 041a67deaa13d282b651362b352e04b8fd376300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Bj=C3=B6rkstr=C3=B6m?= Date: Thu, 6 Oct 2022 09:42:19 +0300 Subject: [PATCH 3/3] Update NuGet versions --- build/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Packages.props b/build/Packages.props index fe097dda96..4fe1d60d5f 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -5,7 +5,7 @@ 6.0.0 17.3.0 17.3.1 - 6.3.0-rc.128 + 6.4.0-preview.1.53 4.4.0-3.22429.3 2.4.1