Skip to content

Commit 013fbb8

Browse files
authored
Merge pull request #217 from KaKusaOAO/master
Properly tell macOS from UNIX starting from .NET Core
2 parents 235f6e6 + c58baa4 commit 013fbb8

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

DiscordRPC/Registry/UriScheme.cs

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
using DiscordRPC.Logging;
1+
#if NETSTANDARD1_1_OR_GREATER
2+
#define USE_RUNTIME_INFO
3+
#endif
4+
5+
using DiscordRPC.Logging;
26
using System;
37
using System.Diagnostics;
8+
#if USE_RUNTIME_INFO
9+
using System.Runtime.InteropServices;
10+
#endif
411

512
namespace DiscordRPC.Registry
613
{
@@ -53,14 +60,28 @@ public bool RegisterUriScheme()
5360
break;
5461

5562
case PlatformID.Unix:
56-
_logger.Trace("Creating Unix Scheme Creator");
57-
creator = new UnixUriSchemeCreator(_logger);
63+
#if USE_RUNTIME_INFO
64+
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
65+
{
66+
_logger.Trace("Creating MacOSX Scheme Creator");
67+
creator = new MacUriSchemeCreator(_logger);
68+
}
69+
else
70+
{
71+
#endif
72+
_logger.Trace("Creating Unix Scheme Creator");
73+
creator = new UnixUriSchemeCreator(_logger);
74+
#if USE_RUNTIME_INFO
75+
}
76+
#endif
5877
break;
5978

79+
#if !USE_RUNTIME_INFO
6080
case PlatformID.MacOSX:
6181
_logger.Trace("Creating MacOSX Scheme Creator");
6282
creator = new MacUriSchemeCreator(_logger);
6383
break;
84+
#endif
6485

6586
default:
6687
_logger.Error("Unkown Platform: {0}", Environment.OSVersion.Platform);

0 commit comments

Comments
 (0)