diff --git a/.vs/SM64 NX Launcher/v16/.suo b/.vs/SM64 NX Launcher/v16/.suo index deb8172..78a3380 100644 Binary files a/.vs/SM64 NX Launcher/v16/.suo and b/.vs/SM64 NX Launcher/v16/.suo differ diff --git a/SM64 EX Launcher/Properties/AssemblyInfo.cs b/SM64 EX Launcher/Properties/AssemblyInfo.cs index 7c581da..911912b 100644 --- a/SM64 EX Launcher/Properties/AssemblyInfo.cs +++ b/SM64 EX Launcher/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/SM64 EX Launcher/SM64 NX Launcher.csproj b/SM64 EX Launcher/SM64 NX Launcher.csproj index 9548fca..0f75c11 100644 --- a/SM64 EX Launcher/SM64 NX Launcher.csproj +++ b/SM64 EX Launcher/SM64 NX Launcher.csproj @@ -16,6 +16,7 @@ + false publish\ true Disk @@ -27,8 +28,7 @@ false true 0 - 1.0.0.%2a - false + 1.1.0.%2a false true @@ -38,7 +38,8 @@ full false bin\Debug\ - DEBUG;TRACE + + prompt 4 false @@ -48,7 +49,8 @@ pdbonly true bin\Release\ - TRACE + + prompt 4 false @@ -56,6 +58,9 @@ Designcontest-Casino-Star.ico + + false + ..\packages\LibGit2Sharp.0.26.2\lib\net46\LibGit2Sharp.dll diff --git a/SM64 EX Launcher/bin/Release/SM64 NX Launcher.pdb b/SM64 EX Launcher/bin/Release/SM64 NX Launcher.pdb deleted file mode 100644 index ae30924..0000000 Binary files a/SM64 EX Launcher/bin/Release/SM64 NX Launcher.pdb and /dev/null differ diff --git a/SM64 EX Launcher/bin/Release/bin/SM64 NX Launcher.pdb b/SM64 EX Launcher/bin/Release/bin/SM64 NX Launcher.pdb deleted file mode 100644 index 014639c..0000000 Binary files a/SM64 EX Launcher/bin/Release/bin/SM64 NX Launcher.pdb and /dev/null differ diff --git a/SM64 EX Launcher/mainForm.cs b/SM64 EX Launcher/mainForm.cs index 5bf763a..30653ce 100644 --- a/SM64 EX Launcher/mainForm.cs +++ b/SM64 EX Launcher/mainForm.cs @@ -111,6 +111,7 @@ private void mainForm_Shown(object sender, EventArgs e) return; } if (buildBase()) return; + MessageBox.Show("Your repository, dependencies, and !!base.pak have all been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); } } @@ -120,6 +121,7 @@ private void mainForm_Shown(object sender, EventArgs e) if (answer == DialogResult.Yes) { updateRepo(); + MessageBox.Show("Your repository has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); } } } @@ -185,6 +187,7 @@ private void pullJSON() StreamReader reader = new StreamReader(response.GetResponseStream()); File.WriteAllText(pakJSON, reader.ReadToEnd()); } + MessageBox.Show("Your PAK List has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void pullJSON(object sender, EventArgs e) @@ -199,6 +202,7 @@ private void pullJSON(object sender, EventArgs e) } populateGrid(); + MessageBox.Show("Your PAK list has been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void outputText_TextChanged(object sender, EventArgs e) @@ -259,11 +263,11 @@ private bool launch() private void enablePAK(PAK pak) { - if (Directory.Exists(Path.Combine(pakDir,"~" + modDir))) + if (Directory.Exists(Path.Combine(pakDir,"~" + pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, pak.modDir))) { - Directory.Move(Path.Combine(pakDir, "~" + modDir), Path.Combine(pakDir, pak.modDir)); + Directory.Move(Path.Combine(pakDir, "~" + pak.modDir), Path.Combine(pakDir, pak.modDir)); } - else if (!Directory.Exists(Path.Combine(pakDir, pak.modDir))) + else if (!Directory.Exists(Path.Combine(pakDir, pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, "~" + pak.modDir))) { downloadPak(pak); } @@ -271,7 +275,7 @@ private void enablePAK(PAK pak) private void disablePAK(PAK pak) { - if (Directory.Exists(Path.Combine(pakDir,pak.modDir))) + if (Directory.Exists(Path.Combine(pakDir, pak.modDir)) && !Directory.Exists(Path.Combine(pakDir, "~" + pak.modDir))) { Directory.Move(Path.Combine(pakDir, pak.modDir), Path.Combine(pakDir, "~" + pak.modDir)); } @@ -403,6 +407,7 @@ private void updateButton_Click(object sender, EventArgs e) MessageBox.Show("Unable to update dependencies.\n\nCheck the log output or provide it for support.", "Dependency Update Failed", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + MessageBox.Show("Your repository and dependencies have been successfully updated.", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information); } private Boolean checkHash(string file) { diff --git a/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csproj.GenerateResource.cache b/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csproj.GenerateResource.cache index ac15811..53f6f9c 100644 Binary files a/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csproj.GenerateResource.cache and b/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csproj.GenerateResource.cache differ diff --git a/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csprojAssemblyReference.cache b/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csprojAssemblyReference.cache index 776b95c..155b1ba 100644 Binary files a/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csprojAssemblyReference.cache and b/SM64 EX Launcher/obj/Debug/SM64 NX Launcher.csprojAssemblyReference.cache differ diff --git a/SM64 EX Launcher/obj/Release/DesignTimeResolveAssemblyReferences.cache b/SM64 EX Launcher/obj/Release/DesignTimeResolveAssemblyReferences.cache index 3798d4d..0237cfa 100644 Binary files a/SM64 EX Launcher/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/SM64 EX Launcher/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.CoreCompileInputs.cache b/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.CoreCompileInputs.cache index 8df1f6a..374de8b 100644 --- a/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.CoreCompileInputs.cache +++ b/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c0858cee4b19038ee1be55b31fe6bc13cbfdac86 +b5e4498920e16538428bf44a2d793221a3b23168 diff --git a/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.FileListAbsolute.txt b/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.FileListAbsolute.txt index e386ea9..399ed21 100644 --- a/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.FileListAbsolute.txt +++ b/SM64 EX Launcher/obj/Release/SM64 NX Launcher.csproj.FileListAbsolute.txt @@ -21,7 +21,6 @@ C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Micros C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Microsoft.Scripting.xml C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Microsoft.Scripting.Metadata.xml C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\bin\Release\Newtonsoft.Json.xml -C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csprojAssemblyReference.cache C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.outputForm.resources C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.mainForm.resources C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64_NX_Launcher.Properties.Resources.resources @@ -31,3 +30,4 @@ C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 N C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csproj.CopyComplete C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.exe C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.pdb +C:\Users\antho\source\repos\SM64 EX Launcher\SM64 EX Launcher\obj\Release\SM64 NX Launcher.csprojAssemblyReference.cache diff --git a/SM64 NX Launcher Installer/SM64 NX Launcher Installer.vdproj b/SM64 NX Launcher Installer/SM64 NX Launcher Installer.vdproj index b82c2a9..f632b90 100644 --- a/SM64 NX Launcher Installer/SM64 NX Launcher Installer.vdproj +++ b/SM64 NX Launcher Installer/SM64 NX Launcher Installer.vdproj @@ -128,6 +128,14 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } } } "Release" @@ -421,21 +429,21 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SM64 NX Launcher Installer" - "ProductCode" = "8:{CBEC53D1-F807-4A41-8B23-2F2B0263FDD2}" - "PackageCode" = "8:{76B4121D-440D-41FA-B9CC-39B1147378BC}" + "ProductCode" = "8:{E93C9DFE-1F52-4C7A-9959-17F3E7953D6A}" + "PackageCode" = "8:{13C8C764-CDAC-492E-8C80-7DD7650DB3B5}" "UpgradeCode" = "8:{E1A5A0B0-A06C-4AE9-A55D-4BD58F171B12}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:Default Company Name" + "ProductVersion" = "8:1.0.1" + "Manufacturer" = "8:RadzPrower" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" "Title" = "8:SM64 NX Launcher Installer" "Subject" = "8:" - "ARPCONTACT" = "8:Default Company Name" + "ARPCONTACT" = "8:RadzPrower" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:"