From e34be4047c82aefb4ae5cf3759089c1f9002596a Mon Sep 17 00:00:00 2001 From: pants64DS Date: Mon, 10 Mar 2025 21:13:25 +0200 Subject: [PATCH 1/4] Add dependencies as Git submodules --- .gitmodules | 9 +++++++++ GotaSequenceLib | 1 + GotaSoundBank | 1 + GotaSoundIO | 1 + Nitro Studio 2.sln | 6 +++--- Nitro Studio 2/Nitro Studio 2.csproj | 6 +++--- NitroFileLoader/NitroFileLoader.csproj | 6 +++--- 7 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 .gitmodules create mode 160000 GotaSequenceLib create mode 160000 GotaSoundBank create mode 160000 GotaSoundIO diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1609dd5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "GotaSoundIO"] + path = GotaSoundIO + url = git@github.com:Gota7/GotaSoundIO.git +[submodule "GotaSoundBank"] + path = GotaSoundBank + url = git@github.com:Gota7/GotaSoundBank.git +[submodule "GotaSequenceLib"] + path = GotaSequenceLib + url = git@github.com:Gota7/GotaSequenceLib.git diff --git a/GotaSequenceLib b/GotaSequenceLib new file mode 160000 index 0000000..44c5737 --- /dev/null +++ b/GotaSequenceLib @@ -0,0 +1 @@ +Subproject commit 44c5737b353f3e4a4fe96012af9414466b5c14e1 diff --git a/GotaSoundBank b/GotaSoundBank new file mode 160000 index 0000000..d2373ba --- /dev/null +++ b/GotaSoundBank @@ -0,0 +1 @@ +Subproject commit d2373ba7070df5f1d295c792749ab3bc27971475 diff --git a/GotaSoundIO b/GotaSoundIO new file mode 160000 index 0000000..53ec290 --- /dev/null +++ b/GotaSoundIO @@ -0,0 +1 @@ +Subproject commit 53ec290cff9f50b2ed7dd64bf22e38d8bdca3745 diff --git a/Nitro Studio 2.sln b/Nitro Studio 2.sln index 4a3e77a..48d3ecf 100644 --- a/Nitro Studio 2.sln +++ b/Nitro Studio 2.sln @@ -7,11 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nitro Studio 2", "Nitro Stu EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NitroFileLoader", "NitroFileLoader\NitroFileLoader.csproj", "{132D5DA0-BD98-4FCB-9A9C-73556C16B2C0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSoundIO", "..\GotaSoundIO\GotaSoundIO.csproj", "{F0BCD085-9DC4-4B22-B791-C725CA8E46F6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSoundIO", "GotaSoundIO\GotaSoundIO.csproj", "{F0BCD085-9DC4-4B22-B791-C725CA8E46F6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSequenceLib", "..\GotaSequenceLib\GotaSequenceLib.csproj", "{D06E248A-EF7A-4F1E-9A71-76204D61FF80}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSequenceLib", "GotaSequenceLib\GotaSequenceLib.csproj", "{D06E248A-EF7A-4F1E-9A71-76204D61FF80}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSoundBank", "..\GotaSoundBank\GotaSoundBank.csproj", "{2642E217-5595-4E4B-9B6D-F5CFD937EB25}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GotaSoundBank", "GotaSoundBank\GotaSoundBank.csproj", "{2642E217-5595-4E4B-9B6D-F5CFD937EB25}" EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "NitroStudio2Installer", "NitroStudio2Installer\NitroStudio2Installer.vdproj", "{BD16D3DB-EEE2-40D1-B1D9-B28F60BDBF62}" EndProject diff --git a/Nitro Studio 2/Nitro Studio 2.csproj b/Nitro Studio 2/Nitro Studio 2.csproj index 4b168d4..29b4060 100644 --- a/Nitro Studio 2/Nitro Studio 2.csproj +++ b/Nitro Studio 2/Nitro Studio 2.csproj @@ -212,15 +212,15 @@ - + {D06E248A-EF7A-4F1E-9A71-76204D61FF80} GotaSequenceLib - + {2642e217-5595-4e4b-9b6d-f5cfd937eb25} GotaSoundBank - + {f0bcd085-9dc4-4b22-b791-c725ca8e46f6} GotaSoundIO diff --git a/NitroFileLoader/NitroFileLoader.csproj b/NitroFileLoader/NitroFileLoader.csproj index 4fb7314..9636d8c 100644 --- a/NitroFileLoader/NitroFileLoader.csproj +++ b/NitroFileLoader/NitroFileLoader.csproj @@ -71,15 +71,15 @@ - + {D06E248A-EF7A-4F1E-9A71-76204D61FF80} GotaSequenceLib - + {2642E217-5595-4E4B-9B6D-F5CFD937EB25} GotaSoundBank - + {f0bcd085-9dc4-4b22-b791-c725ca8e46f6} GotaSoundIO From 5a2f431c6b46f7a5a8d0465e20dbbb5d379da655 Mon Sep 17 00:00:00 2001 From: pants64DS <39012306+pants64DS@users.noreply.github.com> Date: Mon, 10 Mar 2025 21:33:54 +0200 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 902e627..ae5e1fb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ If Nitro Studio was so good, why isn't there a Nitro Studio 2? Well it was so good so now there's a 2nd one that's even better. It's a lot easier to use over the original and has a ton of new features! Try it out! # Dependencies -This tool requires my SoundIO, Sound Bank and Sequence libraries. +This tool requires my SoundIO, Sound Bank and Sequence libraries. Clone this repository with the `--recurse-submodules` flag to fetch them automatically. SoundIO: https://github.com/Gota7/GotaSoundIO From dee73afdab5c053cabb167aa1484181475de3d3e Mon Sep 17 00:00:00 2001 From: pants64DS Date: Mon, 10 Mar 2025 21:53:27 +0200 Subject: [PATCH 3/4] Require MSBuild version 16 --- Nitro Studio 2/Nitro Studio 2.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Nitro Studio 2/Nitro Studio 2.csproj b/Nitro Studio 2/Nitro Studio 2.csproj index 29b4060..273e3bb 100644 --- a/Nitro Studio 2/Nitro Studio 2.csproj +++ b/Nitro Studio 2/Nitro Studio 2.csproj @@ -358,6 +358,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + 16 + From 30b56520d25799d3e9d6e8862e1cfd52560c924c Mon Sep 17 00:00:00 2001 From: pants64DS Date: Mon, 10 Mar 2025 22:00:54 +0200 Subject: [PATCH 4/4] Update packages --- Nitro Studio 2/Nitro Studio 2.csproj | 17 ++++++++--------- Nitro Studio 2/packages.config | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Nitro Studio 2/Nitro Studio 2.csproj b/Nitro Studio 2/Nitro Studio 2.csproj index 273e3bb..01596ad 100644 --- a/Nitro Studio 2/Nitro Studio 2.csproj +++ b/Nitro Studio 2/Nitro Studio 2.csproj @@ -1,6 +1,6 @@  - + Debug @@ -43,8 +43,8 @@ ..\..\CrashAudioConverter\ColorSlider.dll - - ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll + + ..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll ..\packages\log4net.1.2.10\lib\2.0\log4net.dll @@ -353,15 +353,14 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - 16 - - - + + + + \ No newline at end of file diff --git a/Nitro Studio 2/packages.config b/Nitro Studio 2/packages.config index 892c618..7dcd965 100644 --- a/Nitro Studio 2/packages.config +++ b/Nitro Studio 2/packages.config @@ -1,7 +1,7 @@  - - + +