Merge pull request #1501 from JustArchi/patch-1

Fix macOS incompatibilies related to system libraries
SteamRE · Feb 3, 2025 · f164e14 · f164e14
2 parents cea197e + d038d5a
commit f164e14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/SteamKit2/SteamKit2/Util/MacHelpers.cs b/SteamKit2/SteamKit2/Util/MacHelpers.cs
@@ -83,7 +83,7 @@ static class LibC
     [SupportedOSPlatform( "macos" )]
     static partial class CoreFoundation
     {
-        const string LibraryName = "CoreFoundation.framework/CoreFoundation";
+        const string LibraryName = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
 
         public enum CFStringEncoding : uint
         {
@@ -114,7 +114,7 @@ public enum CFStringEncoding : uint
     [SupportedOSPlatform( "macos" )]
     static partial class DiskArbitration
     {
-        const string LibraryName = "DiskArbitration.framework/DiskArbitration";
+        const string LibraryName = "/System/Library/Frameworks/DiskArbitration.framework/DiskArbitration";
         public const string kDADiskDescriptionMediaUUIDKey = "DAMediaUUID";
 
         [LibraryImport( LibraryName )]
@@ -132,7 +132,7 @@ static partial class DiskArbitration
     [SupportedOSPlatform( "macos" )]
     static partial class IOKit
     {
-        const string LibraryName = "IOKit.framework/IOKit";
+        const string LibraryName = "/System/Library/Frameworks/IOKit.framework/IOKit";
 
         public const uint kIOMasterPortDefault = 0;
         public const string kIOPlatformSerialNumberKey = "IOPlatformSerialNumber";

diff --git a/SteamKit2/Tests/MachineInfoFacts.cs b/SteamKit2/Tests/MachineInfoFacts.cs
@@ -63,6 +63,15 @@ public void MachineInfoIsProcessedInBackground()
             HardwareUtils.GetMachineID(provider);
         }
 
+        [Fact]
+        public void DefaultProviderIsOperative()
+        {
+            var defaultProvider = MachineInfoProvider.GetDefaultProvider();
+
+            HardwareUtils.Init(defaultProvider);
+            HardwareUtils.GetMachineID(defaultProvider);
+        }
+
         [Fact]
         public void ProviderIsNotRetained()
         {