Skip to content

Commit f164e14

Browse files
authored
Merge pull request #1501 from JustArchi/patch-1
Fix macOS incompatibilies related to system libraries
2 parents cea197e + d038d5a commit f164e14

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

SteamKit2/SteamKit2/Util/MacHelpers.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static class LibC
8383
[SupportedOSPlatform( "macos" )]
8484
static partial class CoreFoundation
8585
{
86-
const string LibraryName = "CoreFoundation.framework/CoreFoundation";
86+
const string LibraryName = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
8787

8888
public enum CFStringEncoding : uint
8989
{
@@ -114,7 +114,7 @@ public enum CFStringEncoding : uint
114114
[SupportedOSPlatform( "macos" )]
115115
static partial class DiskArbitration
116116
{
117-
const string LibraryName = "DiskArbitration.framework/DiskArbitration";
117+
const string LibraryName = "/System/Library/Frameworks/DiskArbitration.framework/DiskArbitration";
118118
public const string kDADiskDescriptionMediaUUIDKey = "DAMediaUUID";
119119

120120
[LibraryImport( LibraryName )]
@@ -132,7 +132,7 @@ static partial class DiskArbitration
132132
[SupportedOSPlatform( "macos" )]
133133
static partial class IOKit
134134
{
135-
const string LibraryName = "IOKit.framework/IOKit";
135+
const string LibraryName = "/System/Library/Frameworks/IOKit.framework/IOKit";
136136

137137
public const uint kIOMasterPortDefault = 0;
138138
public const string kIOPlatformSerialNumberKey = "IOPlatformSerialNumber";

SteamKit2/Tests/MachineInfoFacts.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ public void MachineInfoIsProcessedInBackground()
6363
HardwareUtils.GetMachineID(provider);
6464
}
6565

66+
[Fact]
67+
public void DefaultProviderIsOperative()
68+
{
69+
var defaultProvider = MachineInfoProvider.GetDefaultProvider();
70+
71+
HardwareUtils.Init(defaultProvider);
72+
HardwareUtils.GetMachineID(defaultProvider);
73+
}
74+
6675
[Fact]
6776
public void ProviderIsNotRetained()
6877
{

0 commit comments

Comments
 (0)