diff --git a/.github/workflows/reloaded.yml b/.github/workflows/reloaded.yml index 571366f..f98f97f 100644 --- a/.github/workflows/reloaded.yml +++ b/.github/workflows/reloaded.yml @@ -65,7 +65,7 @@ env: PUBLISH_PATH: ./Publish # Default value is official Reloaded package server. - NUGET_URL: http://packages.sewer56.moe:5000/v3/index.json + NUGET_URL: https://packages.sewer56.moe/v3/index.json IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }} RELEASE_TAG: ${{ github.ref_name }} @@ -88,10 +88,10 @@ jobs: with: dotnet-version: 5.0.x - - name: Setup .NET Core SDK (7.0) + - name: Setup .NET Core SDK (9.0) uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 9.0.x - name: Setup Node.js uses: actions/setup-node@v2 diff --git a/Emulator/AFS.Stream.Emulator/AFS.Stream.Emulator.csproj b/Emulator/AFS.Stream.Emulator/AFS.Stream.Emulator.csproj index 99f43c7..21a08e5 100644 --- a/Emulator/AFS.Stream.Emulator/AFS.Stream.Emulator.csproj +++ b/Emulator/AFS.Stream.Emulator/AFS.Stream.Emulator.csproj @@ -1,10 +1,10 @@  - net5.0-windows + net9.0 false true - preview + 10.0 enable True $(RELOADEDIIMODS)/reloaded.universal.fileemulationframework.afs @@ -48,6 +48,7 @@ + diff --git a/Emulator/AFS.Stream.Emulator/Afs/AfsBuilder.cs b/Emulator/AFS.Stream.Emulator/Afs/AfsBuilder.cs index 9119680..2f51681 100644 --- a/Emulator/AFS.Stream.Emulator/Afs/AfsBuilder.cs +++ b/Emulator/AFS.Stream.Emulator/Afs/AfsBuilder.cs @@ -6,7 +6,7 @@ using FileEmulationFramework.Lib.Utilities; using Microsoft.Win32.SafeHandles; using Reloaded.Memory.Extensions; -using Reloaded.Memory.Streams; +using StreamExtensions = FileEmulationFramework.Lib.Utilities.StreamExtensions; // Aliasing for readability, since our assembly name has priority over 'stream' using Strim = System.IO.Stream; @@ -151,7 +151,8 @@ private AfsFileEntry[] GetEntriesFromFile(IntPtr handle) ThrowHelpers.IO("Failed to read original AFS header start."); var entries = GC.AllocateUninitializedArray(header.NumberOfFiles); - if (!stream.TryRead(MemoryMarshal.Cast(entries), out _)) + var byteSpan = MemoryMarshal.Cast(entries); + if (!StreamExtensions.TryRead(stream, byteSpan, out _)) ThrowHelpers.IO("Failed to read original AFS header pos+offset."); return entries; diff --git a/Emulator/ARC.Stream.Emulator/ARC.Stream.Emulator.csproj b/Emulator/ARC.Stream.Emulator/ARC.Stream.Emulator.csproj index cf488c3..c4c6c68 100644 --- a/Emulator/ARC.Stream.Emulator/ARC.Stream.Emulator.csproj +++ b/Emulator/ARC.Stream.Emulator/ARC.Stream.Emulator.csproj @@ -1,10 +1,10 @@  - net7.0 + net9.0 false true - preview + 10.0 enable True $(RELOADEDIIMODS)/reloaded.universal.fileemulationframework.arc @@ -45,6 +45,7 @@ + diff --git a/Emulator/ARC.Stream.Emulator/Arc/ArcBuilder.cs b/Emulator/ARC.Stream.Emulator/Arc/ArcBuilder.cs index 41010d6..a1ff89e 100644 --- a/Emulator/ARC.Stream.Emulator/Arc/ArcBuilder.cs +++ b/Emulator/ARC.Stream.Emulator/Arc/ArcBuilder.cs @@ -6,7 +6,7 @@ using FileEmulationFramework.Lib.Utilities; using Microsoft.Win32.SafeHandles; using Reloaded.Memory.Extensions; -using Reloaded.Memory.Streams; +using StreamExtensions = FileEmulationFramework.Lib.Utilities.StreamExtensions; // Aliasing for readability, since our assembly name has priority over 'stream' using Strim = System.IO.Stream; @@ -112,7 +112,8 @@ private ArcFileEntry[] GetEntriesFromFile(IntPtr handle) var entries = GC.AllocateUninitializedArray(header.GetNumberOfFiles()); RandXoringStream input = new RandXoringStream(stream, header.GetNumberOfFiles()); - if (!input.TryRead(MemoryMarshal.Cast(entries), out _)) + var byteSpan = MemoryMarshal.Cast(entries); + if (!StreamExtensions.TryRead(input, result: byteSpan, numBytesRead: out _)) ThrowHelpers.IO("Failed to read original ARC header pos+offset."); input.Dispose(); diff --git a/Emulator/AWB.Stream.Emulator/AWB.Stream.Emulator.csproj b/Emulator/AWB.Stream.Emulator/AWB.Stream.Emulator.csproj index d2e468d..2f3b1f5 100644 --- a/Emulator/AWB.Stream.Emulator/AWB.Stream.Emulator.csproj +++ b/Emulator/AWB.Stream.Emulator/AWB.Stream.Emulator.csproj @@ -44,6 +44,7 @@ + diff --git a/Emulator/BF.File.Emulator/BF.File.Emulator.csproj b/Emulator/BF.File.Emulator/BF.File.Emulator.csproj index 643c3df..8cfd1d6 100644 --- a/Emulator/BF.File.Emulator/BF.File.Emulator.csproj +++ b/Emulator/BF.File.Emulator/BF.File.Emulator.csproj @@ -46,6 +46,7 @@ + diff --git a/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj b/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj index 5dd0267..8ea724b 100644 --- a/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj +++ b/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj @@ -46,6 +46,7 @@ + diff --git a/Emulator/ONE.Heroes.Stream.Emulator/ONE.Heroes.Stream.Emulator.csproj b/Emulator/ONE.Heroes.Stream.Emulator/ONE.Heroes.Stream.Emulator.csproj index 977126f..5e7a755 100644 --- a/Emulator/ONE.Heroes.Stream.Emulator/ONE.Heroes.Stream.Emulator.csproj +++ b/Emulator/ONE.Heroes.Stream.Emulator/ONE.Heroes.Stream.Emulator.csproj @@ -48,6 +48,7 @@ + diff --git a/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj b/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj index 59a0fab..eebc48a 100644 --- a/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj +++ b/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj @@ -46,6 +46,7 @@ + diff --git a/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj b/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj index 922df6c..c01aedf 100644 --- a/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj +++ b/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj @@ -45,6 +45,7 @@ + diff --git a/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj b/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj index 618221c..320d0d2 100644 --- a/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj +++ b/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net9.0-windows 10.0 false true diff --git a/FileEmulationFramework/FileEmulationFramework.csproj b/FileEmulationFramework/FileEmulationFramework.csproj index a571ffd..2e556ff 100644 --- a/FileEmulationFramework/FileEmulationFramework.csproj +++ b/FileEmulationFramework/FileEmulationFramework.csproj @@ -48,6 +48,7 @@ + diff --git a/global.json b/global.json deleted file mode 100644 index d4e0b89..0000000 --- a/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "8.0.0", - "rollForward": "latestFeature", - "allowPrerelease": true - } -} \ No newline at end of file