From 2c8d54549ceb4b5ed829ddc7c1291ce1bc5c1311 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:12:56 -0700 Subject: [PATCH] fix: Changes C# version to 11 (#1461) --- .github/workflows/build-test.yml | 4 ++-- .github/workflows/create-release.yml | 2 +- Directory.Build.props | 2 +- Projects/UOContent/Multis/Boats/BaseBoat.cs | 10 +++++++--- README.md | 12 ++++++------ azure-pipelines.yml | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index cc4d52742..3c83b946a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.304 + dotnet-version: 7.0.400 - name: Build run: ./publish.cmd Release - name: Migration Changes @@ -78,7 +78,7 @@ jobs: - name: Setup .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.302 + dotnet-version: 7.0.400 - name: Build run: ./publish.sh Release - name: Test diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fc7a4487b..bab7c56c1 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.304 + dotnet-version: 7.0.400 - name: Install NGBV uses: dotnet/nbgv@master id: nbgv diff --git a/Directory.Build.props b/Directory.Build.props index d2da34bdf..609338276 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ ModernUO 2019-2023 net7.0 - preview + 11 true true NU1603 diff --git a/Projects/UOContent/Multis/Boats/BaseBoat.cs b/Projects/UOContent/Multis/Boats/BaseBoat.cs index 0d64ea634..424a2d890 100644 --- a/Projects/UOContent/Multis/Boats/BaseBoat.cs +++ b/Projects/UOContent/Multis/Boats/BaseBoat.cs @@ -2121,12 +2121,16 @@ namespace Server.Multis } } - private class MoveTimer(BaseBoat boat, TimeSpan delay, TimeSpan interval, int single) - : Timer(delay, interval, single) + private class MoveTimer : Timer { + private readonly BaseBoat _boat; + + public MoveTimer(BaseBoat boat, TimeSpan delay, TimeSpan interval, int single) : base(delay, interval, single) => + _boat = boat; + protected override void OnTick() { - boat?.StopBoat(); + _boat?.StopBoat(); } } diff --git a/README.md b/README.md index 64a15fe24..caac52f70 100644 --- a/README.md +++ b/README.md @@ -30,22 +30,22 @@ ModernUO [![Discord](https://img.shields.io/discord/751317910504603701?logo=disc [![Arch](https://img.shields.io/badge/-Arch-1793D1?logo=archlinux&logoColor=1793D1&labelColor=222222)](https://archlinux.org/download/) #### Running the server -[![.NET](https://img.shields.io/badge/-7.0.7-5C2D91?logo=.NET&logoColor=white&labelColor=222222)](https://dotnet.microsoft.com/download/dotnet/7.0) +[![.NET](https://img.shields.io/badge/-7.0.10-5C2D91?logo=.NET&logoColor=white&labelColor=222222)](https://dotnet.microsoft.com/download/dotnet/7.0) #### Development [![git](https://img.shields.io/badge/-git-F05032?logo=git&logoColor=F05032&labelColor=222222)](https://git-scm.com/downloads) -[![.NET](https://img.shields.io/badge/-%207.0.304%20SDK-5C2D91?logo=.NET&logoColor=white&labelColor=222222)](https://dotnet.microsoft.com/download/dotnet/7.0) +[![.NET](https://img.shields.io/badge/-%207.0.400%20SDK-5C2D91?logo=.NET&logoColor=white&labelColor=222222)](https://dotnet.microsoft.com/download/dotnet/7.0) #### Supported IDEs -

Jetbrains Rider 2022.3.1+Jetbrains Rider 2023.2+spaceVSCodespaceVisual Studio 2022 v17.4+Visual Studio 2022 v17.7+

## Getting Started diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ffb4d0cdd..e8b434774 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ jobs: displayName: 'Install .NET 7' inputs: packageType: sdk - version: 7.0.304 + version: 7.0.400 - task: NuGetAuthenticate@1 - script: ./publish.cmd Release displayName: 'Build'