Remove framework moniker checks

FenPhoenix · Nov 25, 2024 · e8c24c1 · e8c24c1
1 parent 6a53321
commit e8c24c1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/AL_Common/AL_Common.csproj b/AL_Common/AL_Common.csproj
@@ -41,8 +41,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Condition="'$(TargetFramework.StartsWith(`net4`, StringComparison.Ordinal))'=='true'" Include="System.Buffers" Version="4.6.0" />
-    <PackageReference Condition="'$(TargetFramework.StartsWith(`net4`, StringComparison.Ordinal))'=='true'" Include="System.Memory" Version="4.6.0" />
+    <PackageReference Include="System.Buffers" Version="4.6.0" />
+    <PackageReference Include="System.Memory" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AngelLoader/post_build.bat b/AngelLoader/post_build.bat
@@ -44,19 +44,11 @@ if %PlatformName% == x86 (
 	rd /S /Q "%TargetDir%7z32"
 )
 
-if "%TargetFramework:~0,4%"=="net4" (
-	del /F "%TargetDir%AngelLoader.dll"
-	del /F "%TargetDir%*.runtimeconfig.json"
-	del /F "%TargetDir%*.deps.json"
-	del /F "%TargetDir%System.Drawing.Primitives.dll"
-	del /F "%TargetDir%SpanExtensions.dll"
-) else (
-	del /F "%TargetDir%*.exe.config"
-	del /F "%TargetDir%System.Buffers.dll"
-	del /F "%TargetDir%System.Memory.dll"
-	del /F "%TargetDir%System.Numerics.Vectors.dll"
-	del /F "%TargetDir%System.Runtime.CompilerServices.Unsafe.dll"
-)
+del /F "%TargetDir%AngelLoader.dll"
+del /F "%TargetDir%*.runtimeconfig.json"
+del /F "%TargetDir%*.deps.json"
+del /F "%TargetDir%System.Drawing.Primitives.dll"
+del /F "%TargetDir%SpanExtensions.dll"
 
 del /F "%TargetDir%EasyHook32Svc.exe"
 del /F "%TargetDir%EasyHook64Svc.exe"

diff --git a/FMScanner/FMScanner.csproj b/FMScanner/FMScanner.csproj
@@ -90,8 +90,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Condition="'$(TargetFramework.StartsWith(`net4`, StringComparison.Ordinal))'=='true'" Include="System.Buffers" Version="4.6.0" />
-    <PackageReference Condition="'$(TargetFramework.StartsWith(`net4`, StringComparison.Ordinal))'=='true'" Include="System.Memory" Version="4.6.0" />
+    <PackageReference Include="System.Buffers" Version="4.6.0" />
+    <PackageReference Include="System.Memory" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TestApps/FMInfoGen/FMInfoGen/FMInfoGen.csproj b/TestApps/FMInfoGen/FMInfoGen/FMInfoGen.csproj
@@ -68,7 +68,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-	<PackageReference Condition="'$(TargetFramework.StartsWith(`net4`, StringComparison.Ordinal))'=='true'" Include="Nullable" Version="1.3.1">
+    <PackageReference Include="PolySharp" Version="1.15.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>