Skip to content

Commit

Permalink
Update to .NET 8 (TrinityCore#840)
Browse files Browse the repository at this point in the history 
* Update to .NET 8

* Update README & Github Action file.
  • Loading branch information
@Fabi
Fabi authored Mar 26, 2024
1 parent dcbfc66 commit 1c91e5b
Show file tree
Hide file tree
Showing 26 changed files with 367 additions and 366 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:

env:
DOTNET_VERSION: '7.0.x'
DOTNET_VERSION: '8.0.x'

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY . .
RUN dotnet build -c Release

FROM mcr.microsoft.com/dotnet/runtime:7.0
FROM mcr.microsoft.com/dotnet/runtime:8.0
WORKDIR /app
COPY --from=build /src/WowPacketParser/bin/Release .
COPY --chmod=755 ./docker-entrypoint.sh /
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WowPacketParser (WPP)
Usage
-----

* Compile WowPacketParser using Visual Studio 2022 (with .NET 7.0 SDK) or .NET 7.0 SDK (Linux/OSX).
* Compile WowPacketParser using Visual Studio 2022 (with .NET 8.0 SDK) or .NET 8.0 SDK (Linux/macOS).
Alternatively you can download compiled binaries from the links [below](#nightly-builds).
* Edit `WowPacketParser.dll.config` to fit your needs.
* Drag one or more files (.pkt or .bin) to `WowPacketParser.exe`.
Expand Down Expand Up @@ -39,9 +39,9 @@ and `wpp_data_objectnames.sql` has some data to fill the database.

Nightly Builds
--------------
.NET 7.0 SDK or .NET 7.0 Runtime is needed!
.NET 8.0 SDK or .NET 8.0 Runtime is needed!

[Download .NET 7.0 here!](https://dotnet.microsoft.com/download/dotnet/7.0)
[Download .NET 8.0 here!](https://dotnet.microsoft.com/download/dotnet/8.0)

##### Windows
- Visual Studio 2022
Expand Down
6 changes: 3 additions & 3 deletions WowPacketParser.Proto/WowPacketParser.Proto.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
<PackageReference Include="Grpc" Version="2.46.5" />
<PackageReference Include="Grpc.Tools" Version="2.50.0">
<PackageReference Include="Google.Protobuf" Version="3.26.0" />
<PackageReference Include="Grpc" Version="2.46.6" />
<PackageReference Include="Grpc.Tools" Version="2.62.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
84 changes: 42 additions & 42 deletions WowPacketParser.Tests/Misc/BiDictionaryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,35 @@ public void Cleanup()
[Test]
public void TestCount()
{
Assert.AreEqual(3, _biDictionary.Count);
Assert.That(3, Is.EqualTo(_biDictionary.Count));
}

[Test]
public void TestClear()
{
_biDictionary.Clear();

Assert.AreEqual(0, _biDictionary.Count);
Assert.That(0, Is.EqualTo(_biDictionary.Count));
}

[Test]
public void TestIndexers()
{
Assert.AreEqual(5.0, _biDictionary[10]);
Assert.AreEqual(int.MaxValue, _biDictionary[double.MinValue]);
Assert.That(5.0, Is.EqualTo(_biDictionary[10]));
Assert.That(int.MaxValue,Is.EqualTo( _biDictionary[double.MinValue]));

Assert.AreEqual(default(int), _biDictionary[1.0]);
Assert.AreEqual(default(double), _biDictionary[1]);
Assert.That(default(int), Is.EqualTo(_biDictionary[1.0]));
Assert.That(default(double), Is.EqualTo(_biDictionary[1]));
}

[Test]
public void TestGetters()
{
Assert.AreEqual(5.0, _biDictionary.GetByFirst(10));
Assert.AreEqual(int.MaxValue, _biDictionary.GetBySecond(double.MinValue));
Assert.That(5.0, Is.EqualTo(_biDictionary.GetByFirst(10)));
Assert.That(int.MaxValue, Is.EqualTo(_biDictionary.GetBySecond(double.MinValue)));

Assert.AreEqual(default(double), _biDictionary.GetByFirst(1));
Assert.AreEqual(default(int), _biDictionary.GetBySecond(1.0));
Assert.That(default(double), Is.EqualTo(_biDictionary.GetByFirst(1)));
Assert.That(default(int), Is.EqualTo(_biDictionary.GetBySecond(1.0)));
}

[Test]
Expand All @@ -66,42 +66,42 @@ public void TestTryGetters()
int first;
double second;

Assert.IsTrue(_biDictionary.TryGetByFirst(10, out second));
Assert.IsTrue(_biDictionary.TryGetBySecond(double.MinValue, out first));
Assert.That(_biDictionary.TryGetByFirst(10, out second), Is.True);
Assert.That(_biDictionary.TryGetBySecond(double.MinValue, out first), Is.True);

Assert.AreEqual(5.0, second);
Assert.AreEqual(int.MaxValue, first);
Assert.That(5.0, Is.EqualTo(second));
Assert.That(int.MaxValue, Is.EqualTo(first));

Assert.IsFalse(_biDictionary.TryGetByFirst(1, out second));
Assert.IsFalse(_biDictionary.TryGetBySecond(1.0, out first));
Assert.That(_biDictionary.TryGetByFirst(1, out second), Is.False);
Assert.That(_biDictionary.TryGetBySecond(1.0, out first), Is.False);

Assert.IsTrue(_biDictionary.TryGetValue(10, out second));
Assert.IsTrue(_biDictionary.TryGetValue(double.MinValue, out first));
Assert.That(_biDictionary.TryGetValue(10, out second), Is.True);
Assert.That(_biDictionary.TryGetValue(double.MinValue, out first), Is.True);

Assert.AreEqual(5.0, second);
Assert.AreEqual(int.MaxValue, first);
Assert.That(5.0, Is.EqualTo(second));
Assert.That(int.MaxValue,Is.EqualTo(first));

Assert.IsFalse(_biDictionary.TryGetValue(1, out second));
Assert.IsFalse(_biDictionary.TryGetValue(1.0, out first));
Assert.That(_biDictionary.TryGetValue(1, out second), Is.False);
Assert.That(_biDictionary.TryGetValue(1.0, out first), Is.False);
}

[Test]
public void TestSetters()
{
_biDictionary[10] = 6.0;
Assert.AreEqual(6.0, _biDictionary.GetByFirst(10));
Assert.That(6.0, Is.EqualTo(_biDictionary.GetByFirst(10)));

_biDictionary[7.0] = 10;
Assert.AreEqual(10, _biDictionary.GetBySecond(7.0));
Assert.That(10, Is.EqualTo(_biDictionary.GetBySecond(7.0)));
}

[Test]
public void TestEnumerator()
{
Assert.IsNotNull(_biDictionary.GetEnumerator());
Assert.That(_biDictionary.GetEnumerator(), Is.Not.Null);

foreach (KeyValuePair<int, double> keyValuePair in _biDictionary)
Assert.IsNotNull(keyValuePair);
Assert.That(keyValuePair, Is.Not.Null);
}

[Test]
Expand All @@ -112,8 +112,8 @@ public void TestAdd()
_biDictionary.Add(new KeyValuePair<int, double>(1, 2.0));
_biDictionary.Add(new KeyValuePair<double, int>(3.0, 4));

Assert.AreEqual(6, _biDictionary.Count);
Assert.AreEqual(default(double), _biDictionary[default(int)]);
Assert.That(6, Is.EqualTo(_biDictionary.Count));
Assert.That(default(double), Is.EqualTo(_biDictionary[default(int)]));
}

[Test]
Expand All @@ -124,31 +124,31 @@ public void TestRemove()
_biDictionary.Add(4, 6.0);
_biDictionary.Add(7, 8.0);

Assert.IsTrue(_biDictionary.Remove(1));
Assert.IsTrue(_biDictionary.Remove(4.0));
Assert.That(_biDictionary.Remove(1), Is.True);
Assert.That(_biDictionary.Remove(4.0), Is.True);

Assert.AreEqual(5, _biDictionary.Count);
Assert.That(5, Is.EqualTo(_biDictionary.Count));

Assert.IsFalse(_biDictionary.Remove(1));
Assert.IsFalse(_biDictionary.Remove(4.0));
Assert.That(_biDictionary.Remove(1), Is.False);
Assert.That(_biDictionary.Remove(4.0), Is.False);

Assert.IsTrue(_biDictionary.Remove(new KeyValuePair<int, double>(4, 6.0)));
Assert.IsTrue(_biDictionary.Remove(new KeyValuePair<double, int>(8.0, 7)));
Assert.That(_biDictionary.Remove(new KeyValuePair<int, double>(4, 6.0)), Is.True);
Assert.That(_biDictionary.Remove(new KeyValuePair<double, int>(8.0, 7)), Is.True);

Assert.AreEqual(3, _biDictionary.Count);
Assert.That(3, Is.EqualTo(_biDictionary.Count));
}

[Test]
public void TestContains()
{
Assert.IsTrue(_biDictionary.Contains(new KeyValuePair<int, double>(10, 5.0)));
Assert.IsTrue(_biDictionary.Contains(new KeyValuePair<double, int>(5.0, 10)));
Assert.That(_biDictionary.Contains(new KeyValuePair<int, double>(10, 5.0)), Is.True);
Assert.That(_biDictionary.Contains(new KeyValuePair<double, int>(5.0, 10)), Is.True);

Assert.IsTrue(_biDictionary.ContainsKey(10));
Assert.IsTrue(_biDictionary.ContainsValue(5.0));
Assert.That(_biDictionary.ContainsKey(10), Is.True);
Assert.That(_biDictionary.ContainsValue(5.0), Is.True);

Assert.IsTrue(_biDictionary.ContainsKey(5.0));
Assert.IsTrue(_biDictionary.ContainsValue(10));
Assert.That(_biDictionary.ContainsKey(5.0), Is.True);
Assert.That(_biDictionary.ContainsValue(10), Is.True);
}
}
}
20 changes: 10 additions & 10 deletions WowPacketParser.Tests/Misc/BitTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,36 @@ public void TestConstructor()
{
var bit = new Bit();

Assert.IsNotNull(bit);
Assert.IsFalse(bit);
Assert.That(bit, Is.Not.Null);
Assert.That<bool>(bit, Is.False);
}

[Test]
public void TestOperators()
{
Bit bit = true;
Assert.IsTrue(bit);
Assert.IsTrue(1 == bit);
Assert.That<bool>(bit, Is.True);
Assert.That(1 == bit, Is.True);

bit = false;
Assert.IsFalse(bit);
Assert.IsTrue(0 == bit);
Assert.That<bool>(bit, Is.False);
Assert.That(0 == bit, Is.True);

bit = 1;
Assert.IsTrue(bit);
Assert.That<bool>(bit, Is.True);

bit = 0;
Assert.IsFalse(bit);
Assert.That<bool>(bit, Is.False);
}

[Test]
public void TestToString()
{
Bit bit = false;
Assert.AreEqual("False", bit.ToString());
Assert.That("False", Is.EqualTo(bit.ToString()));

bit = true;
Assert.AreEqual("True", bit.ToString());
Assert.That("True", Is.EqualTo(bit.ToString()));
}
}
}
38 changes: 19 additions & 19 deletions WowPacketParser.Tests/Misc/ClientVersionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,61 +17,61 @@ public void Initialize()
[Test]
public void TestAddedInVersion()
{
Assert.IsTrue(ClientVersion.AddedInVersion(ClientType.WrathOfTheLichKing));
Assert.IsFalse(ClientVersion.AddedInVersion(ClientType.Cataclysm));
Assert.That(ClientVersion.AddedInVersion(ClientType.WrathOfTheLichKing), Is.True);
Assert.That(ClientVersion.AddedInVersion(ClientType.Cataclysm), Is.False);

Assert.IsTrue(ClientVersion.AddedInVersion(ClientVersionBuild.V2_4_3_8606));
Assert.IsFalse(ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_5a_12340));
Assert.That(ClientVersion.AddedInVersion(ClientVersionBuild.V2_4_3_8606), Is.True);
Assert.That(ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_5a_12340), Is.False);
}

[Test]
public void TestRemovedInVersion()
{
Assert.IsFalse(ClientVersion.RemovedInVersion(ClientType.WrathOfTheLichKing));
Assert.IsTrue(ClientVersion.RemovedInVersion(ClientType.Cataclysm));
Assert.That(ClientVersion.RemovedInVersion(ClientType.WrathOfTheLichKing), Is.False);
Assert.That(ClientVersion.RemovedInVersion(ClientType.Cataclysm), Is.True);

Assert.IsFalse(ClientVersion.RemovedInVersion(ClientVersionBuild.V2_4_3_8606));
Assert.IsTrue(ClientVersion.RemovedInVersion(ClientVersionBuild.V3_3_5a_12340));
Assert.That(ClientVersion.RemovedInVersion(ClientVersionBuild.V2_4_3_8606), Is.False);
Assert.That(ClientVersion.RemovedInVersion(ClientVersionBuild.V3_3_5a_12340), Is.True);
}

[Test]
public void TestIsUndefined()
{
Assert.IsFalse(ClientVersion.IsUndefined());
Assert.That(ClientVersion.IsUndefined(), Is.False);

ClientVersion.SetVersion(ClientVersionBuild.Zero);

Assert.IsTrue(ClientVersion.IsUndefined());
Assert.That(ClientVersion.IsUndefined(), Is.True);
}

[Test]
public void TestBuildGetters()
{
Assert.AreEqual(ClientVersionBuild.V3_3_3_11685, ClientVersion.Build);
Assert.AreEqual(11685, ClientVersion.BuildInt);
Assert.AreEqual("V3_3_3_11685", ClientVersion.VersionString);
Assert.That(ClientVersionBuild.V3_3_3_11685, Is.EqualTo(ClientVersion.Build));
Assert.That(11685, Is.EqualTo(ClientVersion.BuildInt));
Assert.That("V3_3_3_11685", Is.EqualTo(ClientVersion.VersionString));
}

[Test]
public void TestSetVersion()
{
ClientVersion.SetVersion(new DateTime(1991, 1, 1));
Assert.IsTrue(ClientVersion.IsUndefined());
Assert.That(ClientVersion.IsUndefined(), Is.True);

ClientVersion.SetVersion(new DateTime(2025, 1, 1));
Assert.IsFalse(ClientVersion.IsUndefined());
Assert.That(ClientVersion.IsUndefined(), Is.False);

ClientVersion.SetVersion(new DateTime(2010, 6, 29));
Assert.AreEqual(ClientVersionBuild.V3_3_5a_12340, ClientVersion.Build);
Assert.That(ClientVersionBuild.V3_3_5a_12340, Is.EqualTo(ClientVersion.Build));

ClientVersion.SetVersion(new DateTime(2015, 7, 9));
Assert.AreEqual(ClientVersionBuild.V6_2_0_20253, ClientVersion.Build);
Assert.That(ClientVersionBuild.V6_2_0_20253, Is.EqualTo(ClientVersion.Build));

ClientVersion.SetVersion(ClientVersionBuild.V1_12_1_5875);
Assert.AreEqual(ClientVersionBuild.V1_12_1_5875, ClientVersion.Build);
Assert.That(ClientVersionBuild.V1_12_1_5875, Is.EqualTo(ClientVersion.Build));

ClientVersion.SetVersion(ClientVersionBuild.V6_2_0_20253);
Assert.AreEqual(ClientVersionBuild.V6_2_0_20253, ClientVersion.Build);
Assert.That(ClientVersionBuild.V6_2_0_20253, Is.EqualTo(ClientVersion.Build));
}
}
}
Loading

0 comments on commit 1c91e5b

Please sign in to comment.