Merge pull request #2166 from OmniSharp/feature/sdks

Updated to all the latest .NET SDKs
OmniSharp · Jun 3, 2021 · c852b27 · c852b27
2 parents 65bb630 + d3b2696
commit c852b27
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 
 name: 'Build'
 env:
-  DotNetVersion: "5.0.104"
-  DotNetVersion2: "3.1.407"
+  DotNetVersion: "5.0.300"
+  DotNetVersion2: "3.1.409"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"
   Artifacts: ${{ github.workspace }}/artifacts/

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,8 +1,8 @@
 
 name: 'Tests'
 env:
-  DotNetVersion: "5.0.104"
-  DotNetVersion2: "3.1.407"
+  DotNetVersion: "5.0.300"
+  DotNetVersion2: "3.1.409"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"
   Artifacts: ${{ github.workspace }}/artifacts/

diff --git a/.pipelines/init.yml b/.pipelines/init.yml
@@ -1,8 +1,8 @@
 parameters:
   # Configuration: Release
   Verbosity: Normal
-  DotNetVersion: "5.0.104"
-  DotNetVersion2: "3.1.407"
+  DotNetVersion: "5.0.300"
+  DotNetVersion2: "3.1.409"
   CakeVersion: "1.0.0-rc0001"
   NuGetVersion: "5.7.0"
   MonoVersion: ''

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,8 +28,8 @@ resources:
 
 variables:
   Verbosity: Diagnostic
-  DotNetVersion: "5.0.104"
-  DotNetVersion2: "3.1.407"
+  DotNetVersion: "5.0.300"
+  DotNetVersion2: "3.1.409"
   CakeVersion: "1.0.0-rc0001"
   NuGetVersion: "5.7.0"
   GitVersionVersion: "5.0.1"

diff --git a/build.json b/build.json
@@ -2,10 +2,10 @@
     "DotNetInstallScriptURL": "https://dot.net/v1",
     "DotNetChannel": "Preview",
     "DotNetVersions": [
-        "2.1.814",
-        "3.1.407",
-        "5.0.104",
-        "6.0.100-preview.2.21155.3"
+        "2.1.816",
+        "3.1.409",
+        "5.0.300",
+        "6.0.100-preview.4.21255.9"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.104"
+        "version": "5.0.300"
     }
 }
diff --git a/test-assets/test-projects/ExternAlias/global.json b/test-assets/test-projects/ExternAlias/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.104"
+        "version": "5.0.300"
     }
 }
diff --git a/test-assets/test-projects/Net50Project/global.json b/test-assets/test-projects/Net50Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.104"
+        "version": "5.0.300"
     }
 }
diff --git 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.2.21155.3"
+        "version": "6.0.100-preview.4.21255.9"
     }
 }
diff --git a/test-assets/test-projects/NetCore21Project/global.json b/test-assets/test-projects/NetCore21Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "2.1.814"
+        "version": "2.1.816"
     }
 }
diff --git a/test-assets/test-projects/NetCore31Project/global.json b/test-assets/test-projects/NetCore31Project/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.407"
+        "version": "3.1.409"
     }
 }
diff --git a/test-assets/test-projects/global.json b/test-assets/test-projects/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.407"
+        "version": "3.1.409"
     }
 }
diff --git 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_NETCore2_1()
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore21Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("2.1.814"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("2.1.816"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [Fact]
@@ -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.407"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("3.1.409"), 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.104"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("5.0.300"), 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.2.21155.3"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("6.0.100-preview.4.21255.9"), 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
@@ -8,7 +8,7 @@ namespace OmniSharp.Tests
 {
     public class DotNetCliServiceFacts : AbstractTestFixture
     {
-        private const string DotNetVersion = "5.0.104";
+        private const string DotNetVersion = "5.0.300";
         private int Major { get; }
         private int Minor { get; }
         private int Patch { get; }