Merge pull request #2279 from JoeRobich/vnext-to-net6

Move OmniSharp vNext to run on .NET 6
OmniSharp · Nov 25, 2021 · a258cd9 · a258cd9
2 parents 57c697b + 9a999d2
commit a258cd9
Show file tree

Hide file tree

Showing 32 changed files with 59 additions and 56 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,6 +8,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
+# CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogDebug(ILogger, string?, params object?[])'
+dotnet_diagnostic.CA2254.severity = none
 dotnet_diagnostic.VSTHRD002.severity = none
 dotnet_diagnostic.VSTHRD003.severity = none
 dotnet_diagnostic.VSTHRD105.severity = none

diff --git a/.github/workflows/tests-net5.yml → .github/workflows/tests-net6.yml b/.github/workflows/tests-net5.yml → .github/workflows/tests-net6.yml
@@ -1,9 +1,8 @@
 
-name: 'Tests net5.0'
+name: 'Tests net6.0'
 env:
   DotNetVersion: "6.0.100"
   DotNetVersion2: "3.1.415"
-  DotNetVersion3: "5.0.403"
   NuGetVersion: "5.7.0"
   MonoVersion: "6.12.0"
   Artifacts: ${{ github.workspace }}/artifacts/
@@ -52,11 +51,6 @@ jobs:
         with:
           nuget-version: ${{ env.NuGetVersion }}
 
-      - name: 🔨 Use .NET Core ${{ env.DotNetVersion3 }} SDK
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: ${{ env.DotNetVersion3 }}
-
       - name: 🔨 Use .NET Core ${{ env.DotNetVersion2 }} SDK
         uses: actions/setup-dotnet@v1.7.2
         with:

diff --git a/build.cake b/build.cake
@@ -635,7 +635,7 @@ Task("Test")
     .IsDependentOn("PrepareTestAssets")
     .Does(() =>
 {
-        var testTargetFramework = useDotNetTest ? "net5.0" : "net472";
+        var testTargetFramework = useDotNetTest ? "net6.0" : "net472";
         var testProjects = string.IsNullOrEmpty(testProjectArgument) ? buildPlan.TestProjects : testProjectArgument.Split(',');
         foreach (var testProject in testProjects)
         {
@@ -877,44 +877,44 @@ Task("PublishMonoBuilds")
     }
 });
 
-Task("PublishNet5Builds")
+Task("PublishNet6Builds")
     .IsDependentOn("Setup")
     .Does(() =>
 {
     foreach (var project in buildPlan.HostProjects)
     {
         if (publishAll)
         {
-            PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net5.0");
-            PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net5.0");
-            PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net5.0");
-            PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net5.0");
-            PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net5.0");
+            PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0");
+            PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0");
+            PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0");
+            PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0");
+            PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0");
         }
         else if (Platform.Current.IsWindows)
         {
             if (Platform.Current.IsX86)
             {
-                PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net5.0");
+                PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0");
             }
             else if (Platform.Current.IsX64)
             {
-                PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net5.0");
+                PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0");
             }
             else
             {
-                PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net5.0");
+                PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0");
             }
         }
         else
         {
             if (Platform.Current.IsMacOS)
             {
-                PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net5.0");
+                PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0");
             }
             else
             {
-                PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net5.0");
+                PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0");
             }
         }
 
@@ -1022,7 +1022,7 @@ Task("PublishNuGet")
 Task("Publish")
     .IsDependentOn("Build")
     .IsDependentOn("PublishMonoBuilds")
-    .IsDependentOn("PublishNet5Builds")
+    .IsDependentOn("PublishNet6Builds")
     .IsDependentOn("PublishWindowsBuilds")
     .IsDependentOn("PublishNuGet");
 

diff --git a/build/Packages.props b/build/Packages.props
@@ -3,10 +3,10 @@
 
     <PropertyGroup>
         <AspNetCorePackageVersion>2.2.0</AspNetCorePackageVersion>
-        <MicrosoftExtensionPackageVersion>5.0.0</MicrosoftExtensionPackageVersion>
-        <MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
-        <MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
-        <NuGetPackageVersion>5.11.0</NuGetPackageVersion>
+        <MicrosoftExtensionPackageVersion>6.0.0</MicrosoftExtensionPackageVersion>
+        <MicrosoftTestPackageVersion>17.0.0</MicrosoftTestPackageVersion>
+        <MSBuildPackageVersion>17.0.0</MSBuildPackageVersion>
+        <NuGetPackageVersion>6.0.0</NuGetPackageVersion>
         <RoslynPackageVersion>4.0.0-6.21526.21</RoslynPackageVersion>
         <XunitPackageVersion>2.4.1</XunitPackageVersion>
     </PropertyGroup>
@@ -65,7 +65,7 @@
         <PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.14.114" />
         <PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
 
-        <PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
         <PackageReference Update="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
         <PackageReference Update="NuGet.Packaging.Core" Version="$(NuGetPackageVersion)" />

diff --git a/src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj b/src/OmniSharp.Abstractions/OmniSharp.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472;netstandard2.0</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>OmniSharp</RootNamespace>
     <IsPackable>true</IsPackable>

diff --git a/src/OmniSharp.Cake/OmniSharp.Cake.csproj b/src/OmniSharp.Cake/OmniSharp.Cake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Cake/Services/RequestHandlers/Navigation/GotoDefinitionV2Handler.cs b/src/OmniSharp.Cake/Services/RequestHandlers/Navigation/GotoDefinitionV2Handler.cs
@@ -12,6 +12,7 @@
 using OmniSharp.Roslyn;
 using OmniSharp.Utilities;
 using Location = OmniSharp.Models.V2.Location;
+using Range = OmniSharp.Models.V2.Range;
 
 namespace OmniSharp.Cake.Services.RequestHandlers.Navigation
 {
@@ -59,7 +60,7 @@ protected override async Task<GotoDefinitionResponse> TranslateResponse(GotoDefi
 
                 if (!request.WantMetadata)
                 {
-                   continue;
+                    continue;
                 }
 
                 var aliasLocations = await GotoDefinitionHandlerHelper.GetAliasFromMetadataAsync(

diff --git a/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj b/src/OmniSharp.DotNetTest/OmniSharp.DotNetTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>
 
@@ -18,8 +18,8 @@
     <!-- New VSTest 'dotnet test' support -->
     <ItemGroup>
         <PackageReference Include="Microsoft.TestPlatform.TranslationLayer" />
-        <PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="Microsoft.TestPlatform.ObjectModel" />
-        <PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="System.Runtime.InteropServices.RuntimeInformation" />
+        <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.TestPlatform.ObjectModel" />
+        <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="System.Runtime.InteropServices.RuntimeInformation" />
     </ItemGroup>
 
 </Project>
diff --git a/src/OmniSharp.Host/MSBuild/Discovery/Providers/MicrosoftBuildLocatorInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/Providers/MicrosoftBuildLocatorInstanceProvider.cs
@@ -3,9 +3,11 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using OmniSharp.Utilities;
 using MicrosoftBuildLocator = Microsoft.Build.Locator.MSBuildLocator;
 using MicrosoftDiscoveryType = Microsoft.Build.Locator.DiscoveryType;
+#if !NETCOREAPP
+using OmniSharp.Utilities;
+#endif
 
 namespace OmniSharp.MSBuild.Discovery.Providers
 {
@@ -20,9 +22,9 @@ public override ImmutableArray<MSBuildInstance> GetInstances()
         {
 
 #if NETCOREAPP
-            // Restrict instances to NET 5 SDK
+            // Restrict instances to NET 6 SDK
             var instances = MicrosoftBuildLocator.QueryVisualStudioInstances()
-                .Where(instance => instance.Version.Major == 5);
+                .Where(instance => instance.Version.Major == 6);
 #else
             if (!PlatformHelper.IsWindows)
             {

diff --git a/src/OmniSharp.Host/OmniSharp.Host.csproj b/src/OmniSharp.Host/OmniSharp.Host.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>OmniSharp</RootNamespace>
     <IsPackable>true</IsPackable>

diff --git a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <AssemblyName>OmniSharp</AssemblyName>
         <OutputType>Exe</OutputType>

diff --git a/src/OmniSharp.Http/OmniSharp.Http.csproj b/src/OmniSharp.Http/OmniSharp.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>
 

diff --git a/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj b/src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <AssemblyName>OmniSharp.LanguageServerProtocol</AssemblyName>
         <PreserveCompilationContext>true</PreserveCompilationContext>

diff --git a/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj b/src/OmniSharp.MSBuild/OmniSharp.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPackable>true</IsPackable>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/OmniSharp.MSBuild/ProjectFile/PropertyNames.cs b/src/OmniSharp.MSBuild/ProjectFile/PropertyNames.cs
@@ -44,6 +44,7 @@ internal static class PropertyNames
         public const string TargetFrameworks = nameof(TargetFrameworks);
         public const string TargetPath = nameof(TargetPath);
         public const string TreatWarningsAsErrors = nameof(TreatWarningsAsErrors);
+        public const string UseAppHost = nameof(UseAppHost);
         public const string VisualStudioVersion = nameof(VisualStudioVersion);
         public const string VsInstallRoot = nameof(VsInstallRoot);
         public const string WarningsAsErrors = nameof(WarningsAsErrors);

diff --git a/src/OmniSharp.MSBuild/ProjectLoader.cs b/src/OmniSharp.MSBuild/ProjectLoader.cs
@@ -47,7 +47,10 @@ private static Dictionary<string, string> CreateGlobalProperties(
                 // This properties allow the design-time build to handle the Compile target without actually invoking the compiler.
                 // See https://github.com/dotnet/roslyn/pull/4604 for details.
                 { PropertyNames.ProvideCommandLineArgs, "true" },
-                { PropertyNames.SkipCompilerExecution, "true" }
+                { PropertyNames.SkipCompilerExecution, "true" },
+
+                // Ensures the SDK doesn't try to generate app hosts for the loading projects
+                { PropertyNames.UseAppHost, "false" },
             };
 
             globalProperties.AddPropertyOverride(PropertyNames.MSBuildExtensionsPath, options.MSBuildExtensionsPath, propertyOverrides, logger);

diff --git a/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj b/src/OmniSharp.Roslyn.CSharp/OmniSharp.Roslyn.CSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472;netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <IsPackable>true</IsPackable>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj b/src/OmniSharp.Roslyn/OmniSharp.Roslyn.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472;netstandard2.0</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPackable>true</IsPackable>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/OmniSharp.Script/OmniSharp.Script.csproj b/src/OmniSharp.Script/OmniSharp.Script.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
 

diff --git a/src/OmniSharp.Shared/OmniSharp.Shared.csproj b/src/OmniSharp.Shared/OmniSharp.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472;netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <RootNamespace>OmniSharp</RootNamespace>
         <IsPackable>true</IsPackable>

diff --git a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <AssemblyName>OmniSharp</AssemblyName>
         <OutputType>Exe</OutputType>

diff --git a/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj b/src/OmniSharp.Stdio/OmniSharp.Stdio.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net5.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
     </PropertyGroup>
 

diff --git a/tests/OmniSharp.Cake.Tests/OmniSharp.Cake.Tests.csproj b/tests/OmniSharp.Cake.Tests/OmniSharp.Cake.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/tests/OmniSharp.DotNetTest.Tests/OmniSharp.DotNetTest.Tests.csproj b/tests/OmniSharp.DotNetTest.Tests/OmniSharp.DotNetTest.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/tests/OmniSharp.Http.Tests/OmniSharp.Http.Tests.csproj b/tests/OmniSharp.Http.Tests/OmniSharp.Http.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/tests/OmniSharp.Lsp.Tests/OmniSharp.Lsp.Tests.csproj b/tests/OmniSharp.Lsp.Tests/OmniSharp.Lsp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/tests/OmniSharp.MSBuild.Tests/OmniSharp.MSBuild.Tests.csproj b/tests/OmniSharp.MSBuild.Tests/OmniSharp.MSBuild.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/OmniSharp.Roslyn.CSharp.Tests.csproj b/tests/OmniSharp.Roslyn.CSharp.Tests/OmniSharp.Roslyn.CSharp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>

diff --git a/tests/OmniSharp.Script.Tests/OmniSharp.Script.Tests.csproj b/tests/OmniSharp.Script.Tests/OmniSharp.Script.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>