feat: Updates to .NET 9

modernuo · Nov 12, 2024 · 44b7fef · 44b7fef
1 parent 1d08572
commit 44b7fef
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 30 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -23,10 +23,13 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
-    - name: Setup .NET 8
+    - name: Install .NET 9
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-quality: 'preview'
+        dotnet-version: '9.0.x'
+  #          global-json-file: global.json
+
     - name: Install Prerequisites
       run: |
         brew update
@@ -86,10 +89,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
-      - name: Setup .NET 8
+      - name: Install .NET 9
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-quality: 'preview'
+          dotnet-version: '9.0.x'
+#          global-json-file: global.json
       - name: Build
         run: ./publish.cmd Release
       - name: Test

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -14,10 +14,12 @@ jobs:
       with:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
         token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-    - name: Setup .NET 8
+    - name: Install .NET 9
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-quality: 'preview'
+        dotnet-version: '9.0.x'
+      #          global-json-file: global.json
     - name: Install NGBV
       uses: dotnet/nbgv@master
       id: nbgv

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
         <Authors>Kamron Batman</Authors>
         <Company>ModernUO</Company>
         <Copyright>2019-2023</Copyright>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <LangVersion>12</LangVersion>
         <PublicRelease>true</PublicRelease>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/Projects/Server/Client/ArtData.cs b/Projects/Server/Client/ArtData.cs
@@ -66,7 +66,7 @@ public Rectangle2D GetStaticBounds(int index)
 
         Span<ushort> buffer = stackalloc ushort[entry.Size / 2];
         _dataStream.Seek(entry.Offset, SeekOrigin.Begin);
-        _dataStream.Read(MemoryMarshal.AsBytes(buffer));
+        _ = _dataStream.Read(MemoryMarshal.AsBytes(buffer));
 
         var width = buffer[2];
         var height = buffer[3];

diff --git a/Projects/Server/Client/UOClient.cs b/Projects/Server/Client/UOClient.cs
@@ -95,7 +95,7 @@ private static ClientVersion DetectClassicClient()
         {
             using FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
             var buffer = GC.AllocateUninitializedArray<byte>((int)fs.Length, true);
-            fs.Read(buffer);
+            _ = fs.Read(buffer);
             // VS_VERSION_INFO (unicode)
             Span<byte> vsVersionInfo = stackalloc byte[]
             {

diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
@@ -3077,7 +3077,7 @@ public virtual void SendOPLPacketTo(NetState ns)
 
     public virtual void SendWorldPacketTo(NetState ns, ReadOnlySpan<byte> world = default)
     {
-        if (world != null)
+        if (world != ReadOnlySpan<byte>.Empty)
         {
             ns?.Send(world);
             return;

diff --git a/Projects/Server/Localization/Localization.cs b/Projects/Server/Localization/Localization.cs
@@ -98,7 +98,7 @@ private static Dictionary<int, LocalizationEntry> LoadClilocs(string lang, strin
         {
             using var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read);
             Span<byte> header = stackalloc byte[6];
-            fs.Read(header);
+            _ = fs.Read(header);
 
             byte[] data;
             BufferReader br;
@@ -120,7 +120,7 @@ private static Dictionary<int, LocalizationEntry> LoadClilocs(string lang, strin
             else
             {
                 data = GC.AllocateUninitializedArray<byte>((int)fs.Length - 6);
-                fs.Read(data);
+                _ = fs.Read(data);
                 br = new BufferReader(data);
             }
 

diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs
@@ -449,7 +449,7 @@ public bool GetSendBuffer(out Span<byte> buffer)
 
     public void Send(ReadOnlySpan<byte> span)
     {
-        if (span == null || this.CannotSendPackets())
+        if (span == ReadOnlySpan<byte>.Empty || this.CannotSendPackets())
         {
             return;
         }

diff --git a/Projects/Server/Serial.cs b/Projects/Server/Serial.cs
@@ -138,7 +138,7 @@ public string ToString(string format, IFormatProvider formatProvider)
 
     public bool TryFormat(
         Span<char> destination, out int charsWritten, ReadOnlySpan<char> format, IFormatProvider provider
-    ) => format != null
+    ) => format != ReadOnlySpan<char>.Empty
         ? Value.TryFormat(destination, out charsWritten, format, provider)
         : destination.TryWrite(provider, $"0x{Value:X8}", out charsWritten);
 

diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
@@ -36,7 +36,7 @@
         <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
         <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
         <PackageReference Include="PollGroup" Version="1.5.1" />
-        <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
+        <PackageReference Include="System.IO.Hashing" Version="9.0.0-rc.2.24473.5" />
 
         <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.9.1" />
         <PackageReference Include="ModernUO.Serialization.Generator" Version="2.11.3" />

diff --git a/Projects/Server/Text/StringHelpers.cs b/Projects/Server/Text/StringHelpers.cs
@@ -37,7 +37,7 @@ out int size
     )
     {
         size = 0;
-        if (a == null || a.Length == 0)
+        if (a == ReadOnlySpan<char>.Empty || a.Length == 0)
         {
             return;
         }
@@ -72,7 +72,7 @@ out int size
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static string Remove(this ReadOnlySpan<char> a, ReadOnlySpan<char> b, StringComparison comparison)
     {
-        if (a == null)
+        if (a == ReadOnlySpan<char>.Empty)
         {
             return null;
         }

diff --git a/Projects/Server/TileMatrix/TileMatrix.cs b/Projects/Server/TileMatrix/TileMatrix.cs
@@ -338,7 +338,7 @@ private unsafe StaticTile[][][] ReadStaticBlock(int x, int y)
 
             fixed (StaticTile* pTiles = staTiles)
             {
-                DataStream.Read(new Span<byte>(pTiles, length));
+                _ = DataStream.Read(new Span<byte>(pTiles, length));
 
                 if (m_Lists == null)
                 {
@@ -423,7 +423,7 @@ private unsafe LandTile[] ReadLandBlock(int x, int y)
 
             fixed (LandTile* pTiles = tiles)
             {
-                MapStream.Read(new Span<byte>(pTiles, 192));
+                _ = MapStream.Read(new Span<byte>(pTiles, 192));
             }
 
             return tiles;

diff --git a/Projects/Server/TileMatrix/TileMatrixPatch.cs b/Projects/Server/TileMatrix/TileMatrixPatch.cs
@@ -89,7 +89,7 @@ private unsafe int PatchLand(TileMatrix matrix, string dataPath, string indexPat
             var tiles = new LandTile[64];
             fixed (LandTile* pTiles = tiles)
             {
-                fsData.Read(new Span<byte>(pTiles, 192));
+                _ = fsData.Read(new Span<byte>(pTiles, 192));
             }
 
             matrix.SetLandBlock(x, y, tiles);
@@ -149,7 +149,7 @@ private unsafe int PatchStatics(TileMatrix matrix, string dataPath, string index
 
             fixed (StaticTile* pTiles = staTiles)
             {
-                fsData.Read(new Span<byte>(pTiles, length));
+                _ = fsData.Read(new Span<byte>(pTiles, length));
 
                 StaticTile* pCur = pTiles, pEnd = pTiles + tileCount;
 

diff --git a/Projects/Server/Utilities/HashUtility.cs b/Projects/Server/Utilities/HashUtility.cs
@@ -52,7 +52,7 @@ public static ulong ComputeHash64(ReadOnlySpan<char> str)
 
     public static uint ComputeHash32(ReadOnlySpan<char> str)
     {
-        if (str == null)
+        if (str == ReadOnlySpan<char>.Empty)
         {
             return 0;
         }

diff --git a/Projects/UOContent/Special Systems/Engines/TestCenter.cs b/Projects/UOContent/Special Systems/Engines/TestCenter.cs
@@ -47,7 +47,7 @@ private static void EventSink_Speech(SpeechEventArgs args)
 
                 var name = tokenizer.MoveNext() ? tokenizer.Current : null;
                 var valueStr = tokenizer.MoveNext() ? tokenizer.Current : null;
-                if (valueStr == null)
+                if (valueStr == ReadOnlySpan<char>.Empty)
                 {
                     return;
                 }

diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
@@ -39,7 +39,7 @@
         </ProjectReference>
         <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
         <PackageReference Include="MailKit" Version="4.8.0" />
-        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-rc.2.24473.5" />
         <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
         <PackageReference Include="Argon2.Bindings" Version="1.16.1" />
         <PackageReference Include="ModernUO.CodeGeneratedEvents.Annotations" Version="1.0.0" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,10 +15,11 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET 8'
+    displayName: 'Install .NET 9'
     inputs:
-      packageType: sdk
-      version: '8.0.x'
+#      useGlobalJson: true
+      version: '9.0.x'
+      includePreviewVersions: true
   - task: NuGetAuthenticate@1
   - script: ./publish.cmd Release
     displayName: 'Build'

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
diff --git a/version.json b/version.json
@@ -1,4 +1,4 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.13.6"
+  "version": "0.13.7"
 }