warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Removes SetTypeRef for generated code. (#1189)

Browse source
This commit is contained in:
Kamron Batman 2022-10-15 15:12:49 -07:00 • committed by GitHub
parent ffdc08259f
commit 8479306279
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"modernuoschemagenerator": {
"version": "2.3.0",
"version": "2.4.2",
"commands": [
"ModernUOSchemaGenerator"
]

6
Directory.Build.props
View file

@ -55,11 +55,11 @@
<AnalysisLevel>latest</AnalysisLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<Version>3.5.109</Version>
<Version>3.5.113</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<AdditionalFiles Include="..\..\Rules.ruleset" />

2
Projects/Server.Tests/Server.Tests.csproj
View file

@ -3,7 +3,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

9
Projects/Server/Guild.cs
View file

@ -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; }

9
Projects/Server/Items/Item.cs
View file

@ -219,14 +219,7 @@ public class Item : IHued, IComparable<Item>, 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
{

4
Projects/Server/Mobiles/Mobile.cs
View file

@ -355,10 +355,6 @@ public class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPropertyLis
DamageEntries = new List<DamageEntry>();
}
public void SetTypeRef(Type type)
{
}
public static bool DragEffects { get; set; } = true;
[CommandProperty(AccessLevel.GameMaster)]

4
Projects/Server/Server.csproj
View file

@ -38,11 +38,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="PollGroup" Version="1.2.1" />
<PackageReference Include="Standart.Hash.xxHash.Signed" Version="4.0.4" />
<PackageReference Include="Standart.Hash.xxHash.Signed" Version="4.0.5" />
<PackageReference Include="Zlib.Bindings" Version="1.9.2" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.2.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.3.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.4.2" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Migrations/*.v*.json" />

2
Projects/UOContent.Tests/UOContent.Tests.csproj
View file

@ -3,7 +3,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

4
Projects/UOContent/Accounting/Account.cs
View file

@ -15,10 +15,6 @@ namespace Server.Accounting
[SerializationGenerator(4)]
public partial class Account : IAccount, IComparable<Account>, 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);

4
Projects/UOContent/UOContent.csproj
View file

@ -40,7 +40,7 @@
<ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
<IncludeInPackage>false</IncludeInPackage>
</ProjectReference>
<PackageReference Include="MailKit" Version="3.3.0" />
<PackageReference Include="MailKit" Version="3.4.1" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="Zlib.Bindings" Version="1.9.2" />
@ -48,7 +48,7 @@
<PackageReference Include="Zstd.Binaries" Version="1.4.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.2.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.3.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.4.2" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="Migrations/*.v*.json" />