fix: Changes C# version to 11

modernuo · Aug 17, 2023 · 9e8b7cf · 9e8b7cf
1 parent 2eebf4f
commit 9e8b7cf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git 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
@@ -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
@@ -5,7 +5,7 @@
         <Company>ModernUO</Company>
         <Copyright>2019-2023</Copyright>
         <TargetFramework>net7.0</TargetFramework>
-        <LangVersion>preview</LangVersion>
+        <LangVersion>11</LangVersion>
         <PublicRelease>true</PublicRelease>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <NoWarn>NU1603</NoWarn>

diff --git a/Projects/UOContent/Multis/Boats/BaseBoat.cs b/Projects/UOContent/Multis/Boats/BaseBoat.cs
@@ -2121,12 +2121,16 @@ protected override void OnTick()
             }
         }
 
-        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
@@ -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
 
-<p align="left"><a href="https://www.jetbrains.com/rider/download"><img height="64" title="Jetbrains Rider 2022.3.1+"
-      alt="Jetbrains Rider 2022.3.1+"
+<p align="left"><a href="https://www.jetbrains.com/rider/download"><img height="64" title="Jetbrains Rider 2023.2+"
+      alt="Jetbrains Rider 2023.2+"
       src="https://user-images.githubusercontent.com/3953314/133473479-734e425c-fbb6-433a-af2d-2cc8444398e8.png"></a><img
       alt="space" width="32" src="https://user-images.githubusercontent.com/3953314/200151935-3c1521ec-16cb-487b-85a2-7454d347c585.png"><a href="https://code.visualstudio.com/download"><img height="64" title="VSCode"
       alt="VSCode"
       src="https://user-images.githubusercontent.com/3953314/200161017-7697171f-8f13-4829-95d0-8a25b59ee4c9.png"></a><img alt="space" width="32"
-      src="https://user-images.githubusercontent.com/3953314/200151935-3c1521ec-16cb-487b-85a2-7454d347c585.png"><a href="https://visualstudio.microsoft.com/vs/community/"><img height="64" title="Visual Studio 2022 v17.4+"
-      alt="Visual Studio 2022 v17.4+"
+      src="https://user-images.githubusercontent.com/3953314/200151935-3c1521ec-16cb-487b-85a2-7454d347c585.png"><a href="https://visualstudio.microsoft.com/vs/community/"><img height="64" title="Visual Studio 2022 v17.7+"
+      alt="Visual Studio 2022 v17.7+"
       src="https://user-images.githubusercontent.com/3953314/133473556-35fd48b4-6460-49b1-b7c5-b4a8c529cc04.png"></a></p>
 
 ## Getting Started

diff --git 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'