Merge pull request #67163 from dibarbet/omnisharp_upgrade

Multitarget O# external access projects to fix issues accessing prope…
dotnet · Mar 3, 2023 · 834823c · 834823c
2 parents ef9f012 + b411532
commit 834823c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/Tools/ExternalAccess/OmniSharp.CSharp/Completion/OmniSharpCompletionProviderNames.cs b/src/Tools/ExternalAccess/OmniSharp.CSharp/Completion/OmniSharpCompletionProviderNames.cs
@@ -8,11 +8,11 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.Completion
 {
     internal static class OmniSharpCompletionProviderNames
     {
-        internal static string ObjectCreationCompletionProvider = typeof(ObjectCreationCompletionProvider).FullName;
-        internal static string OverrideCompletionProvider = typeof(OverrideCompletionProvider).FullName;
-        internal static string PartialMethodCompletionProvider = typeof(PartialMethodCompletionProvider).FullName;
-        internal static string InternalsVisibleToCompletionProvider = typeof(InternalsVisibleToCompletionProvider).FullName;
-        internal static string TypeImportCompletionProvider = typeof(TypeImportCompletionProvider).FullName;
-        internal static string ExtensionMethodImportCompletionProvider = typeof(ExtensionMethodImportCompletionProvider).FullName;
+        internal static string ObjectCreationCompletionProvider = typeof(ObjectCreationCompletionProvider).FullName!;
+        internal static string OverrideCompletionProvider = typeof(OverrideCompletionProvider).FullName!;
+        internal static string PartialMethodCompletionProvider = typeof(PartialMethodCompletionProvider).FullName!;
+        internal static string InternalsVisibleToCompletionProvider = typeof(InternalsVisibleToCompletionProvider).FullName!;
+        internal static string TypeImportCompletionProvider = typeof(TypeImportCompletionProvider).FullName!;
+        internal static string ExtensionMethodImportCompletionProvider = typeof(ExtensionMethodImportCompletionProvider).FullName!;
     }
 }
diff --git a/...rnalAccess/OmniSharp.CSharp/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj b/...rnalAccess/OmniSharp.CSharp/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp</PackageId>

diff --git a/src/Tools/ExternalAccess/OmniSharp/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj b/src/Tools/ExternalAccess/OmniSharp/Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
 
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis.ExternalAccess.OmniSharp</PackageId>
@@ -10,10 +10,6 @@
       https://github.com/OmniSharp/omnisharp-roslyn
     </PackageDescription>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\..\Compilers\Core\Portable\InternalUtilities\IsExternalInit.cs" Link="IsExternalInit.cs" />
-  </ItemGroup>
 
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />