diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dffbbc3c..5d8f126f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,25 +2,17 @@ name: TagTool Build
on:
push:
- branches: [ "dev" ]
+ branches: [ "net10" ]
jobs:
- build-win:
- env:
- TARGET_FRAMEWORK: net8.0-windows
- PLATFORM: x64
-
- strategy:
- matrix:
- BUILD_CONFIGURATION: [ Debug, Release ]
+ build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
-
- - name: Initialize Submodules
- uses: snickerbockers/submodules-init@v4
+ with:
+ submodules: 'true'
- name: Determine Version
id: determine_version
@@ -28,38 +20,38 @@ jobs:
$version = (git rev-parse --short=7 HEAD).Trim()
Write-Output "Version determined: $version"
Write-Host "::set-output name=version::$version"
-
- - name: Install 7Zip
- run: |
- Invoke-WebRequest -Uri "https://www.7-zip.org/a/7z1900-x64.msi" -OutFile "$env:TEMP\7z.msi"
- Start-Process -Wait -FilePath msiexec -ArgumentList "/i", "$env:TEMP\7z.msi", "/quiet"
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.x'
+ dotnet-version: '10.x'
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.5
+
+ - name: Install 7Zip
+ run: |
+ Invoke-WebRequest -Uri "https://www.7-zip.org/a/7z1900-x64.msi" -OutFile "$env:TEMP\7z.msi"
+ Start-Process -Wait -FilePath msiexec -ArgumentList "/i", "$env:TEMP\7z.msi", "/quiet"
- name: Restore Packages
- run: nuget restore TagTool.sln
+ run: nuget restore TagTool.slnx
+
- name: Build solution
- working-directory: ${{ env.GITHUB_WORKSPACE }}
- run: msbuild TagTool.sln /t:rebuild /p:Platform=${{ env.PLATFORM }} /p:Configuration=${{ matrix.BUILD_CONFIGURATION }} /p:TargetFramework=${{ env.TARGET_FRAMEWORK }}
+ run: msbuild TagTool.slnx -t:rebuild -property:Platform=x64 -property:Configuration=Release
- name: Zip Release
run: |
- & "C:\Program Files\7-Zip\7z.exe" a ${{ matrix.BUILD_CONFIGURATION }}_${{ env.PLATFORM }}.7z ./TagTool/bin/${{ env.PLATFORM }}/${{ matrix.BUILD_CONFIGURATION }}/${{ env.TARGET_FRAMEWORK }}*
+ & "C:\Program Files\7-Zip\7z.exe" a Release_x64.7z ./TagTool/bin/x64/Release/*
- name: Create Release
uses: softprops/action-gh-release@v1
with:
- files: ${{ matrix.BUILD_CONFIGURATION }}_${{ env.PLATFORM }}.7z
+ files: Release_x64.7z
tag_name: ${{ steps.determine_version.outputs.version }}
draft: false
prerelease: false
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100644
index 79e7784d..00000000
--- a/.nuget/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ShaderGenerator b/ShaderGenerator
index 94502a27..d41a48d1 160000
--- a/ShaderGenerator
+++ b/ShaderGenerator
@@ -1 +1 @@
-Subproject commit 94502a27764dfb8e94dd2e559280d3d10f0387b4
+Subproject commit d41a48d10339ccde4b126df18f1bbafc6ac61a5b
diff --git a/TagTool.sln b/TagTool.sln
deleted file mode 100644
index b3e0c3a9..00000000
--- a/TagTool.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.34024.191
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TagTool", "TagTool\TagTool.csproj", "{42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HaloShaderGenerator", "ShaderGenerator\HaloShaderGenerator\HaloShaderGenerator.csproj", "{17BFEFFB-1619-4647-BA40-3CD1D87FD774}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Debug|x64.ActiveCfg = Debug|x64
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Debug|x64.Build.0 = Debug|x64
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Debug|x86.ActiveCfg = Debug|x86
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Debug|x86.Build.0 = Debug|x86
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Release|x64.ActiveCfg = Release|x64
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Release|x64.Build.0 = Release|x64
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Release|x86.ActiveCfg = Release|x86
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}.Release|x86.Build.0 = Release|x86
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Debug|x64.ActiveCfg = Debug|x64
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Debug|x64.Build.0 = Debug|x64
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Debug|x86.ActiveCfg = Debug|x86
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Debug|x86.Build.0 = Debug|x86
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Release|x64.ActiveCfg = Release|x64
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Release|x64.Build.0 = Release|x64
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Release|x86.ActiveCfg = Release|x86
- {17BFEFFB-1619-4647-BA40-3CD1D87FD774}.Release|x86.Build.0 = Release|x86
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {1EE3E5AD-5339-4F4B-A40B-83C627BD2794}
- EndGlobalSection
-EndGlobal
diff --git a/TagTool.slnx b/TagTool.slnx
new file mode 100644
index 00000000..6ea3e470
--- /dev/null
+++ b/TagTool.slnx
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TagTool/Audio/Utils/AudioUtils.cs b/TagTool/Audio/Utils/AudioUtils.cs
index 801e79c0..7699d98c 100644
--- a/TagTool/Audio/Utils/AudioUtils.cs
+++ b/TagTool/Audio/Utils/AudioUtils.cs
@@ -51,7 +51,7 @@ public static byte[] ConvertPCM32ToPCM16(ReadOnlySpan data)
{
var newData = new byte[data.Length / 2];
var input = MemoryMarshal.Cast(data);
- var output = MemoryMarshal.Cast(newData);
+ var output = MemoryMarshal.Cast(newData.AsSpan());
for (int i = 0; i < input.Length; i++)
{
diff --git a/TagTool/Commands/Files/ConvertVariantCommand.cs b/TagTool/Commands/Files/ConvertVariantCommand.cs
index 5d8ab010..2c638ac0 100644
--- a/TagTool/Commands/Files/ConvertVariantCommand.cs
+++ b/TagTool/Commands/Files/ConvertVariantCommand.cs
@@ -178,7 +178,7 @@ private async Task ConvertFileAsync(string filePath)
private void FixBlfEndianness(FileStream stream, Blf blf)
{
var buffer = new byte[stream.Length];
- stream.Read(buffer, 0, buffer.Length);
+ stream.ReadExactly(buffer);
using (var memoryStream = new MemoryStream(buffer))
{
diff --git a/TagTool/Common/FileTimeUtil.cs b/TagTool/Common/FileTimeUtil.cs
index a3540a24..ace4c192 100644
--- a/TagTool/Common/FileTimeUtil.cs
+++ b/TagTool/Common/FileTimeUtil.cs
@@ -20,7 +20,7 @@ public static DateTime GetLinkerTimestampUtc(string filePath)
using (var file = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
- file.Read(bytes, 0, bytes.Length);
+ file.ReadExactly(bytes);
}
var headerPos = BitConverter.ToInt32(bytes, peHeaderOffset);
diff --git a/TagTool/Properties/AssemblyInfo.cs b/TagTool/Properties/AssemblyInfo.cs
index e4556751..165f76de 100644
--- a/TagTool/Properties/AssemblyInfo.cs
+++ b/TagTool/Properties/AssemblyInfo.cs
@@ -1,35 +1,17 @@
using System.Reflection;
using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
[assembly: AssemblyTitle("TagTool-NET")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TagTool-NET")]
-[assembly: AssemblyCopyright("Copyright © 2025")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright © 2025")]
+[assembly: AssemblyTrademark("MtnDewIt ™ 2025")]
[assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("aa6e96fc-04b5-4b3b-9963-f6587190bc39")]
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/TagTool/Properties/Resources.Designer.cs b/TagTool/Properties/Resources.Designer.cs
deleted file mode 100644
index 0bc74674..00000000
--- a/TagTool/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace TagTool.Properties {
- using System;
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TagTool.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/TagTool/Properties/Resources.resx b/TagTool/Properties/Resources.resx
deleted file mode 100644
index 29dcb1b3..00000000
--- a/TagTool/Properties/Resources.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/TagTool/TagTool.csproj b/TagTool/TagTool.csproj
index cb547ba5..d31ba9a5 100644
--- a/TagTool/TagTool.csproj
+++ b/TagTool/TagTool.csproj
@@ -1,28 +1,24 @@
- {42814DEE-5A94-4901-BDA9-28AFD2D4F5AC}
Exe
- Properties
- TagTool
- TagTool
TagTool.ico
- net8.0-windows
- none
- true
- false
+ net10.0-windows
+ 14
true
- $(NoWarn),CS0169,CS0414,CS0649,CS1591;CA1416
- 12
+ false
+ true
+ none
false
true
+ $(NoWarn),CS0169,CS0414,CS0649,CS1591;CA1416
obj\$(Platform)\$(ConfigurationName)\$(TargetFramework)\Documentation.xml
false
win-x64;win-x86
- x86;x64
+ x64;x86
Release
x64
-
- false
+
+ false
@@ -48,12 +44,6 @@
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-