diff --git a/CHANGELIST.md b/CHANGELIST.md
index 14596025..393c8823 100644
--- a/CHANGELIST.md
+++ b/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
diff --git a/MPF.Core/Converters/EnumConverter.cs b/MPF.Core/Converters/EnumConverter.cs
index e1da0fce..1cf66faf 100644
--- a/MPF.Core/Converters/EnumConverter.cs
+++ b/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
///
/// Convert IMAPI physical media type to a MediaType
///
diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs
index 79f50503..6d6407ef 100644
--- a/MPF.Core/Data/Drive.cs
+++ b/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;
diff --git a/MPF.Core/MPF.Core.csproj b/MPF.Core/MPF.Core.csproj
index 8f2dc869..66c56d38 100644
--- a/MPF.Core/MPF.Core.csproj
+++ b/MPF.Core/MPF.Core.csproj
@@ -20,10 +20,6 @@
false
-
- NET_FRAMEWORK
-
-
{2735412F-7F64-5B0F-8F00-5D77AFBE261E}
diff --git a/MPF.Test/Core/Converters/EnumConverterTests.cs b/MPF.Test/Core/Converters/EnumConverterTests.cs
index e7c5119d..964b6b3d 100644
--- a/MPF.Test/Core/Converters/EnumConverterTests.cs
+++ b/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
///
/// IMAPI_MEDIA_PHYSICAL_TYPE values that map to MediaType
///
@@ -71,7 +71,7 @@ namespace MPF.Test.Core.Converters
Assert.NotNull(actual);
}
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
///
/// Check that every supported IMAPI_MEDIA_PHYSICAL_TYPE maps to an MediaType
///
@@ -108,7 +108,7 @@ namespace MPF.Test.Core.Converters
return testData;
}
-#if NET_FRAMEWORK
+#if NETFRAMEWORK
///
/// Generate a test set of IMAPI_MEDIA_PHYSICAL_TYPE values
///
diff --git a/MPF.Test/MPF.Test.csproj b/MPF.Test/MPF.Test.csproj
index 8b1452e2..5507f23b 100644
--- a/MPF.Test/MPF.Test.csproj
+++ b/MPF.Test/MPF.Test.csproj
@@ -6,10 +6,6 @@
false
-
- NET_FRAMEWORK
-
-
{2735412F-7F64-5B0F-8F00-5D77AFBE261E}