diff --git a/Directory.Build.props b/Directory.Build.props
index 27ca9d899..c48855eab 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
Kamron Batman
ModernUO
2019-2020
- net5.0;net6.0
+ net6.0
x64
x64
preview
@@ -56,7 +56,7 @@
-
+
3.4.244
all
diff --git a/Projects/SerializationGenerator/SerializationGenerator.csproj b/Projects/SerializationGenerator/SerializationGenerator.csproj
index 03b5a5bdb..f74e5e965 100755
--- a/Projects/SerializationGenerator/SerializationGenerator.csproj
+++ b/Projects/SerializationGenerator/SerializationGenerator.csproj
@@ -1,16 +1,17 @@
- netstandard2.0
+ netstandard2.0
preview
analyzers
-
-
-
-
-
+
+
+
+
+
+
@@ -22,6 +23,7 @@
+
diff --git a/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj b/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
index 31e89d561..d3d1a168e 100755
--- a/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
+++ b/Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
@@ -1,7 +1,6 @@
Exe
- net5.0
Output
@@ -14,7 +13,10 @@
-
-
+
+
+
+
+
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index cf357a582..f2cc0ec7a 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/Projects/Server/Utilities/Utility.cs b/Projects/Server/Utilities/Utility.cs
index a184d4b23..d3a780a4f 100644
--- a/Projects/Server/Utilities/Utility.cs
+++ b/Projects/Server/Utilities/Utility.cs
@@ -1049,6 +1049,21 @@ namespace Server
return min + (int)RandomSources.Source.Next((uint)(max - min + 1));
}
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public static long RandomMinMax(long min, long max)
+ {
+ if (min > max)
+ {
+ (min, max) = (max, min);
+ }
+ else if (min == max)
+ {
+ return min;
+ }
+
+ return min + RandomSources.Source.Next(max - min + 1);
+ }
+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int Random(int from, int count) => RandomSources.Source.Next(from, count);
diff --git a/Projects/UOContent/Items/Construction/Ankhs.cs b/Projects/UOContent/Items/Construction/Ankhs.cs
index a9993b5df..d75e968f5 100644
--- a/Projects/UOContent/Items/Construction/Ankhs.cs
+++ b/Projects/UOContent/Items/Construction/Ankhs.cs
@@ -114,7 +114,7 @@ namespace Server.Items
[Serializable(0, false)]
public partial class AnkhWest : Item
{
- [SerializableField(0)]
+ [SerializableField(0, getter: "private", setter: "private")]
private InternalItem _item;
[Constructible]
@@ -184,7 +184,7 @@ namespace Server.Items
}
[Serializable(0, false)]
- private class InternalItem : Item
+ private partial class InternalItem : Item
{
[SerializableField(0)]
private AnkhWest _item;
@@ -260,7 +260,7 @@ namespace Server.Items
[Serializable(0, false)]
public partial class AnkhNorth : Item
{
- [SerializableField(0)]
+ [SerializableField(0, getter: "private", setter: "private")]
private InternalItem _item;
[Constructible]
@@ -332,7 +332,7 @@ namespace Server.Items
[TypeAlias("Server.Items.AnkhEast+InternalItem")]
[Serializable(0, false)]
- private class InternalItem : Item
+ private partial class InternalItem : Item
{
[SerializableField(0)]
private AnkhNorth _item;
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 5f322c829..2ef0f6dfc 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -40,7 +40,7 @@
-
+