Skip to content

Commit

Permalink
Update to .NET 7 & some project configuration improvements (TrinityCo…
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabi authored Nov 20, 2022
1 parent fdf65de commit a1350e0
Show file tree
Hide file tree
Showing 24 changed files with 415 additions and 910 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:

env:
DOTNET_VERSION: '6.0.x'
DOTNET_VERSION: '7.0.x'

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

FROM mcr.microsoft.com/dotnet/runtime:6.0
FROM mcr.microsoft.com/dotnet/runtime:7.0
WORKDIR /app
COPY --from=build /src/WowPacketParser/bin/Release .
ENTRYPOINT ["dotnet", "WowPacketParser.dll"]
34 changes: 4 additions & 30 deletions WowPacketParser.Proto/WowPacketParser.Proto.csproj
Original file line number Diff line number Diff line change
@@ -1,39 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../default.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Authors>TrinityCore</Authors>
<Company>TrinityCore</Company>
<Copyright>Copyright © 2014-2020</Copyright>
<PackageProjectUrl>https://www.trinitycore.org/</PackageProjectUrl>
<RepositoryUrl>https://github.com/TrinityCore/WowPacketParser</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<NeutralLanguage>en</NeutralLanguage>
<Nullable>enable</Nullable>
</PropertyGroup>

<PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Debug\Parsers\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Release\Parsers\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.17.3" />
<PackageReference Include="Grpc" Version="2.38.0" />
<PackageReference Include="Grpc.Tools" Version="2.38.0">
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
<PackageReference Include="Grpc" Version="2.46.5" />
<PackageReference Include="Grpc.Tools" Version="2.50.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -42,5 +17,4 @@
<ItemGroup>
<Protobuf Include="PacketStructures\structures.proto" GrpcServices="None" />
</ItemGroup>

</Project>
53 changes: 12 additions & 41 deletions WowPacketParser.Tests/WowPacketParser.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,46 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../default.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<IsPackable>false</IsPackable>

<Authors>TrinityCore</Authors>

<Copyright>Copyright © 2013-2020</Copyright>

<PackageProjectUrl>https://www.trinitycore.org/</PackageProjectUrl>

<RepositoryUrl>https://github.com/TrinityCore/WowPacketParser</RepositoryUrl>

<RepositoryType>GitHub</RepositoryType>

<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>bin\Debug\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj" />
</ItemGroup>
</Project>
78 changes: 24 additions & 54 deletions WowPacketParser/WowPacketParser.csproj
Original file line number Diff line number Diff line change
@@ -1,56 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Company>TrinityCore</Company>
<Copyright>Copyright © 2010-2020</Copyright>
<PackageProjectUrl>https://www.trinitycore.org/</PackageProjectUrl>
<NeutralLanguage>en</NeutralLanguage>
<RepositoryUrl>https://github.com/TrinityCore/WowPacketParser</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<Authors>TrinityCore</Authors>
<StartupObject>WowPacketParser.Program</StartupObject>
</PropertyGroup>

<PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.15.0" />
<PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="RawScape.Wintellect.PowerCollections" Version="1.0.1" />
<PackageReference Include="Sigil" Version="5.0.0" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.113.7" />
</ItemGroup>

<ItemGroup>
<Reference Include="DBFileReaderLib">
<HintPath>..\packages\DBFileReaderLib.1.0.0.0\lib\DBFileReaderLib.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser.Proto\WowPacketParser.Proto.csproj" />
</ItemGroup>

<Import Project="../default.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="MySql.Data" Version="8.0.31" />
<PackageReference Include="RawScape.Wintellect.PowerCollections" Version="1.0.1" />
<PackageReference Include="Sigil" Version="5.0.0" />
<PackageReference Include="SSH.NET" Version="2020.0.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
</ItemGroup>

<ItemGroup>
<Reference Include="DBFileReaderLib">
<HintPath>..\packages\DBFileReaderLib.1.0.0.0\lib\DBFileReaderLib.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser.Proto\WowPacketParser.Proto.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,43 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Authors>TrinityCore</Authors>
<Company>TrinityCore</Company>
<Copyright>Copyright © 2015-2020</Copyright>
<PackageProjectUrl>https://www.trinitycore.org/</PackageProjectUrl>
<RepositoryUrl>https://github.com/TrinityCore/WowPacketParser</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

<PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Release\Parsers\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Debug\Parsers\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Sigil" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj">
<Private>false</Private>
<EmbedInteropTypes>false</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>

<Import Project="../default.props" />

<ItemGroup>
<PackageReference Include="Sigil" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj">
<Private>false</Private>
<EmbedInteropTypes>false</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,43 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Authors>TrinityCore</Authors>
<Company>TrinityCore</Company>
<Copyright>Copyright © 2014-2020</Copyright>
<PackageProjectUrl>https://www.trinitycore.org/</PackageProjectUrl>
<RepositoryUrl>https://github.com/TrinityCore/WowPacketParser</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

<PropertyGroup>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Debug\Parsers\</OutputPath>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\WowPacketParser\bin\Release\Parsers\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Sigil" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj">
<Private>false</Private>
<EmbedInteropTypes>false</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>

<Import Project="../default.props" />

<ItemGroup>
<PackageReference Include="Sigil" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WowPacketParser\WowPacketParser.csproj">
<Private>false</Private>
<EmbedInteropTypes>false</EmbedInteropTypes>
</ProjectReference>
</ItemGroup>
</Project>
Loading

0 comments on commit a1350e0

Please sign in to comment.