Use built-in NETFRAMEWORK directive

CHANGELIST.md

@@ -69,6 +69,7 @@
 - Revert AppVeyor to VS2019 for now
 - Add size-based media type detection for non-Framework
 - Gate ManagmentObject use further
+- Use built-in NETFRAMEWORK directive
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again

MPF.Core/Converters/EnumConverter.cs

@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
 using IMAPI2;
 #endif
 using MPF.Core.Data;
@@ -34,7 +34,7 @@ namespace MPF.Core.Converters
             }
         }
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
         /// <summary>
         /// Convert IMAPI physical media type to a MediaType
         /// </summary>

MPF.Core/Data/Drive.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Management;
 using MPF.Core.Converters;
 using MPF.Core.Utilities;
 using RedumpLib.Data;
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
+using System.Management;
 using IMAPI2;
 #else
 using Aaru.CommonTypes.Enums;
@@ -127,7 +127,7 @@ namespace MPF.Core.Data
                 .Select(d => new Drive(EnumConverter.ToInternalDriveType(d.DriveType), d))
                 .ToList();
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
             // Get the floppy drives and set the flag from removable
             try
             {
@@ -179,7 +179,7 @@ namespace MPF.Core.Data
             else if (this.InternalDriveType == Data.InternalDriveType.Removable)
                 return (MediaType.FlashDrive, null);
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
             // Get the current drive information
             string deviceId = null;
             bool loaded = false;

MPF.Core/MPF.Core.csproj

@@ -20,10 +20,6 @@
     <NrtShowRevision>false</NrtShowRevision>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net48'">
-    <DefineConstants>NET_FRAMEWORK</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <COMReference Include="IMAPI2">
       <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>

MPF.Test/Core/Converters/EnumConverterTests.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
 using IMAPI2;
 #endif
 using MPF.Core.Converters;
@@ -25,7 +25,7 @@ namespace MPF.Test.Core.Converters
             DriveType.Removable,
         };
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
         /// <summary>
         /// IMAPI_MEDIA_PHYSICAL_TYPE values that map to MediaType
         /// </summary>
@@ -71,7 +71,7 @@ namespace MPF.Test.Core.Converters
                 Assert.NotNull(actual);
         }
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
         /// <summary>
         /// Check that every supported IMAPI_MEDIA_PHYSICAL_TYPE maps to an MediaType
         /// </summary>
@@ -108,7 +108,7 @@ namespace MPF.Test.Core.Converters
             return testData;
         }
 
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
         /// <summary>
         /// Generate a test set of IMAPI_MEDIA_PHYSICAL_TYPE values
         /// </summary>

MPF.Test/MPF.Test.csproj

@@ -6,10 +6,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net48'">
-    <DefineConstants>NET_FRAMEWORK</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <COMReference Include="IMAPI2">
       <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>