Merge branch 'master' into typo

OmniSharp · Apr 7, 2022 · 570e319 · 570e319
2 parents 1da8ce5 + d8ed5c0
commit 570e319
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 29 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,8 +1,8 @@
 
 name: 'Build'
 env:
-  DotNetVersion: "6.0.100"
-  DotNetVersion2: "3.1.415"
+  DotNetVersion: "6.0.201"
+  DotNetVersion2: "3.1.417"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"
   Artifacts: ${{ github.workspace }}/artifacts/

diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -1,8 +1,8 @@
 
 name: 'Tests net6.0'
 env:
-  DotNetVersion: "6.0.100"
-  DotNetVersion2: "3.1.415"
+  DotNetVersion: "6.0.201"
+  DotNetVersion2: "3.1.417"
   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: "6.0.100"
-  DotNetVersion2: "3.1.415"
+  DotNetVersion: "6.0.201"
+  DotNetVersion2: "3.1.417"
   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: "6.0.100"
-  DotNetVersion2: "3.1.415"
+  DotNetVersion: "6.0.201"
+  DotNetVersion2: "3.1.417"
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"
   MonoVersion: ''

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,8 +29,8 @@ resources:
 
 variables:
   Verbosity: Diagnostic
-  DotNetVersion: "6.0.100"
-  DotNetVersion2: "3.1.415"
+  DotNetVersion: "6.0.201"
+  DotNetVersion2: "3.1.417"
   CakeVersion: "1.1.0"
   NuGetVersion: "5.7.0"
   GitVersionVersion: "5.0.1"

diff --git a/build.json b/build.json
@@ -2,9 +2,9 @@
     "DotNetInstallScriptURL": "https://dot.net/v1",
     "DotNetChannel": "Preview",
     "DotNetVersions": [
-        "3.1.415",
-        "5.0.403",
-        "6.0.100"
+        "3.1.417",
+        "5.0.406",
+        "6.0.201"
     ],
     "RequiredMonoVersion": "6.6.0",
     "DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",

diff --git a/build/Packages.props b/build/Packages.props
@@ -6,7 +6,7 @@
         <MicrosoftExtensionPackageVersion>6.0.0</MicrosoftExtensionPackageVersion>
         <MicrosoftTestPackageVersion>17.0.0</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>17.0.0</MSBuildPackageVersion>
-        <NuGetPackageVersion>6.0.0</NuGetPackageVersion>
+        <NuGetPackageVersion>6.1.0</NuGetPackageVersion>
         <RoslynPackageVersion>4.2.0-3.22169.1</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "6.0.100"
+        "version": "6.0.201"
     }
 }
diff --git a/src/OmniSharp.MSBuild/ProjectLoadListener.cs b/src/OmniSharp.MSBuild/ProjectLoadListener.cs
@@ -87,7 +87,7 @@ private static HashedString GetProjectId(ProjectLoadedEventArgs args)
 
         private static HashedString GetSdkVersion(ProjectLoadedEventArgs args)
         {
-            return _tfmAndFileHashingAlgorithm.HashInput(args.SdkVersion.ToString());
+            return _tfmAndFileHashingAlgorithm.HashInput(args.SdkVersion?.ToString());
         }
 
         private static HashedString GetSessionId(ProjectLoadedEventArgs args)

diff --git a/src/OmniSharp.MSBuild/VsTfmAndFileExtHashingAlgorithm.cs b/src/OmniSharp.MSBuild/VsTfmAndFileExtHashingAlgorithm.cs
@@ -43,6 +43,11 @@ public class VsTfmAndFileExtHashingAlgorithm : IHasher
 
         public HashedString HashInput(string cleartext)
         {
+            if (cleartext is null)
+            {
+                return new HashedString(string.Empty);
+            }
+
             long lHash = 0;
 
             for (int i = 0; i < cleartext.Length; i++)

diff --git a/test-assets/test-projects/ExternAlias/global.json b/test-assets/test-projects/ExternAlias/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.415"
+        "version": "3.1.417"
     }
-}
+}
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.403"
+        "version": "5.0.406"
     }
 }
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"
+        "version": "6.0.201"
     }
 }
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.415"
+        "version": "3.1.417"
     }
 }
diff --git a/test-assets/test-projects/global.json b/test-assets/test-projects/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.415"
+        "version": "3.1.417"
     }
 }
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -218,7 +218,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.415"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("3.1.417"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(NonMonoRuntimeOnly))]
@@ -230,7 +230,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.403"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("5.0.406"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         [ConditionalFact(typeof(NonMonoRuntimeOnly))]
@@ -242,7 +242,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"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal(GetHashedFileExtension("6.0.201"), emitter.ReceivedMessages[0].SdkVersion);
         }
 
         private string GetHashedFileExtension(string fileExtension)

diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectWithAnalyzersTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectWithAnalyzersTests.cs
@@ -102,7 +102,7 @@ public async Task WhenProjectEditorConfigIsChangedThenAnalyzerConfigurationUpdat
                 TestHelpers.GetConfigurationDataWithAnalyzerConfig(roslynAnalyzersEnabled: true, editorConfigEnabled: true)))
             {
                 var initialProject = host.Workspace.CurrentSolution.Projects.Single();
-                var analyzerConfigDocument = initialProject.AnalyzerConfigDocuments.Single();
+                var analyzerConfigDocument = initialProject.AnalyzerConfigDocuments.Where(document => document.Name.Equals(".editorconfig")).Single();
 
                 File.WriteAllText(analyzerConfigDocument.FilePath, @"
 root = true
@@ -159,7 +159,7 @@ public async Task WhenProjectIsLoadedThenItContainsAnalyzerConfigurationFromPare
                 var projectFolderPath = Path.GetDirectoryName(project.FilePath);
                 var projectParentFolderPath = Path.GetDirectoryName(projectFolderPath);
 
-                var analyzerConfigDocument = project.AnalyzerConfigDocuments.Single();
+                var analyzerConfigDocument = project.AnalyzerConfigDocuments.Where(document => document.Name.Equals(".editorconfig")).Single();
                 var editorConfigFolderPath = Path.GetDirectoryName(analyzerConfigDocument.FilePath);
 
                 Assert.Equal(projectParentFolderPath, editorConfigFolderPath);
@@ -196,7 +196,7 @@ public async Task WhenProjectParentEditorConfigIsChangedThenAnalyzerConfiguratio
                 TestHelpers.GetConfigurationDataWithAnalyzerConfig(roslynAnalyzersEnabled: true, editorConfigEnabled: true)))
             {
                 var initialProject = host.Workspace.CurrentSolution.Projects.Single();
-                var analyzerConfigDocument = initialProject.AnalyzerConfigDocuments.Single();
+                var analyzerConfigDocument = initialProject.AnalyzerConfigDocuments.Where(document => document.Name.Equals(".editorconfig")).Single();
 
                 File.WriteAllText(analyzerConfigDocument.FilePath, @"
 root = true

diff --git 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 = "6.0.100";
+        private const string DotNetVersion = "6.0.201";
         private int Major { get; }
         private int Minor { get; }
         private int Patch { get; }