Merge branch 'master' into bugfix/OmniSharpGH-2209

nils-a · Oct 1, 2021 · 1791961 · 1791961
2 parents de6b09d + 443e667
commit 1791961
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## [1.37.16] - 2021-10-01
+*  Update included Build Tools to match .NET SDK 6 (PR: [#2239](https://github.com/OmniSharp/omnisharp-roslyn/pull/2239))
+* Add Custom .NET CLI support to OmniSharp (PR: [#2227](https://github.com/OmniSharp/omnisharp-roslyn/pull/2227))
+* Handle .editorconfig changes without running a new design time build ([#2112](https://github.com/OmniSharp/omnisharp-roslyn/issues/2112) PR: [#2234](https://github.com/OmniSharp/omnisharp-roslyn/pull/2234))
+* Do not return nulls when getting documents by path ([#2125](https://github.com/OmniSharp/omnisharp-roslyn/issues/2125) PR: [#2233](https://github.com/OmniSharp/omnisharp-roslyn/pull/2233))
+* handle RecordStructName in semantic highlighting classification ([#2228](https://github.com/OmniSharp/omnisharp-roslyn/issues/2228) PR: [#2232](https://github.com/OmniSharp/omnisharp-roslyn/pull/2232))
+* Update CodeStructureService with FileScoped Namespace support ([#2225](https://github.com/OmniSharp/omnisharp-roslyn/issues/2225) PR: [#2226](https://github.com/OmniSharp/omnisharp-roslyn/pull/2226))
+
 ## [1.37.15] - 2021-08-31
 * Update Roslyn to 4.0.0-4.21427.11 (PR: [#2220](https://github.com/OmniSharp/omnisharp-roslyn/pull/2220))
 * Update NuGet to 5.10.0 ([#2027](https://github.com/OmniSharp/omnisharp-roslyn/issues/2027), PR: [#2034](https://github.com/OmniSharp/omnisharp-roslyn/pull/2034))

diff --git a/build/Packages.props b/build/Packages.props
@@ -7,7 +7,7 @@
         <MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
         <MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
         <NuGetPackageVersion>5.10.0</NuGetPackageVersion>
-        <RoslynPackageVersion>4.0.0-4.21427.11</RoslynPackageVersion>
+        <RoslynPackageVersion>4.0.0-5.21480.15</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
 

diff --git a/src/OmniSharp.Host/CompositionHostBuilder.cs b/src/OmniSharp.Host/CompositionHostBuilder.cs
@@ -140,6 +140,12 @@ public static IServiceProvider CreateDefaultServiceProvider(
             services.AddSingleton<IAnalyzerAssemblyLoader, AnalyzerAssemblyLoader>();
             services.AddOptions();
 
+            // Setup the options from configuration
+            services.Configure<OmniSharpOptions>(configuration)
+                .PostConfigure<OmniSharpOptions>(OmniSharpOptions.PostConfigure);
+            services.AddSingleton(configuration);
+            services.AddSingleton<IConfiguration>(configuration);
+
             services.AddSingleton<IDotNetCliService, DotNetCliService>();
 
             // MSBuild
@@ -149,13 +155,6 @@ public static IServiceProvider CreateDefaultServiceProvider(
                     assemblyLoader: sp.GetService<IAssemblyLoader>(),
                     msbuildConfiguration: configuration.GetSection("msbuild")));
 
-
-            // Setup the options from configuration
-            services.Configure<OmniSharpOptions>(configuration)
-                .PostConfigure<OmniSharpOptions>(OmniSharpOptions.PostConfigure);
-            services.AddSingleton(configuration);
-            services.AddSingleton<IConfiguration>(configuration);
-
             services.AddLogging(builder =>
             {
                 var workspaceInformationServiceName = typeof(WorkspaceInformationService).FullName;

diff --git a/src/OmniSharp.Host/Services/DotNetCliService.cs b/src/OmniSharp.Host/Services/DotNetCliService.cs
@@ -2,11 +2,16 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using NuGet.Versioning;
 using OmniSharp.Eventing;
+using OmniSharp.Options;
 using OmniSharp.Utilities;
 
 namespace OmniSharp.Services
@@ -20,14 +25,45 @@ internal class DotNetCliService : IDotNetCliService
 
         public string DotNetPath { get; }
 
-        public DotNetCliService(ILoggerFactory loggerFactory, IEventEmitter eventEmitter, string dotnetPath = null)
+        public DotNetCliService(ILoggerFactory loggerFactory, IEventEmitter eventEmitter, IOptions<DotNetCliOptions> dotNetCliOptions, IOmniSharpEnvironment environment)
         {
             _logger = loggerFactory.CreateLogger<DotNetCliService>();
             _eventEmitter = eventEmitter;
             _locks = new ConcurrentDictionary<string, object>();
             _semaphore = new SemaphoreSlim(Environment.ProcessorCount / 2);
 
-            DotNetPath = dotnetPath ?? "dotnet";
+            // Check if any of the provided paths have a dotnet executable.
+            string executableExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty;
+            foreach (var path in dotNetCliOptions.Value.GetNormalizedLocationPaths(environment))
+            {
+                if (File.Exists(Path.Combine(path, $"dotnet{executableExtension}")))
+                {
+                    // We'll take the first path that has a dotnet executable.
+                    DotNetPath = Path.Combine(path, "dotnet");
+                }
+                else
+                {
+                    _logger.LogInformation($"Provided dotnet CLI path does not contain the dotnet executable: '{path}'.");
+                }
+            }
+
+            // If we still haven't found a dotnet CLI, check the DOTNET_ROOT environment variable.
+            if (DotNetPath is null)
+            {
+                _logger.LogInformation("Checking the 'DOTNET_ROOT' environment variable to find a .NET SDK");
+                string dotnetRoot = Environment.GetEnvironmentVariable("DOTNET_ROOT");
+                if (!string.IsNullOrEmpty(dotnetRoot) && File.Exists(Path.Combine(dotnetRoot, $"dotnet{executableExtension}")))
+                {
+                    DotNetPath = Path.Combine(dotnetRoot, "dotnet");
+                }
+            }
+
+            // If we still haven't found the CLI, use the one on the PATH.
+            if (DotNetPath is null)
+            {
+                _logger.LogInformation("Using the 'dotnet' on the PATH.");
+                DotNetPath = "dotnet";
+            }
 
             _logger.LogInformation($"DotNetPath set to {DotNetPath}");
         }

diff --git a/src/OmniSharp.Shared/Options/DotNetCliOptions.cs b/src/OmniSharp.Shared/Options/DotNetCliOptions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OmniSharp.Options
+{
+    public class DotNetCliOptions : OmniSharpExtensionsOptions
+    {
+    }
+}
diff --git a/src/OmniSharp.Shared/Options/OmniSharpOptions.cs b/src/OmniSharp.Shared/Options/OmniSharpOptions.cs
@@ -15,6 +15,8 @@ public class OmniSharpOptions
 
         public ImplementTypeOptions ImplementTypeOptions { get; set; } = new ImplementTypeOptions();
 
+        public DotNetCliOptions DotNetCliOptions { get; set; } = new DotNetCliOptions();
+
         public OmniSharpExtensionsOptions Plugins { get; set; } = new OmniSharpExtensionsOptions();
 
         public override string ToString() => JsonConvert.SerializeObject(this);
@@ -26,6 +28,7 @@ public static void PostConfigure(OmniSharpOptions options)
             options.FileOptions ??= new FileOptions();
             options.RenameOptions ??= new RenameOptions();
             options.ImplementTypeOptions ??= new ImplementTypeOptions();
+            options.DotNetCliOptions ??= new DotNetCliOptions();
             options.Plugins ??= new OmniSharpExtensionsOptions();
         }
     }

diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -129,9 +129,9 @@ public async Task Given_a_restored_project_the_references_are_emitted()
             var emitter = new ProjectLoadTestEventEmitter();
 
             using var testProject = await TestAssets.Instance.GetTestProjectAsync("HelloWorld");
-            var dotnetCliService = new DotNetCliService(LoggerFactory, emitter);
-            await dotnetCliService.RestoreAsync(testProject.Directory);
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
+            var dotnetCliService = host.GetExport<IDotNetCliService>();
+            await dotnetCliService.RestoreAsync(testProject.Directory);
             Assert.Single(emitter.ReceivedMessages);
             Assert.NotEmpty(emitter.ReceivedMessages[0].References.Where(reference => reference == GetHashedReference("system.core")));
         }

diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectWithAnalyzersTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectWithAnalyzersTests.cs
@@ -9,6 +9,7 @@
 using OmniSharp.FileWatching;
 using OmniSharp.Models.Diagnostics;
 using OmniSharp.Models.FilesChanged;
+using OmniSharp.Options;
 using OmniSharp.Services;
 using TestUtility;
 using Xunit;
@@ -348,7 +349,14 @@ await host.GetFilesChangedService().Handle(new[] {
 
         private static async Task RestoreProject(ITestProject testProject)
         {
-            await new DotNetCliService(new LoggerFactory(), NullEventEmitter.Instance).RestoreAsync(testProject.Directory);
+            DotNetCliOptions options = new DotNetCliOptions
+            {
+                LocationPaths = new[]
+                {
+                    Path.Combine(TestAssets.Instance.RootFolder, DotNetCliVersion.Current.GetFolderName())
+                }
+            };
+            await new DotNetCliService(new LoggerFactory(), NullEventEmitter.Instance, Microsoft.Extensions.Options.Options.Create(options), new OmniSharpEnvironment(testProject.Directory)).RestoreAsync(testProject.Directory);
         }
     }
 }
diff --git a/tests/TestUtility/TestServiceProvider.cs b/tests/TestUtility/TestServiceProvider.cs
@@ -3,12 +3,14 @@
 using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
 using OmniSharp;
 using OmniSharp.Eventing;
 using OmniSharp.FileWatching;
@@ -81,7 +83,7 @@ public static IServiceProvider Create(
             eventEmitter = eventEmitter ?? NullEventEmitter.Instance;
 
             var assemblyLoader = CreateAssemblyLoader(loggerFactory);
-            var dotNetCliService = CreateDotNetCliService(dotNetCliVersion, loggerFactory, eventEmitter);
+            var dotNetCliService = CreateDotNetCliService(dotNetCliVersion, loggerFactory, environment, eventEmitter);
             var configuration = CreateConfiguration(configurationData);
             var msbuildLocator = CreateMSBuildLocator(loggerFactory, assemblyLoader);
             var sharedTextWriter = CreateSharedTextWriter(testOutput);
@@ -105,7 +107,7 @@ public static IServiceProvider Create(
         {
             eventEmitter = eventEmitter ?? NullEventEmitter.Instance;
 
-            var dotNetCliService = CreateDotNetCliService(dotNetCliVersion, loggerFactory, eventEmitter);
+            var dotNetCliService = CreateDotNetCliService(dotNetCliVersion, loggerFactory, environment, eventEmitter);
             var configuration = CreateConfiguration(configurationData);
             var sharedTextWriter = CreateSharedTextWriter(testOutput);
 
@@ -142,26 +144,25 @@ private static IConfigurationRoot CreateConfiguration(IConfiguration configurati
             return builder.Build();
         }
 
-        private static IDotNetCliService CreateDotNetCliService(DotNetCliVersion dotNetCliVersion,
-            ILoggerFactory loggerFactory, IEventEmitter eventEmitter)
+        private static IDotNetCliService CreateDotNetCliService(
+            DotNetCliVersion dotNetCliVersion,
+            ILoggerFactory loggerFactory,
+            IOmniSharpEnvironment environment,
+            IEventEmitter eventEmitter)
         {
             var dotnetPath = Path.Combine(
                 TestAssets.Instance.RootFolder,
-                dotNetCliVersion.GetFolderName(),
-                "dotnet");
+                dotNetCliVersion.GetFolderName());
 
-            if (!File.Exists(dotnetPath))
-            {
-                dotnetPath = Path.ChangeExtension(dotnetPath, ".exe");
-            }
+            var options = new DotNetCliOptions { LocationPaths = new[] { dotnetPath } };
 
-            if (!File.Exists(dotnetPath))
+            if (!Directory.Exists(dotnetPath))
             {
                 throw new InvalidOperationException(
                     $"Local .NET CLI path does not exist. Did you run build.(ps1|sh) from the command line?");
             }
 
-            return new DotNetCliService(loggerFactory, NullEventEmitter.Instance, dotnetPath);
+            return new DotNetCliService(loggerFactory, NullEventEmitter.Instance, Options.Create(options), environment);
         }
 
         private static IMSBuildLocator CreateMSBuildLocator(ILoggerFactory loggerFactory,

diff --git a/tools/packages.config b/tools/packages.config
@@ -9,44 +9,44 @@
     <!--
         The version for these packages can be found in the dotnet/installer eng/Versions.props file in
         the branch that corresponds with the SDK Toolset being modeled.
-        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-rc1/eng/Versions.props
+        ex. https://github.com/dotnet/installer/blob/release/6.0.1xx/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
-    <package id="Microsoft.NET.Sdk" version="6.0.100-rc.1.21427.66" />
-    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-rc.1.21427.66" />
+    <package id="Microsoft.NET.Sdk" version="6.0.100-rtm.21480.28" />
+    <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-rtm.21480.28" />
 
     <!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
-    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
-    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rc.1.21426.17" />
+    <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
+    <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
 
     <!--
         The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
         the branch that corresponds with the "Microsoft.NET.Sdk package" being referenced.
-        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-rc1/eng/Versions.props
+        ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx/eng/Versions.props
     -->
 
     <!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
-    <package id="Microsoft.Build" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21426-01" />
-    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21426-01" />
+    <package id="Microsoft.Build" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Framework" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Runtime" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21480-03" />
+    <package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21480-03" />
     <!-- This package should match as well except the Major & Minor version are set to 1.0 -->
-    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21426-01" />
+    <package id="Microsoft.NET.StringTools" version="1.0.0-preview-21480-03" />
 
     <!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
-    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-4.21427.11" />
+    <package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-5.21480.15" />
 
     <!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
-    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Build.Tasks" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Commands" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Credentials" version="6.0.0-preview.4.230" />
-    <package id="NuGet.Frameworks" version="6.0.0-preview.4.230" />
+    <package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-rc.258" />
+    <package id="NuGet.Build.Tasks" version="6.0.0-rc.258" />
+    <package id="NuGet.Commands" version="6.0.0-rc.258" />
+    <package id="NuGet.Credentials" version="6.0.0-rc.258" />
+    <package id="NuGet.Frameworks" version="6.0.0-rc.258" />
 
     <!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
     <package id="Newtonsoft.Json" version="13.0.1" />