From 762ae31f0544fcdb468818cdea3599da0c7da0c4 Mon Sep 17 00:00:00 2001
From: Brandon Thetford <github@snapsinazfs.com>
Date: Sun, 28 Apr 2024 11:02:27 -0700
Subject: [PATCH] Cleanup for this project file

Don't need the conditional includes since it has to be netstandard2.0
Consolidate sections after removing that.
Correct and clarify the comment up top for current state of the csproj
---
 .../Terminal.Gui.Analyzers.Internal.csproj    | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
index d1bde776f..f63bacf78 100644
--- a/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
+++ b/Analyzers/Terminal.Gui.Analyzers.Internal/Terminal.Gui.Analyzers.Internal.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <!-- 
-        Do not remove netstandard2.0 from the TargetFrameworks.
+        Do not remove netstandard2.0 from the TargetFramework.
         Visual Studio requires that Analyzers/Generators target netstandard2.0 to work properly.
-        Additional TFMs are for support of additional APIs and language features.
+        Also do not change this to TargetFrameworks without fully understanding the behavior change that implies.
         -->
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
@@ -32,36 +32,22 @@
         <Compile Remove="Compatibility/*.cs" />
     </ItemGroup>
 
-    <Choose>
-        <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
-            <PropertyGroup>
-                <!-- Disabling some useless warnings caused by the netstandard2.0 target -->
-                <NoWarn>$(NoWarn);nullable;CA1067</NoWarn>
-            </PropertyGroup>
-            <ItemGroup>                                                                         
-                <Compile Include="Compatibility/CompilerFeatureRequiredAttribute.cs" />         
-                <Compile Include="Compatibility/IsExternalInit.cs" />                           
-                <Compile Include="Compatibility/IEqualityOperators.cs" />
-                <Compile Include="Compatibility/NullableAttributes.cs" />                         
-                <Compile Include="Compatibility/RequiredMemberAttribute.cs" />                  
-                <Compile Include="Compatibility/SetsRequiredMembersAttribute.cs" />             
-            </ItemGroup>                                                                        
-            <ItemGroup>
-                <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" PrivateAssets="all" />
-                <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" PrivateAssets="all" />
-                <PackageReference Include="System.Runtime.Numerics" Version="4.3.0" PrivateAssets="all" />
-            </ItemGroup>
-        </When>
-        <When Condition="'$(TargetFramework)' == 'net8.0'">
-        </When>
-    </Choose>
-    
-    <ItemGroup>
+    <PropertyGroup>
+        <!-- Disabling some useless warnings caused by the netstandard2.0 target -->
+        <NoWarn>$(NoWarn);nullable;CA1067</NoWarn>
+    </PropertyGroup>
+    <ItemGroup>                                                                         
+        <Compile Include="Compatibility/CompilerFeatureRequiredAttribute.cs" />         
+        <Compile Include="Compatibility/IsExternalInit.cs" />                           
+        <Compile Include="Compatibility/IEqualityOperators.cs" />
+        <Compile Include="Compatibility/NullableAttributes.cs" />                         
+        <Compile Include="Compatibility/RequiredMemberAttribute.cs" />                  
+        <Compile Include="Compatibility/SetsRequiredMembersAttribute.cs" />             
         <Compile Include="Compatibility/NumericExtensions.cs" />
         <Compile Include="Compatibility/SkipLocalsInitAttribute.cs" />
-    </ItemGroup>
+    </ItemGroup>                                                                        
 
-    <ItemGroup>
+  <ItemGroup>
         <AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
         <AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
     </ItemGroup>
@@ -79,5 +65,8 @@
             <!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
         </PackageReference>
         <PackageReference Include="Roslynator.CSharp" Version="4.12.1" PrivateAssets="all" />
+        <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" PrivateAssets="all" />
+        <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" PrivateAssets="all" />
+        <PackageReference Include="System.Runtime.Numerics" Version="4.3.0" PrivateAssets="all" />
     </ItemGroup>
 </Project>