From 847930627911c58169fc1d25c9e00152ace0e3a2 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 15 Oct 2022 15:12:49 -0700
Subject: [PATCH] fix: Removes SetTypeRef for generated code. (#1189)
---
.config/dotnet-tools.json | 2 +-
Directory.Build.props | 6 +++---
Projects/Server.Tests/Server.Tests.csproj | 2 +-
Projects/Server/Guild.cs | 9 +--------
Projects/Server/Items/Item.cs | 9 +--------
Projects/Server/Mobiles/Mobile.cs | 4 ----
Projects/Server/Server.csproj | 4 ++--
Projects/UOContent.Tests/UOContent.Tests.csproj | 2 +-
Projects/UOContent/Accounting/Account.cs | 4 ----
Projects/UOContent/UOContent.csproj | 4 ++--
10 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 28f273951..b3cb80d87 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"modernuoschemagenerator": {
- "version": "2.3.0",
+ "version": "2.4.2",
"commands": [
"ModernUOSchemaGenerator"
]
diff --git a/Directory.Build.props b/Directory.Build.props
index 3f480b3b1..e92221228 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -55,11 +55,11 @@
latest
-
+
-
+
- 3.5.109
+ 3.5.113
all
diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj
index dbb87dc7a..7e771e9f9 100644
--- a/Projects/Server.Tests/Server.Tests.csproj
+++ b/Projects/Server.Tests/Server.Tests.csproj
@@ -3,7 +3,7 @@
false
-
+
diff --git a/Projects/Server/Guild.cs b/Projects/Server/Guild.cs
index 2e164b918..30cf2a499 100644
--- a/Projects/Server/Guild.cs
+++ b/Projects/Server/Guild.cs
@@ -33,14 +33,7 @@ public abstract class BaseGuild : ISerializable
World.AddGuild(this);
}
- protected BaseGuild(Serial serial)
- {
- Serial = serial;
- }
-
- public void SetTypeRef(Type type)
- {
- }
+ protected BaseGuild(Serial serial) => Serial = serial;
public abstract string Abbreviation { get; set; }
public abstract string Name { get; set; }
diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
index 66f78ecf2..109bcbccd 100644
--- a/Projects/Server/Items/Item.cs
+++ b/Projects/Server/Items/Item.cs
@@ -219,14 +219,7 @@ public class Item : IHued, IComparable- , ISpawnable, IObjectPropertyListEnt
World.AddEntity(this);
}
- public Item(Serial serial)
- {
- Serial = serial;
- }
-
- public void SetTypeRef(Type type)
- {
- }
+ public Item(Serial serial) => Serial = serial;
public int TempFlags
{
diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index f434cd6fc..18bc3d50e 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -355,10 +355,6 @@ public class Mobile : IHued, IComparable, ISpawnable, IObjectPropertyLis
DamageEntries = new List();
}
- public void SetTypeRef(Type type)
- {
- }
-
public static bool DragEffects { get; set; } = true;
[CommandProperty(AccessLevel.GameMaster)]
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 53ca56095..5f9c55db8 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -38,11 +38,11 @@
-
+
-
+
diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj
index 4f2cd601f..8daf7366d 100644
--- a/Projects/UOContent.Tests/UOContent.Tests.csproj
+++ b/Projects/UOContent.Tests/UOContent.Tests.csproj
@@ -3,7 +3,7 @@
false
-
+
diff --git a/Projects/UOContent/Accounting/Account.cs b/Projects/UOContent/Accounting/Account.cs
index 731974cfc..9663a738f 100644
--- a/Projects/UOContent/Accounting/Account.cs
+++ b/Projects/UOContent/Accounting/Account.cs
@@ -15,10 +15,6 @@ namespace Server.Accounting
[SerializationGenerator(4)]
public partial class Account : IAccount, IComparable, ISerializable
{
- public void SetTypeRef(Type type)
- {
- }
-
public static readonly TimeSpan YoungDuration = TimeSpan.FromHours(40.0);
public static readonly TimeSpan InactiveDuration = TimeSpan.FromDays(180.0);
public static readonly TimeSpan EmptyInactiveDuration = TimeSpan.FromDays(30.0);
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 824444eba..a219b5bb6 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -40,7 +40,7 @@
false
-
+
@@ -48,7 +48,7 @@
-
+