Merge pull request #27 from Sewer56/fix-build-stuff

Sewer56 · web-flow · commit d76bca964ed2 · 2025-03-22T22:15:53.000Z
Fixed: Build Stuff &amp; Other Regressions from PR 24
diff --git 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
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <OutputPath>$(RELOADEDIIMODS)/reloaded.universal.fileemulationframework.afs</OutputPath>
@@ -48,6 +48,7 @@
 
   <ItemGroup>
     <PackageReference Include="AFSLib" Version="1.1.1" />
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
   </ItemGroup>
diff --git 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<AfsFileEntry>(header.NumberOfFiles);
-            if (!stream.TryRead(MemoryMarshal.Cast<AfsFileEntry, byte>(entries), out _))
+            var byteSpan = MemoryMarshal.Cast<AfsFileEntry, byte>(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
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	  <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-	  <LangVersion>preview</LangVersion>
+	  <LangVersion>10.0</LangVersion>
 	  <Nullable>enable</Nullable>
 	  <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 	  <OutputPath>$(RELOADEDIIMODS)/reloaded.universal.fileemulationframework.arc</OutputPath>
@@ -45,6 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
+	  <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
 	  <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
 	  <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
   </ItemGroup>
diff --git 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<ArcFileEntry>(header.GetNumberOfFiles());
             RandXoringStream input = new RandXoringStream(stream, header.GetNumberOfFiles());
-            if (!input.TryRead(MemoryMarshal.Cast<ArcFileEntry, byte>(entries), out _))
+            var byteSpan = MemoryMarshal.Cast<ArcFileEntry, byte>(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
@@ -44,6 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.Memory.SigScan.ReloadedII.Interfaces" Version="1.2.0" />
diff --git a/Emulator/BF.File.Emulator/BF.File.Emulator.csproj b/Emulator/BF.File.Emulator/BF.File.Emulator.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" />
   </ItemGroup>
diff --git a/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj b/Emulator/BMD.File.Emulator/BMD.File.Emulator.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" />
   </ItemGroup>
diff --git 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 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.SharedLib.CSharp.Prs.Interfaces" Version="1.0.2" />
diff --git a/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj b/Emulator/PAK.Stream.Emulator/PAK.Stream.Emulator.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.Memory.SigScan.ReloadedII.Interfaces" Version="1.2.0" />
diff --git a/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj b/Emulator/SPD.File.Emulator/SPD.File.Emulator.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Reloaded.SharedLib.Hooks" Version="1.9.0" />
diff --git a/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj b/FileEmulationFramework.Tests/FileEmulationFramework.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <IsPackable>false</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/FileEmulationFramework/FileEmulationFramework.csproj b/FileEmulationFramework/FileEmulationFramework.csproj
@@ -48,6 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
     <PackageReference Include="Reloaded.Hooks.Definitions" Version="1.15.0" />
     <PackageReference Include="Reloaded.Memory" Version="9.3.2" />
     <PackageReference Include="Reloaded.Mod.Interfaces" Version="2.3.0" ExcludeAssets="runtime" />
diff --git a/global.json b/global.json
