Merge pull request #2219 from JoeRobich/remove-netcore2.1

Remove .NET Core 2.1
OmniSharp · Aug 30, 2021 · 69990fd · 69990fd
2 parents 0892538 + 0b5bf49
commit 69990fd
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 77 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,11 +47,6 @@ jobs:
         with:
           nuget-version: ${{ env.NuGetVersion }}
 
-      - name: 🔨 Use .NET Core 2.1 SDK
-        uses: actions/[email protected]
-        with:
-          dotnet-version: '2.1.x'
-
       - name: 🔨 Use .NET Core ${{ env.DotNetVersion2 }} SDK
         uses: actions/[email protected]
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,11 +50,6 @@ jobs:
         with:
           nuget-version: ${{ env.NuGetVersion }}
 
-      - name: 🔨 Use .NET Core 2.1 SDK
-        uses: actions/[email protected]
-        with:
-          dotnet-version: '2.1.x'
-
       - name: 🔨 Use .NET Core ${{ env.DotNetVersion2 }} SDK
         uses: actions/[email protected]
         with:

diff --git a/build.json b/build.json
@@ -2,7 +2,6 @@
     "DotNetInstallScriptURL": "https://dot.net/v1",
     "DotNetChannel": "Preview",
     "DotNetVersions": [
-        "2.1.816",
         "3.1.411",
         "5.0.302",
         "6.0.100-preview.6.21355.2"
@@ -45,7 +44,6 @@
         "ProjectWithDisabledAnalyzers",
         "ProjectWithDisabledAnalyzers2",
         "ProjectWithAnalyzers",
-        "NetCore21Project",
         "NetCore31Project",
         "Net50Project",
         "ProjectWithAnalyzersAndEditorConfig",

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;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>OmniSharp</RootNamespace>
     <IsPackable>true</IsPackable>

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;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPackable>true</IsPackable>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

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;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp3.1;netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <IsPackable>true</IsPackable>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/BaseCodeActionService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/BaseCodeActionService.cs
@@ -361,6 +361,12 @@ protected async Task<ImmutableArray<DocumentDiagnostics>> GetDiagnosticsAsync(Fi
         private static string GetNewFilePath(string newFileName, string currentFilePath)
         {
             var directory = Path.GetDirectoryName(currentFilePath);
+            if (directory is null)
+            {
+                // if the current file path is not nested within a directory, then return the new filename.
+                return newFileName;
+            }
+
             return Path.Combine(directory, newFileName);
         }
     }

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;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;netstandard2.0</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <IsPackable>true</IsPackable>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

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;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp3.1;netstandard2.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <RootNamespace>OmniSharp</RootNamespace>
         <IsPackable>true</IsPackable>

diff --git a/test-assets/test-projects/NetCore21Project/NetCore21Project.csproj b/test-assets/test-projects/NetCore21Project/NetCore21Project.csproj
diff --git a/test-assets/test-projects/NetCore21Project/Program.cs b/test-assets/test-projects/NetCore21Project/Program.cs
diff --git a/test-assets/test-projects/NetCore21Project/global.json b/test-assets/test-projects/NetCore21Project/global.json
diff --git a/test-assets/test-projects/NetCore31Project/NetCore31Project.csproj b/test-assets/test-projects/NetCore31Project/NetCore31Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/test-assets/test-projects/ProjectAndSolutionFilter/Project/ProjectAndSolutionFilter.csproj b/test-assets/test-projects/ProjectAndSolutionFilter/Project/ProjectAndSolutionFilter.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs b/tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
@@ -170,7 +170,7 @@ public async Task The_output_kind_is_emitted()
             // Arrange
             var emitter = new ProjectLoadTestEventEmitter();
 
-            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore21Project");
+            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore31Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
             Assert.Equal((int)OutputKind.ConsoleApplication, emitter.ReceivedMessages[0].OutputKind);
@@ -182,22 +182,10 @@ public async Task The_correct_project_capablities_is_emitted()
             // Arrange
             var emitter = new ProjectLoadTestEventEmitter();
 
-            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore21Project");
-            using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
-            Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal("GenerateDocumentationFile CSharp Managed ReferencesFolder LanguageService RelativePathDerivedDefaultNamespace AssemblyReferences COMReferences ProjectReferences SharedProjectReferences OutputGroups AllTargetOutputGroups VisualStudioWellKnownOutputGroups SingleFileGenerators DeclaredSourceItems UserSourceItems BuildWindowsDesktopTarget CrossPlatformExecutable FolderPublish Pack", string.Join(" ", emitter.ReceivedMessages[0].ProjectCapabilities));
-        }
-
-        [Fact]
-        public async Task The_correct_sdk_version_is_emitted_NETCore2_1()
-        {
-            // Arrange
-            var emitter = new ProjectLoadTestEventEmitter();
-
-            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore21Project");
+            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore31Project");
             using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
             Assert.Single(emitter.ReceivedMessages);
-            Assert.Equal(GetHashedFileExtension("2.1.816"), emitter.ReceivedMessages[0].SdkVersion);
+            Assert.Equal("GenerateDocumentationFile CSharp Managed ReferencesFolder LanguageService RelativePathDerivedDefaultNamespace AssemblyReferences COMReferences ProjectReferences SharedProjectReferences OutputGroups AllTargetOutputGroups VisualStudioWellKnownOutputGroups SingleFileGenerators DeclaredSourceItems UserSourceItems BuildWindowsDesktopTarget CrossPlatformExecutable Pack", string.Join(" ", emitter.ReceivedMessages[0].ProjectCapabilities));
         }
 
         [Fact]

diff --git a/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs b/tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
@@ -58,18 +58,18 @@ public async Task TestProjectAndSolutionFilter()
                 var project = Assert.Single(workspaceInfo.Projects);
 
                 Assert.Equal("ProjectAndSolutionFilter", project.AssemblyName);
-                Assert.Equal("bin/Debug/netcoreapp2.1/", project.OutputPath.EnsureForwardSlashes());
-                Assert.Equal("obj/Debug/netcoreapp2.1/", project.IntermediateOutputPath.EnsureForwardSlashes());
+                Assert.Equal("bin/Debug/netcoreapp3.1/", project.OutputPath.EnsureForwardSlashes());
+                Assert.Equal("obj/Debug/netcoreapp3.1/", project.IntermediateOutputPath.EnsureForwardSlashes());
                 var expectedTargetPath = $"{testProject.Directory}/Project/{project.OutputPath}ProjectAndSolutionFilter.dll".EnsureForwardSlashes();
                 Assert.Equal(expectedTargetPath, project.TargetPath.EnsureForwardSlashes());
                 Assert.Equal("Debug", project.Configuration);
                 Assert.Equal("AnyCPU", project.Platform);
                 Assert.True(project.IsExe);
                 Assert.False(project.IsUnityProject);
 
-                Assert.Equal(".NETCoreApp,Version=v2.1", project.TargetFramework);
+                Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
                 var targetFramework = Assert.Single(project.TargetFrameworks);
-                Assert.Equal("netcoreapp2.1", targetFramework.ShortName);
+                Assert.Equal("netcoreapp3.1", targetFramework.ShortName);
             }
         }
 
@@ -87,20 +87,6 @@ public async Task ProjectAndSolutionWithProjectSection()
             Assert.Equal("netcoreapp3.1", project.TargetFrameworks[0].ShortName);
         }
 
-        [Fact]
-        public async Task NetCore21Project()
-        {
-            using var testProject = await TestAssets.Instance.GetTestProjectAsync("NetCore21Project");
-            using var host = CreateMSBuildTestHost(testProject.Directory);
-            var workspaceInfo = await host.RequestMSBuildWorkspaceInfoAsync();
-
-            Assert.NotNull(workspaceInfo.Projects);
-            var project = Assert.Single(workspaceInfo.Projects);
-            Assert.Equal("NetCore21Project", project.AssemblyName);
-            Assert.Equal(".NETCoreApp,Version=v2.1", project.TargetFramework);
-            Assert.Equal("netcoreapp2.1", project.TargetFrameworks[0].ShortName);
-        }
-
         [Fact]
         public async Task Net50Solution()
         {