use file exclusion for NullabilityInfoExtensions (#266)

SimonCropp · Dec 20, 2024 · f0dd0c5 · f0dd0c5
1 parent ceef80f
commit f0dd0c5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/src/NoGuard/NoGuard.csproj → src/NoExtras/NoExtras.csproj b/src/NoGuard/NoGuard.csproj → src/NoExtras/NoExtras.csproj
@@ -3,6 +3,7 @@
     <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
     <TargetFramework>net9.0</TargetFramework>
     <PolyGuard>false</PolyGuard>
+    <PolyNullability>false</PolyNullability>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" />

diff --git a/src/NoExtras/Tests.cs b/src/NoExtras/Tests.cs
@@ -0,0 +1,17 @@
+using NUnit.Framework;
+
+[TestFixture]
+public class Tests
+{
+    [Test]
+    public void NoGuard() =>
+        Assert.IsNull(GetType().Assembly.GetType("Polyfills.Guard"));
+
+    [Test]
+    public void NoNullExtensions()
+    {
+        var method = typeof(Polyfill)
+            .GetMethod("GetNullabilityInfo", BindingFlags.Static | BindingFlags.Public, null, [typeof(MemberInfo)], null);
+        Assert.IsNull(method);
+    }
+}
diff --git a/src/NoGuard/Tests.cs b/src/NoGuard/Tests.cs
diff --git a/src/Polyfill.sln b/src/Polyfill.sln
@@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiBuilderTests", "ApiBuild
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeOnlyValueTuple", "ConsumeOnlyValueTuple\ConsumeOnlyValueTuple.csproj", "{2FE1429A-68B0-4C71-B1ED-D371C72DAD0E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoGuard", "NoGuard\NoGuard.csproj", "{4F482296-D4BF-4E56-AF23-351CCEF1B96E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoExtras", "NoExtras\NoExtras.csproj", "{4F482296-D4BF-4E56-AF23-351CCEF1B96E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Polyfill/Nullability/NullabilityInfoExtensions.cs b/src/Polyfill/Nullability/NullabilityInfoExtensions.cs
@@ -1,7 +1,6 @@
 // <auto-generated />
 #pragma warning disable
 
-#if PolyNullability
 #nullable enable
 
 namespace Polyfills;
@@ -152,6 +151,4 @@ static NullabilityState GetKnownState(string name, NullabilityInfo info)
 
     static bool IsNullable(string name, NullabilityInfo info) =>
         GetKnownState(name, info) == NullabilityState.Nullable;
-}
-
-#endif
+}
diff --git a/src/Polyfill/Polyfill.targets b/src/Polyfill/Polyfill.targets
@@ -17,12 +17,6 @@
   <PropertyGroup Condition="$(PolyPublic) == 'true' ">
     <DefineConstants>$(DefineConstants);PolyPublic</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(PolyNullability) == 'true' ">
-    <DefineConstants>$(DefineConstants);PolyNullability</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(PolyGuard) == 'true' ">
-    <DefineConstants>$(DefineConstants);PolyGuard</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="$(LowerFramework.StartsWith('netcoreapp2'))">
     <DefineConstants>$(DefineConstants);NETCOREAPP2X</DefineConstants>
   </PropertyGroup>
@@ -120,6 +114,9 @@ For example:
     <Compile Condition="$(PolyGuard) != 'true' "
              Remove="$(MSBuildThisFileDirectory)..\**\Guard\*.cs" />
 
+    <Compile Condition="$(PolyNullability) != 'true' "
+             Remove="$(MSBuildThisFileDirectory)..\**\NullabilityInfoExtensions.cs" />
+
     <Compile Update="@(Compile)">
       <Visible Condition="%(NuGetItemType) == 'Compile' and
                           %(NuGetPackageId) == 'Polyfill'">false</Visible>