Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .NET 8 #778

Merged
merged 9 commits into from
Nov 1, 2024
Merged

Update to .NET 8 #778

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f694ae2
Update to .NET 8.
jhett12321 Oct 31, 2024
f6050ea
Update NWNX/NWN.Core/NWN.Native.
jhett12321 Oct 31, 2024
aa0a6ba
Update Paket.Core to 8.0.3.
jhett12321 Oct 31, 2024
31d78e4
Enable core host traces for tests.
jhett12321 Oct 31, 2024
c951765
Simplify working directory/build context.
jhett12321 Oct 31, 2024
a102e4e
Update NWNX to 30482a7.
jhett12321 Nov 1, 2024
fc5acc9
Enable debug logs for test run.
jhett12321 Nov 1, 2024
6e80507
IReadOnlyList dep. injection broken in .NET 8, use IList instead.
jhett12321 Nov 1, 2024
66cd2b9
Use collection expression.
jhett12321 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NWNX_VERSION=2f732e7
NWNX_VERSION=d54327e
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1.9.0
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Build
run: dotnet build --configuration Debug
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1.9.0
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Build
run: dotnet build --configuration Release
Expand All @@ -86,7 +86,7 @@ jobs:

- name: Run Tests
run: |
docker compose build --build-arg NWNX_VERSION=${{ steps.env_vars.outputs.nwnx_version }} --build-arg BINARY_PATH=NWN.Anvil/bin/Release/net7.0
docker compose build --build-arg NWNX_VERSION=${{ steps.env_vars.outputs.nwnx_version }} --build-arg BINARY_PATH=NWN.Anvil/bin/Release/net8.0
docker compose up
working-directory: NWN.Anvil.Tests/bin/Release/

Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1.9.0
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Tag Commit
if: github.event.inputs.tag != ''
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1.9.0
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'

- name: Download Release Artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
push: true
build-args: |
NWNX_VERSION=${{ steps.env_vars.outputs.nwnx_version }}
BINARY_PATH=/binaries/net7.0
BINARY_PATH=/binaries/net8.0
labels: |
org.opencontainers.image.title=Anvil
org.opencontainers.image.description=Anvil is a C# library that attempts to wrap Neverwinter Script with C# niceties and contexts, instead of a collection of functions. This image contains a NWNX server configured to use Anvil.
Expand Down
6 changes: 3 additions & 3 deletions NWN.Anvil.TestRunner/NWN.Anvil.TestRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

Expand Down Expand Up @@ -69,8 +69,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NWN.Core" Version="8193.36.1" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.4" PrivateAssets="compile" />
<PackageReference Include="NWN.Core" Version="8193.36.5" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.7" PrivateAssets="compile" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions NWN.Anvil.Tests/NWN.Anvil.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

Expand Down Expand Up @@ -42,8 +42,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NWN.Core" Version="8193.36.1" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.4" PrivateAssets="compile" />
<PackageReference Include="NWN.Core" Version="8193.36.5" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.7" PrivateAssets="compile" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions NWN.Anvil/NWN.Anvil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- ci.yml: BINARY_PATH
- NWN.Anvil.Tests/docker-compose.yml
-->
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

Expand Down Expand Up @@ -65,8 +65,8 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="Paket.Core" Version="7.2.1" PrivateAssets="all" />
<PackageReference Include="NWN.Core" Version="8193.36.1" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.4" PrivateAssets="compile" />
<PackageReference Include="NWN.Core" Version="8193.36.5" PrivateAssets="compile" />
<PackageReference Include="NWN.Native" Version="8193.36.7" PrivateAssets="compile" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion NWN.Anvil/src/main/Internal/Assemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

internal static readonly string AssemblyDir = Path.GetDirectoryName(Anvil.Location)!;

internal static readonly string[] TargetFrameworks = { "net7.0" };
internal static readonly string[] TargetFrameworks = { "net8.0" };
Fixed Show fixed Hide fixed

public static bool IsReservedName(string name)
{
Expand Down
4 changes: 2 additions & 2 deletions dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ RUN apt-get update \
inotify-tools \
patch \
unzip \
dotnet-runtime-7.0 \
dotnet-apphost-pack-7.0 \
dotnet-runtime-8.0 \
dotnet-apphost-pack-8.0 \
&& rm -rf /var/cache/apt /var/lib/apt/lists/*

# Copy Anvil Binaries
Expand Down
4 changes: 2 additions & 2 deletions docs/NWN.Anvil.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

Expand Down Expand Up @@ -30,7 +30,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NWN.Core" Version="8193.36.1" PrivateAssets="compile" />
<PackageReference Include="NWN.Core" Version="8193.36.5" PrivateAssets="compile" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading