Add DLLIMPORTGENERATOR_ENABLED when DllImportGenerator package is ref…

…erenced (#1050)
dotnet · Apr 30, 2021 · e111609 · e111609
1 parent 4a232c1
commit e111609
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/DllImportGenerator/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs b/DllImportGenerator/DllImportGenerator.UnitTests/ConvertToGeneratedDllImportFixerTests.cs
@@ -28,7 +28,7 @@ partial class Test
 using System.Runtime.InteropServices;
 partial class Test
 {{
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"")]
     public static partial int {{|CS8795:Method|}}(out int ret);
 #else
@@ -74,7 +74,7 @@ partial class Test
 partial class Test
 {{
     // P/Invoke
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(/*name*/""DoesNotExist"")] // comment
     public static partial int {{|CS8795:Method1|}}(out int ret);
 #else
@@ -83,7 +83,7 @@ partial class Test
 #endif
 
     /** P/Invoke **/
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"") /*name*/]
     // < ... >
     public static partial int {{|CS8795:Method2|}}(out int ret);
@@ -135,15 +135,15 @@ partial class Test
 using System.Runtime.InteropServices;
 partial class Test
 {{
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [System.ComponentModel.Description(""Test""), GeneratedDllImport(""DoesNotExist"")]
     public static partial int {{|CS8795:Method1|}}(out int ret);
 #else
     [System.ComponentModel.Description(""Test""), DllImport(""DoesNotExist"")]
     public static extern int Method1(out int ret);
 #endif
 
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [System.ComponentModel.Description(""Test"")]
     [GeneratedDllImport(""DoesNotExist"")]
     [return: MarshalAs(UnmanagedType.I4)]
@@ -194,15 +194,15 @@ partial class Test
 using System.Runtime.InteropServices;
 partial class Test
 {{
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"", EntryPoint = ""Entry"")]
     public static partial int {{|CS8795:Method1|}}(out int ret);
 #else
     [DllImport(""DoesNotExist"", EntryPoint = ""Entry"")]
     public static extern int Method1(out int ret);
 #endif
 
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"", EntryPoint = ""Entry"", CharSet = CharSet.Unicode)]
     public static partial int {{|CS8795:Method2|}}(out int ret);
 #else
@@ -246,15 +246,15 @@ partial class Test
 using System.Runtime.InteropServices;
 partial class Test
 {{
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"", EntryPoint = ""Entry"")]
     public static partial int {{|CS8795:Method1|}}(out int ret);
 #else
     [DllImport(""DoesNotExist"", BestFitMapping = false, EntryPoint = ""Entry"")]
     public static extern int Method1(out int ret);
 #endif
 
-#if NET
+#if DLLIMPORTGENERATOR_ENABLED
     [GeneratedDllImport(""DoesNotExist"")]
     public static partial int {{|CS8795:Method2|}}(out int ret);
 #else

diff --git a/DllImportGenerator/DllImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs b/DllImportGenerator/DllImportGenerator.UnitTests/Verifiers/CSharpCodeFixVerifier.cs
@@ -113,7 +113,7 @@ public Test()
             }
 
             protected override ParseOptions CreateParseOptions()
-                => ((CSharpParseOptions)base.CreateParseOptions()).WithPreprocessorSymbols("NET");
+                => ((CSharpParseOptions)base.CreateParseOptions()).WithPreprocessorSymbols("DLLIMPORTGENERATOR_ENABLED");
         }
     }
-}
+}
diff --git a/DllImportGenerator/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs b/DllImportGenerator/DllImportGenerator/Analyzers/ConvertToGeneratedDllImportFixer.cs
@@ -127,11 +127,11 @@ private async Task<Document> ConvertToGeneratedDllImport(
             }
             else
             {
-                // #if NET
+                // #if DLLIMPORTGENERATOR_ENABLED
                 generatedDeclaration = generatedDeclaration.WithLeadingTrivia(
                     generatedDeclaration.GetLeadingTrivia()
                         .AddRange(new[] {
-                            SyntaxFactory.Trivia(SyntaxFactory.IfDirectiveTrivia(SyntaxFactory.IdentifierName("NET"), isActive: true, branchTaken: true, conditionValue: true)),
+                            SyntaxFactory.Trivia(SyntaxFactory.IfDirectiveTrivia(SyntaxFactory.IdentifierName("DLLIMPORTGENERATOR_ENABLED"), isActive: true, branchTaken: true, conditionValue: true)),
                             SyntaxFactory.ElasticMarker
                         }));
 

diff --git a/DllImportGenerator/DllImportGenerator/DllImportGenerator.cs b/DllImportGenerator/DllImportGenerator/DllImportGenerator.cs
@@ -203,7 +203,7 @@ private static bool IsSupportedTargetFramework(Compilation compilation, out Vers
                 // .NET Standard
                 "netstandard" => false,
                 // .NET Core (when version < 5.0) or .NET
-                "System.Runtime" => version >= MinimumSupportedFrameworkVersion,
+                "System.Runtime" or "System.Private.CoreLib" => version >= MinimumSupportedFrameworkVersion,
                 _ => false,
             };
         }

diff --git a/DllImportGenerator/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props b/DllImportGenerator/DllImportGenerator/Microsoft.Interop.DllImportGenerator.props
@@ -16,4 +16,7 @@
       -->
       <CompilerVisibleProperty Include="DllImportGenerator_GenerateForwarders" />
   </ItemGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);DLLIMPORTGENERATOR_ENABLED</DefineConstants>
+  </PropertyGroup>
 </Project>