From a2af810a2b1eaea5a339c1e0b852c606dbf7b18c Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 26 Jul 2021 13:22:52 -0700 Subject: [PATCH] Update to latest .NET SDKs --- .github/workflows/build.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- .pipelines/init.yml | 4 ++-- azure-pipelines.yml | 4 ++-- build.json | 8 ++++---- global.json | 4 ++-- test-assets/test-projects/ExternAlias/global.json | 4 ++-- test-assets/test-projects/Net50Project/global.json | 4 ++-- test-assets/test-projects/Net60Project/global.json | 2 +- test-assets/test-projects/NetCore31Project/global.json | 2 +- test-assets/test-projects/global.json | 4 ++-- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 8 ++++---- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4991170fa7..befc9f204f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,8 @@ name: 'Build' env: - DotNetVersion: "5.0.300" - DotNetVersion2: "3.1.409" + DotNetVersion: "5.0.302" + DotNetVersion2: "3.1.411" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" Artifacts: ${{ github.workspace }}/artifacts/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 44635540bf..1611b14279 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,8 +1,8 @@ name: 'Tests' env: - DotNetVersion: "5.0.300" - DotNetVersion2: "3.1.409" + DotNetVersion: "5.0.302" + DotNetVersion2: "3.1.411" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" Artifacts: ${{ github.workspace }}/artifacts/ diff --git a/.pipelines/init.yml b/.pipelines/init.yml index 8dd89bf7a8..e6a343884b 100644 --- a/.pipelines/init.yml +++ b/.pipelines/init.yml @@ -1,8 +1,8 @@ parameters: # Configuration: Release Verbosity: Normal - DotNetVersion: "5.0.300" - DotNetVersion2: "3.1.409" + DotNetVersion: "5.0.302" + DotNetVersion2: "3.1.411" CakeVersion: "1.0.0-rc0001" NuGetVersion: "5.7.0" MonoVersion: '' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e9afdf6db4..8619bdbe59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,8 +29,8 @@ resources: variables: Verbosity: Diagnostic - DotNetVersion: "5.0.300" - DotNetVersion2: "3.1.409" + DotNetVersion: "5.0.302" + DotNetVersion2: "3.1.411" CakeVersion: "1.0.0-rc0001" NuGetVersion: "5.7.0" GitVersionVersion: "5.0.1" diff --git a/build.json b/build.json index 633b5dd7f0..827d7bb1e9 100644 --- a/build.json +++ b/build.json @@ -3,9 +3,9 @@ "DotNetChannel": "Preview", "DotNetVersions": [ "2.1.816", - "3.1.409", - "5.0.300", - "6.0.100-preview.4.21255.9" + "3.1.411", + "5.0.302", + "6.0.100-preview.6.21355.2" ], "RequiredMonoVersion": "6.6.0", "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext", @@ -61,4 +61,4 @@ "RestoreOnlyTestAssets": [ "ProjectWithMissingType" ] -} \ No newline at end of file +} diff --git a/global.json b/global.json index 20b12c66ad..fd22cb36bf 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.300" + "version": "5.0.302" } -} \ No newline at end of file +} diff --git a/test-assets/test-projects/ExternAlias/global.json b/test-assets/test-projects/ExternAlias/global.json index 20b12c66ad..fd22cb36bf 100644 --- a/test-assets/test-projects/ExternAlias/global.json +++ b/test-assets/test-projects/ExternAlias/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.300" + "version": "5.0.302" } -} \ No newline at end of file +} diff --git a/test-assets/test-projects/Net50Project/global.json b/test-assets/test-projects/Net50Project/global.json index 20b12c66ad..fd22cb36bf 100644 --- a/test-assets/test-projects/Net50Project/global.json +++ b/test-assets/test-projects/Net50Project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.300" + "version": "5.0.302" } -} \ No newline at end of file +} diff --git a/test-assets/test-projects/Net60Project/global.json b/test-assets/test-projects/Net60Project/global.json index 21f19c6675..6e4244eadb 100644 --- a/test-assets/test-projects/Net60Project/global.json +++ b/test-assets/test-projects/Net60Project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9" + "version": "6.0.100-preview.6.21355.2" } } diff --git a/test-assets/test-projects/NetCore31Project/global.json b/test-assets/test-projects/NetCore31Project/global.json index e1f41b8802..844f9e2f0f 100644 --- a/test-assets/test-projects/NetCore31Project/global.json +++ b/test-assets/test-projects/NetCore31Project/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.409" + "version": "3.1.411" } } diff --git a/test-assets/test-projects/global.json b/test-assets/test-projects/global.json index 48f7edbb01..844f9e2f0f 100644 --- a/test-assets/test-projects/global.json +++ b/test-assets/test-projects/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.409" + "version": "3.1.411" } -} \ No newline at end of file +} diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 2060279e6a..63e0eea8b1 100644 --- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs +++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs @@ -209,7 +209,7 @@ public async Task The_correct_sdk_version_is_emitted_NETCore3_1() using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore31Project"); using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)); Assert.Single(emitter.ReceivedMessages); - Assert.Equal(GetHashedFileExtension("3.1.409"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("3.1.411"), emitter.ReceivedMessages[0].SdkVersion); } [Fact] @@ -221,7 +221,7 @@ public async Task The_correct_sdk_version_is_emitted_NET5() using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net50Project"); using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)); Assert.Equal(2, emitter.ReceivedMessages.Length); - Assert.Equal(GetHashedFileExtension("5.0.300"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("5.0.302"), emitter.ReceivedMessages[0].SdkVersion); } [Fact] @@ -233,7 +233,7 @@ public async Task The_correct_sdk_version_is_emitted_NET6() using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net60Project"); using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory)); Assert.Single(emitter.ReceivedMessages); - Assert.Equal(GetHashedFileExtension("6.0.100-preview.4.21255.9"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("6.0.100-preview.6.21355.2"), emitter.ReceivedMessages[0].SdkVersion); } private string GetHashedFileExtension(string fileExtension) @@ -245,4 +245,4 @@ private string GetHashedReference(string reference) return _referenceHashingAlgorithm.HashInput(reference).Value; } } -} +} diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs index 5e63dcf670..651cc159d3 100644 --- a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs +++ b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs @@ -8,7 +8,7 @@ namespace OmniSharp.Tests { public class DotNetCliServiceFacts : AbstractTestFixture { - private const string DotNetVersion = "5.0.300"; + private const string DotNetVersion = "5.0.302"; private int Major { get; } private int Minor { get; } private int Patch { get; }