Skip to content

Commit 8d5edd1

Browse files
NZSmartieqdot
authored andcommitted
Remove preprocessor directives
1 parent 2d136c7 commit 8d5edd1

3 files changed

Lines changed: 0 additions & 20 deletions

File tree

Buttplug.Core/ButtplugJsonMessageParser.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,15 @@ public ButtplugJsonMessageParser(IButtplugLogManager aLogManager = null)
3131
// If this is the case, we should still find messages even though an exception was thrown.
3232
try
3333
{
34-
#if NETSTANDARD1_4
35-
allTypes = typeof(ButtplugMessage).GetTypeInfo().Assembly.GetTypes();
36-
#else
3734
allTypes = Assembly.GetAssembly(typeof(ButtplugMessage)).GetTypes();
38-
#endif
3935
}
4036
catch (ReflectionTypeLoadException e)
4137
{
4238
allTypes = e.Types;
4339
}
4440

4541
var messageClasses = allTypes
46-
#if NETSTANDARD1_4
47-
.Where(t => t.GetTypeInfo().IsClass)
48-
#else
4942
.Where(t => t.IsClass)
50-
#endif
5143
.Where(t => t != null && t.Namespace == "Buttplug.Core.Messages" && typeof(ButtplugMessage).IsAssignableFrom(t));
5244

5345
var enumerable = messageClasses as Type[] ?? messageClasses.ToArray();
@@ -60,11 +52,7 @@ public ButtplugJsonMessageParser(IButtplugLogManager aLogManager = null)
6052
});
6153

6254
// Load the schema for validation
63-
#if NETSTANDARD1_4
64-
var assembly = GetType().GetTypeInfo().Assembly;
65-
#else
6655
var assembly = Assembly.GetExecutingAssembly();
67-
#endif
6856
const string resourceName = "Buttplug.Core.buttplug-schema.json";
6957
Stream stream = null;
7058
try

Buttplug.Core/Messages/Messages.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,7 @@ public ServerInfo(string aServerName, uint aMessageVersion, uint aMaxPingTime, u
254254
ServerName = aServerName;
255255
MessageVersion = aMessageVersion;
256256
MaxPingTime = aMaxPingTime;
257-
#if NETSTANDARD1_4
258-
var assembly = typeof(ServerInfo).GetTypeInfo().Assembly;
259-
#else
260257
var assembly = Assembly.GetAssembly(typeof(ServerInfo));
261-
#endif
262258
MajorVersion = assembly.GetName().Version.Major;
263259
MinorVersion = assembly.GetName().Version.Minor;
264260
BuildVersion = assembly.GetName().Version.Build;

Buttplug.Server/ButtplugServer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public DeviceManager DeviceManager
4242

4343
public static string GetLicense()
4444
{
45-
#if NETSTANDARD1_4
46-
var assembly = typeof(ButtplugServer).GetTypeInfo().Assembly;
47-
#else
4845
var assembly = Assembly.GetExecutingAssembly();
49-
#endif
5046
var resourceName = "Buttplug.Server.LICENSE";
5147
Stream stream = null;
5248
try

0 commit comments

Comments
 (0)