Skip to content

Commit

Permalink
Merge pull request #15 from PikminGuts92/net8
Browse files Browse the repository at this point in the history
.NET 8 Overhaul
  • Loading branch information
PikminGuts92 authored Jan 11, 2024
2 parents 57c334d + 84b6b2f commit 5206699
Show file tree
Hide file tree
Showing 274 changed files with 10,336 additions and 16,570 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[*.cs]
csharp_style_namespace_declarations=file_scoped:suggestion
indent_size = 4
indent_style = space

[*.csproj]
indent_size = 2
indent_style = space
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
on: [push, pull_request]

name: CI

jobs:
build:
name: Build (${{ matrix.osname }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: macos-latest
osname: "osx-x64"
- os: ubuntu-latest
osname: "linux-x64"
- os: windows-latest
osname: "win-x64"
env:
ZIP_NAME: ${{ github.event.repository.name }}-ci-${{ github.sha }}-${{ matrix.osname }}
OUTPUT_PATH: ./build
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: |
~/.nuget/packages
Src/**/bin/*.*
Src/**/obj/*.*
Test/**/bin/*.*
Test/**/obj/*.*
key: ${{ matrix.osname }}-build-${{ hashFiles('**/*.csproj', './*.sln') }}
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Test projects
run: dotnet test
- name: Publish applications
shell: bash
run: |
chmod +x ./build.sh
./build.sh -r ${{ matrix.osname }} -o ${{ env.OUTPUT_PATH }}
- uses: actions/upload-artifact@v3
with:
name: ${{ env.ZIP_NAME }}
path: ${{ env.OUTPUT_PATH }}
37 changes: 15 additions & 22 deletions Mackiloha.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.202
# Visual Studio Version 17
VisualStudioVersion = 17.8.34309.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mackiloha", "Src\Core\Mackiloha\Mackiloha.csproj", "{6F65B855-4191-45BD-956C-6D1513AFDADB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GLTFTools", "Src\Core\GLTFTools\GLTFTools.csproj", "{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Boom", "Src\Tools\Boom\Boom.csproj", "{37D0BE92-0C3C-4750-A379-727ECA7F79F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuperFreqCLI", "Src\UI\SuperFreqCLI\SuperFreqCLI.csproj", "{9C672ED2-8C14-47D3-9869-9B418977CFDE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuperFreq", "Src\Apps\SuperFreq\SuperFreq.csproj", "{9C672ED2-8C14-47D3-9869-9B418977CFDE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mackiloha.App", "Src\Core\Mackiloha.App\Mackiloha.App.csproj", "{508FDBB0-649B-4E2B-9FD9-1725387A37A9}"
EndProject
Expand All @@ -19,13 +15,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{22406C9C-8
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{987F25AC-8E55-443D-8D12-1DBD82521A70}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{25D21888-B83B-4FE3-9BE9-68A388DB19CE}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{25D21888-B83B-4FE3-9BE9-68A388DB19CE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArkHelper", "Src\Apps\ArkHelper\ArkHelper.csproj", "{6D58C5EC-B4F9-4BEB-945A-99A74890DC26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CF965685-7ADB-4930-AE8C-F8112900F0E6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "P9SongTool", "Src\Apps\P9SongTool\P9SongTool.csproj", "{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArkHelper", "src\UI\ArkHelper\ArkHelper.csproj", "{6D58C5EC-B4F9-4BEB-945A-99A74890DC26}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{68396441-2AE1-4B82-9B41-F61722C61EB5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "P9SongTool", "Src\UI\P9SongTool\P9SongTool.csproj", "{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mackiloha.Tests", "Test\Core\Mackiloha.Tests\Mackiloha.Tests.csproj", "{9144F00D-E22C-4A22-AD19-0444B2650FB0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -37,14 +35,6 @@ Global
{6F65B855-4191-45BD-956C-6D1513AFDADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F65B855-4191-45BD-956C-6D1513AFDADB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F65B855-4191-45BD-956C-6D1513AFDADB}.Release|Any CPU.Build.0 = Release|Any CPU
{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2}.Release|Any CPU.Build.0 = Release|Any CPU
{37D0BE92-0C3C-4750-A379-727ECA7F79F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{37D0BE92-0C3C-4750-A379-727ECA7F79F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{37D0BE92-0C3C-4750-A379-727ECA7F79F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{37D0BE92-0C3C-4750-A379-727ECA7F79F2}.Release|Any CPU.Build.0 = Release|Any CPU
{9C672ED2-8C14-47D3-9869-9B418977CFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C672ED2-8C14-47D3-9869-9B418977CFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C672ED2-8C14-47D3-9869-9B418977CFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -61,21 +51,24 @@ Global
{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3}.Release|Any CPU.Build.0 = Release|Any CPU
{9144F00D-E22C-4A22-AD19-0444B2650FB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9144F00D-E22C-4A22-AD19-0444B2650FB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9144F00D-E22C-4A22-AD19-0444B2650FB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9144F00D-E22C-4A22-AD19-0444B2650FB0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6F65B855-4191-45BD-956C-6D1513AFDADB} = {22406C9C-80F9-4706-A0E4-C6F2CB7E22BC}
{DA9AA7F3-6D6A-46F6-A692-C630CC4D1CB2} = {22406C9C-80F9-4706-A0E4-C6F2CB7E22BC}
{37D0BE92-0C3C-4750-A379-727ECA7F79F2} = {CF965685-7ADB-4930-AE8C-F8112900F0E6}
{9C672ED2-8C14-47D3-9869-9B418977CFDE} = {25D21888-B83B-4FE3-9BE9-68A388DB19CE}
{508FDBB0-649B-4E2B-9FD9-1725387A37A9} = {22406C9C-80F9-4706-A0E4-C6F2CB7E22BC}
{22406C9C-80F9-4706-A0E4-C6F2CB7E22BC} = {A049CBDE-02F6-4263-8144-5052FB1D4BB6}
{25D21888-B83B-4FE3-9BE9-68A388DB19CE} = {A049CBDE-02F6-4263-8144-5052FB1D4BB6}
{CF965685-7ADB-4930-AE8C-F8112900F0E6} = {A049CBDE-02F6-4263-8144-5052FB1D4BB6}
{6D58C5EC-B4F9-4BEB-945A-99A74890DC26} = {25D21888-B83B-4FE3-9BE9-68A388DB19CE}
{1291C14C-EEF4-467A-9DDC-CE99D0F37BE3} = {25D21888-B83B-4FE3-9BE9-68A388DB19CE}
{68396441-2AE1-4B82-9B41-F61722C61EB5} = {987F25AC-8E55-443D-8D12-1DBD82521A70}
{9144F00D-E22C-4A22-AD19-0444B2650FB0} = {68396441-2AE1-4B82-9B41-F61722C61EB5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {77AE96A2-EA7A-4043-ABE4-8537574194FF}
Expand Down
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
# Mackiloha [![Build status](https://ci.appveyor.com/api/projects/status/toda9bnsi5ur1k4b/branch/master?svg=true)](https://ci.appveyor.com/project/PikminGuts92/mackiloha/branch/master)
A suite of modding software for hacking milo engine based games. This is still very much a work-in-progress project. So don't expect perfection. Although feel free to submit [issues](https://github.com/PikminGuts92/Mackiloha/issues) for any bugs found.
# Mackiloha [![CI](https://github.com/PikminGuts92/Mackiloha/workflows/CI/badge.svg)](https://github.com/PikminGuts92/Mackiloha/actions?query=workflow%3ACI)
A suite of modding software for hacking milo engine based games. This is still very much a work-in-progress project. So don't expect perfection. Although feel free to submit [issues](https://github.com/PikminGuts92/Mackiloha/issues) for any bugs found. The latest CI build can be found [here](https://github.com/PikminGuts92/Mackiloha/actions/workflows/ci.yml).

The latest build can be found on [AppVeyor](https://ci.appveyor.com/project/PikminGuts92/mackiloha/branch/master/artifacts).

# System Requirements
You will need at least [.NET 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) runtime installed.

# Build Instructions
Run `./build.sh`
[Download](https://github.com/PikminGuts92/Mackiloha/releases/latest)

# Overview
## Ark Helper
Expand All @@ -21,6 +15,7 @@ Usage:
- Amp/KR/AntiGrav PS2: `arkhelper dir2ark ext_dir gen_dir -n "MAIN" -v 2`
- GH1/GH2 PS2: `arkhelper dir2ark ext_dir gen_dir -n "MAIN"`
- GH2 360: `arkhelper dir2ark ext_dir gen_dir -e`
- RB1 Patch: `arkhelper dir2ark ext_dir gen_dir -n "patch_ps3" -e -f -v 4`
- RB2/TBRB/GDRB PS3: `arkhelper dir2ark ext_dir gen_dir -n "main_ps3" -e -v 5`
- RB3 360: `arkhelper dir2ark ext_dir gen_dir -n "main_xbox" -e -v 6`

Expand All @@ -32,7 +27,6 @@ Usage:
- Create project from milo: `p9songtool.exe milo2proj -m temporarysec.mid temporarysec.milo_xbox project_temporarysec`
- Generate milo from project: `p9songtool.exe proj2milo project_temporarysec temporarysec.milo_xbox`


## SuperFreq (pronounced "Super Freak")
CLI tool for unpacking/packing rnd archives from milo games. These files usually use the extensions: .gh, .kr, .milo, .rnd

Expand Down
Loading

0 comments on commit 5206699

Please sign in to comment.