From 44b7fefdf2d513601c285f9e0b1d65846d80c36f Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sun, 27 Oct 2024 11:13:19 -0700 Subject: [PATCH] feat: Updates to .NET 9 --- .github/workflows/build-test.yml | 13 +++++++++---- .github/workflows/create-release.yml | 6 ++++-- Directory.Build.props | 2 +- Projects/Server/Client/ArtData.cs | 2 +- Projects/Server/Client/UOClient.cs | 2 +- Projects/Server/Items/Item.cs | 2 +- Projects/Server/Localization/Localization.cs | 4 ++-- Projects/Server/Network/NetState/NetState.cs | 2 +- Projects/Server/Serial.cs | 2 +- Projects/Server/Server.csproj | 2 +- Projects/Server/Text/StringHelpers.cs | 4 ++-- Projects/Server/TileMatrix/TileMatrix.cs | 4 ++-- Projects/Server/TileMatrix/TileMatrixPatch.cs | 4 ++-- Projects/Server/Utilities/HashUtility.cs | 2 +- .../UOContent/Special Systems/Engines/TestCenter.cs | 2 +- Projects/UOContent/UOContent.csproj | 2 +- azure-pipelines.yml | 7 ++++--- global.json | 4 ++-- version.json | 2 +- 19 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 6030049c28..d921879ce5 100644 --- 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 index ca70b62fb7..18c5ceb67d 100644 --- 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 index 68c23b16b0..c3faf934f3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Kamron Batman ModernUO 2019-2023 - net8.0 + net9.0 12 true true diff --git a/Projects/Server/Client/ArtData.cs b/Projects/Server/Client/ArtData.cs index 5294500cef..ba6e4167a9 100644 --- a/Projects/Server/Client/ArtData.cs +++ b/Projects/Server/Client/ArtData.cs @@ -66,7 +66,7 @@ public Rectangle2D GetStaticBounds(int index) Span 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 index 71d0d1d543..846f8908b1 100644 --- 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((int)fs.Length, true); - fs.Read(buffer); + _ = fs.Read(buffer); // VS_VERSION_INFO (unicode) Span vsVersionInfo = stackalloc byte[] { diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index aeab60811f..e9be609cc4 100644 --- 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 world = default) { - if (world != null) + if (world != ReadOnlySpan.Empty) { ns?.Send(world); return; diff --git a/Projects/Server/Localization/Localization.cs b/Projects/Server/Localization/Localization.cs index a92d69f249..0e08c1e0cb 100644 --- a/Projects/Server/Localization/Localization.cs +++ b/Projects/Server/Localization/Localization.cs @@ -98,7 +98,7 @@ private static Dictionary LoadClilocs(string lang, strin { using var fs = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read); Span header = stackalloc byte[6]; - fs.Read(header); + _ = fs.Read(header); byte[] data; BufferReader br; @@ -120,7 +120,7 @@ private static Dictionary LoadClilocs(string lang, strin else { data = GC.AllocateUninitializedArray((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 index 172be42aaf..1370709737 100755 --- a/Projects/Server/Network/NetState/NetState.cs +++ b/Projects/Server/Network/NetState/NetState.cs @@ -449,7 +449,7 @@ public bool GetSendBuffer(out Span buffer) public void Send(ReadOnlySpan span) { - if (span == null || this.CannotSendPackets()) + if (span == ReadOnlySpan.Empty || this.CannotSendPackets()) { return; } diff --git a/Projects/Server/Serial.cs b/Projects/Server/Serial.cs index cb96f9e968..83f537f16a 100644 --- 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 destination, out int charsWritten, ReadOnlySpan format, IFormatProvider provider - ) => format != null + ) => format != ReadOnlySpan.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 index a47b3fb1a6..6c97135b8b 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -36,7 +36,7 @@ - + diff --git a/Projects/Server/Text/StringHelpers.cs b/Projects/Server/Text/StringHelpers.cs index c84364c38e..3304587272 100644 --- 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.Empty || a.Length == 0) { return; } @@ -72,7 +72,7 @@ out int size [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string Remove(this ReadOnlySpan a, ReadOnlySpan b, StringComparison comparison) { - if (a == null) + if (a == ReadOnlySpan.Empty) { return null; } diff --git a/Projects/Server/TileMatrix/TileMatrix.cs b/Projects/Server/TileMatrix/TileMatrix.cs index 635af16e5a..3a6a7b958b 100644 --- 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(pTiles, length)); + _ = DataStream.Read(new Span(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(pTiles, 192)); + _ = MapStream.Read(new Span(pTiles, 192)); } return tiles; diff --git a/Projects/Server/TileMatrix/TileMatrixPatch.cs b/Projects/Server/TileMatrix/TileMatrixPatch.cs index 415d542f76..623da9d416 100644 --- 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(pTiles, 192)); + _ = fsData.Read(new Span(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(pTiles, length)); + _ = fsData.Read(new Span(pTiles, length)); StaticTile* pCur = pTiles, pEnd = pTiles + tileCount; diff --git a/Projects/Server/Utilities/HashUtility.cs b/Projects/Server/Utilities/HashUtility.cs index 8758466a69..9f4b6c58cf 100644 --- a/Projects/Server/Utilities/HashUtility.cs +++ b/Projects/Server/Utilities/HashUtility.cs @@ -52,7 +52,7 @@ public static ulong ComputeHash64(ReadOnlySpan str) public static uint ComputeHash32(ReadOnlySpan str) { - if (str == null) + if (str == ReadOnlySpan.Empty) { return 0; } diff --git a/Projects/UOContent/Special Systems/Engines/TestCenter.cs b/Projects/UOContent/Special Systems/Engines/TestCenter.cs index ff66b155b3..23480d38bc 100644 --- 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.Empty) { return; } diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index 5f07339eb2..eb8ca18a29 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -39,7 +39,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20dd39c712..fe21cf4686 100644 --- 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 index f6ba4b7d13..6d77f62145 100644 --- 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 index 7870d130e7..6221a7f263 100644 --- 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" }