From 62216dbe1ea9318a47deba14c97c798b9aca21fd Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 9 Nov 2021 13:36:03 +0100 Subject: [PATCH 1/4] user 6.0.100 SDK --- build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.json b/build.json index 49cd601bba..f2926aa0a6 100644 --- a/build.json +++ b/build.json @@ -4,7 +4,7 @@ "DotNetVersions": [ "3.1.414", "5.0.402", - "6.0.100-rc.2.21505.57" + "6.0.100" ], "RequiredMonoVersion": "6.6.0", "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext", From 3e5ec313c82121197368b9835784b00c25f17a20 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 9 Nov 2021 13:36:15 +0100 Subject: [PATCH 2/4] use 6.0.100 SDK --- global.json | 2 +- test-assets/test-projects/Net60Project/global.json | 2 +- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index c82440361c..fe0b480a06 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.402" + "version": "6.0.100" } } diff --git a/test-assets/test-projects/Net60Project/global.json b/test-assets/test-projects/Net60Project/global.json index a3651b9e05..fe0b480a06 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-rc.2.21505.57" + "version": "6.0.100" } } diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index e6694f032b..6dd4714fb8 100644 --- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs +++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs @@ -221,7 +221,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-rc.2.21505.57"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("6.0.100"), emitter.ReceivedMessages[0].SdkVersion); } private string GetHashedFileExtension(string fileExtension) From f5a96f4c51ef3ff2dab545b546bd912dc8cce921 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 9 Nov 2021 13:38:57 +0100 Subject: [PATCH 3/4] use 5.0.403 SDK and install 6.0.100 everywhere --- .github/workflows/build.yml | 2 +- .github/workflows/tests.yml | 2 +- .pipelines/init.yml | 2 +- azure-pipelines.yml | 2 +- build.json | 2 +- test-assets/test-projects/ExternAlias/global.json | 2 +- test-assets/test-projects/Net50Project/global.json | 2 +- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 2 +- tests/OmniSharp.Tests/DotNetCliServiceFacts.cs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 306919174b..f4a69799b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: 'Build' env: - DotNetVersion: "5.0.402" + DotNetVersion: "6.0.100" DotNetVersion2: "3.1.414" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 32f697aa9f..79f5a2d1ad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,7 @@ name: 'Tests' env: - DotNetVersion: "5.0.402" + DotNetVersion: "6.0.100" DotNetVersion2: "3.1.414" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" diff --git a/.pipelines/init.yml b/.pipelines/init.yml index f181cabd2d..7fe584fae7 100644 --- a/.pipelines/init.yml +++ b/.pipelines/init.yml @@ -1,7 +1,7 @@ parameters: # Configuration: Release Verbosity: Normal - DotNetVersion: "5.0.402" + DotNetVersion: "6.0.100" DotNetVersion2: "3.1.414" CakeVersion: "1.1.0" NuGetVersion: "5.7.0" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e15189a6e..e8c861fda0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,7 +29,7 @@ resources: variables: Verbosity: Diagnostic - DotNetVersion: "5.0.402" + DotNetVersion: "6.0.100" DotNetVersion2: "3.1.414" CakeVersion: "1.1.0" NuGetVersion: "5.7.0" diff --git a/build.json b/build.json index f2926aa0a6..1f63ddd004 100644 --- a/build.json +++ b/build.json @@ -3,7 +3,7 @@ "DotNetChannel": "Preview", "DotNetVersions": [ "3.1.414", - "5.0.402", + "5.0.403", "6.0.100" ], "RequiredMonoVersion": "6.6.0", diff --git a/test-assets/test-projects/ExternAlias/global.json b/test-assets/test-projects/ExternAlias/global.json index c82440361c..d131a2620b 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.402" + "version": "5.0.403" } } diff --git a/test-assets/test-projects/Net50Project/global.json b/test-assets/test-projects/Net50Project/global.json index c82440361c..d131a2620b 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.402" + "version": "5.0.403" } } diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 6dd4714fb8..967041084c 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_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.402"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("5.0.403"), emitter.ReceivedMessages[0].SdkVersion); } [Fact] diff --git a/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs b/tests/OmniSharp.Tests/DotNetCliServiceFacts.cs index 80eee67299..c774598095 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.402"; + private const string DotNetVersion = "6.0.100"; private int Major { get; } private int Minor { get; } private int Patch { get; } From 6b862d002df785c8acd78ba70252be3aef785115 Mon Sep 17 00:00:00 2001 From: filipw Date: Tue, 9 Nov 2021 13:39:44 +0100 Subject: [PATCH 4/4] use 3.1.415 SDK --- .github/workflows/build.yml | 2 +- .github/workflows/tests.yml | 2 +- .pipelines/init.yml | 2 +- azure-pipelines.yml | 2 +- build.json | 2 +- test-assets/test-projects/NetCore31Project/global.json | 2 +- test-assets/test-projects/global.json | 2 +- tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4a69799b2..97ae687416 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: 'Build' env: DotNetVersion: "6.0.100" - DotNetVersion2: "3.1.414" + DotNetVersion2: "3.1.415" 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 79f5a2d1ad..b0e77add3b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,7 +2,7 @@ name: 'Tests' env: DotNetVersion: "6.0.100" - DotNetVersion2: "3.1.414" + DotNetVersion2: "3.1.415" NuGetVersion: "5.7.0" MonoVersion: "6.12.0" Artifacts: ${{ github.workspace }}/artifacts/ diff --git a/.pipelines/init.yml b/.pipelines/init.yml index 7fe584fae7..0c8edae61e 100644 --- a/.pipelines/init.yml +++ b/.pipelines/init.yml @@ -2,7 +2,7 @@ parameters: # Configuration: Release Verbosity: Normal DotNetVersion: "6.0.100" - DotNetVersion2: "3.1.414" + DotNetVersion2: "3.1.415" CakeVersion: "1.1.0" NuGetVersion: "5.7.0" MonoVersion: '' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e8c861fda0..f4f1dfff93 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,7 +30,7 @@ resources: variables: Verbosity: Diagnostic DotNetVersion: "6.0.100" - DotNetVersion2: "3.1.414" + DotNetVersion2: "3.1.415" CakeVersion: "1.1.0" NuGetVersion: "5.7.0" GitVersionVersion: "5.0.1" diff --git a/build.json b/build.json index 1f63ddd004..d70fa6eda2 100644 --- a/build.json +++ b/build.json @@ -2,7 +2,7 @@ "DotNetInstallScriptURL": "https://dot.net/v1", "DotNetChannel": "Preview", "DotNetVersions": [ - "3.1.414", + "3.1.415", "5.0.403", "6.0.100" ], diff --git a/test-assets/test-projects/NetCore31Project/global.json b/test-assets/test-projects/NetCore31Project/global.json index 0b2766262e..d1053c1ca9 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.414" + "version": "3.1.415" } } diff --git a/test-assets/test-projects/global.json b/test-assets/test-projects/global.json index 0b2766262e..d1053c1ca9 100644 --- a/test-assets/test-projects/global.json +++ b/test-assets/test-projects/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.414" + "version": "3.1.415" } } diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs index 967041084c..ca309360ed 100644 --- a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs +++ b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs @@ -197,7 +197,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.414"), emitter.ReceivedMessages[0].SdkVersion); + Assert.Equal(GetHashedFileExtension("3.1.415"), emitter.ReceivedMessages[0].SdkVersion); } [Fact]