diff --git a/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs b/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs
index f238af5d8..041bb4e2a 100644
--- a/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs
+++ b/Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs
@@ -208,9 +208,9 @@ namespace Robust.Client.ResourceManagement
RSI = rsi;
}
- private static readonly JsonSchema4 RSISchema = GetSchema();
+ private static readonly JsonSchema RSISchema = GetSchema();
- private static JsonSchema4 GetSchema()
+ private static JsonSchema GetSchema()
{
try
{
@@ -222,7 +222,7 @@ namespace Robust.Client.ResourceManagement
schema = schemaReader.ReadToEnd();
}
- return JsonSchema4.FromJsonAsync(schema).Result;
+ return JsonSchema.FromJsonAsync(schema).Result;
}
catch (Exception e)
{
diff --git a/Robust.Client/Robust.Client.csproj b/Robust.Client/Robust.Client.csproj
index 4c1c73d71..e530d774e 100644
--- a/Robust.Client/Robust.Client.csproj
+++ b/Robust.Client/Robust.Client.csproj
@@ -12,18 +12,18 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
+
diff --git a/Robust.Client/Utility/DiscordRichPresence.cs b/Robust.Client/Utility/DiscordRichPresence.cs
index 56449d17d..d7bc86aa7 100644
--- a/Robust.Client/Utility/DiscordRichPresence.cs
+++ b/Robust.Client/Utility/DiscordRichPresence.cs
@@ -111,7 +111,7 @@ namespace Robust.Client.Utility
if (newValue)
{
- if (_client == null || _client.Disposed)
+ if (_client == null || _client.IsDisposed)
{
_start();
}
diff --git a/Robust.Client/app.config b/Robust.Client/app.config
deleted file mode 100644
index 2bbe77154..000000000
--- a/Robust.Client/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Robust.Server/Robust.Server.csproj b/Robust.Server/Robust.Server.csproj
index 27a4f9126..0112ea20f 100644
--- a/Robust.Server/Robust.Server.csproj
+++ b/Robust.Server/Robust.Server.csproj
@@ -13,9 +13,9 @@
-
+
-
+
diff --git a/Robust.Shared.Maths/Robust.Shared.Maths.csproj b/Robust.Shared.Maths/Robust.Shared.Maths.csproj
index 225b40809..08b73b2a6 100644
--- a/Robust.Shared.Maths/Robust.Shared.Maths.csproj
+++ b/Robust.Shared.Maths/Robust.Shared.Maths.csproj
@@ -11,7 +11,7 @@
-
-
+
+
diff --git a/Robust.Shared/Robust.Shared.csproj b/Robust.Shared/Robust.Shared.csproj
index 2e16038b8..d5f70b2b5 100644
--- a/Robust.Shared/Robust.Shared.csproj
+++ b/Robust.Shared/Robust.Shared.csproj
@@ -10,16 +10,16 @@
-
-
+
+
-
+
-
-
+
+
-
+
diff --git a/Robust.UnitTesting/Robust.UnitTesting.csproj b/Robust.UnitTesting/Robust.UnitTesting.csproj
index 180d69446..8825bd7c1 100644
--- a/Robust.UnitTesting/Robust.UnitTesting.csproj
+++ b/Robust.UnitTesting/Robust.UnitTesting.csproj
@@ -10,20 +10,20 @@
-
-
+
+
-
-
-
+
+
+
-
+
-
+
diff --git a/Robust.UnitTesting/app.config b/Robust.UnitTesting/app.config
index 65e583eb7..74bddc309 100644
--- a/Robust.UnitTesting/app.config
+++ b/Robust.UnitTesting/app.config
@@ -6,10 +6,6 @@
-
-
-
-