From b579fec7ab76af1cf10eee58466f0615e627a4cc Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 23 Feb 2023 21:37:36 -0500
Subject: [PATCH] Semi-unify drive finding

---
 CHANGELIST.md          |  1 +
 MPF.Core/Data/Drive.cs | 18 ++++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 78453d5e..60bc43f1 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -59,6 +59,7 @@
 - Packaging requires `-windows` for framework
 - Fix other `-windows` places for .NET 6
 - Fix typo in DICMultiSectorReadValue
+- Semi-unify drive finding
 
 ### 2.4 (2022-10-26)
 
diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs
index d4aa32c1..5df2983b 100644
--- a/MPF.Core/Data/Drive.cs
+++ b/MPF.Core/Data/Drive.cs
@@ -498,8 +498,6 @@ namespace MPF.Core.Data
             }
         }
 
-#if NETFRAMEWORK
-
         /// <summary>
         /// Get all current attached Drives
         /// </summary>
@@ -524,6 +522,8 @@ namespace MPF.Core.Data
                 .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
                 .ToList();
 
+            #if NETFRAMEWORK
+
             // Get the floppy drives and set the flag from removable
             try
             {
@@ -547,9 +547,13 @@ namespace MPF.Core.Data
                 // No-op
             }
 
+            #endif
+
             return drives;
         }
 
+#if NETFRAMEWORK
+
         /// <summary>
         /// Get the media type for a device path using the Aaru libraries
         /// </summary>
@@ -627,16 +631,6 @@ namespace MPF.Core.Data
 
 #else
 
-        /// <summary>
-        /// Get all devices attached converted to Drive objects
-        /// </summary>
-        /// <param name="ignoreFixedDrives">True to ignore fixed drives from population, false otherwise</param>
-        /// <returns>List of drives, null on error</returns>
-        private static List<Drive> GetDriveList(bool ignoreFixedDrives)
-        {
-            return new List<Drive>();
-        }
-
         /// <summary>
         /// Get the media type for a device path using the Aaru libraries
         /// </summary>