Merge pull request #75 from RWELabs/development

Emergency Patch (v220702) to Stable
RWELabs · Jul 8, 2022 · 1ab93b4 · 1ab93b4
2 parents 064dff6 + d04ab44
commit 1ab93b4
Show file tree

Hide file tree

Showing 29 changed files with 76 additions and 46 deletions.
diff --git a/... Development)/.vs/Mod Manager/FileContentIndex/21c2bafa-bbfe-41b1-9cc0-ef0144353b8d.vsidx b/... Development)/.vs/Mod Manager/FileContentIndex/21c2bafa-bbfe-41b1-9cc0-ef0144353b8d.vsidx
diff --git a/... Development)/.vs/Mod Manager/FileContentIndex/3b324781-1f0f-4af9-837a-c21d3e772c5a.vsidx b/... Development)/.vs/Mod Manager/FileContentIndex/3b324781-1f0f-4af9-837a-c21d3e772c5a.vsidx
diff --git a/... Development)/.vs/Mod Manager/FileContentIndex/67259123-d7a5-43f9-bd08-854bd7beffa0.vsidx b/... Development)/.vs/Mod Manager/FileContentIndex/67259123-d7a5-43f9-bd08-854bd7beffa0.vsidx
diff --git a/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/v17/.suo b/source-code/Mod Manager (Facelift Development)/.vs/Mod Manager/v17/.suo
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/App.config b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/App.config
@@ -41,7 +41,7 @@
                 <value />
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>220701</value>
+                <value>220702</value>
             </setting>
             <setting name="CheckUpdateOnStartup" serializeAs="String">
                 <value>TRUE</value>

diff --git a/...de/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/SMAPI-Updater.Designer.cs b/...de/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/SMAPI-Updater.Designer.cs
diff --git a/...ce-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/AssemblyInfo.cs b/...ce-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // 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("22.07.00.01")]
-[assembly: AssemblyFileVersion("22.07.00.01")]
+[assembly: AssemblyVersion("22.07.00.02")]
+[assembly: AssemblyFileVersion("22.07.00.02")]
 [assembly: NeutralResourcesLanguage("en-AU")]
diff --git a/...de/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.Designer.cs b/...de/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.Designer.cs
diff --git a/...-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.settings b/...-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.settings
@@ -33,7 +33,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="User">
-      <Value Profile="(Default)">220701</Value>
+      <Value Profile="(Default)">220702</Value>
     </Setting>
     <Setting Name="CheckUpdateOnStartup" Type="System.String" Scope="User">
       <Value Profile="(Default)">TRUE</Value>

diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Startup/Splash.cs b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Startup/Splash.cs
@@ -179,36 +179,44 @@ private void CheckForUpdates_RunWorkerCompleted(object sender, RunWorkerComplete
             }
             else
             {
-                //Alert to available update
-                DialogResult dr = MessageBox.Show("There are updates available for Stardew Mod Manager. Would you like to download and install the latest version?", "Update | Stardew Valley Mod Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-
-                //User clicks yes
-                if (dr == DialogResult.Yes)
+                if(Status.Text == "Updates available.")
                 {
-                    try
+                    //Alert to available update
+                    DialogResult dr = MessageBox.Show("There are updates available for Stardew Mod Manager. Would you like to download and install the latest version?", "Update | Stardew Valley Mod Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+                    //User clicks yes
+                    if (dr == DialogResult.Yes)
+                    {
+                        try
+                        {
+                            //Process.Start(LatestRelease);
+                            UpdateDownload download = new UpdateDownload();
+                            download.ShowDialog();
+                            Status.Text = "Launching Mod Manager...";
+                            Cleanup.Start();
+                        }
+                        catch
+                        {
+                            Status.Text = "Issue updating. Launching Mod Manager...";
+                            Cleanup.Start();
+                        }
+                    }
+                    else if (dr == DialogResult.No)
                     {
-                        //Process.Start(LatestRelease);
-                        UpdateDownload download = new UpdateDownload();
-                        download.ShowDialog();
                         Status.Text = "Launching Mod Manager...";
-                        Cleanup.Start();
+                        LaunchApplicationNow();
                     }
-                    catch
+                    else
                     {
-                        Status.Text = "Issue updating. Launching Mod Manager...";
-                        Cleanup.Start();
+                        Status.Text = "Launching Mod Manager...";
+                        LaunchApplicationNow();
                     }
                 }
-                else if(dr == DialogResult.No)
-                {
-                    Status.Text = "Launching Mod Manager...";
-                    Cleanup.Start();
-                }
                 else
                 {
-                    Status.Text = "Launching Mod Manager...";
-                    Cleanup.Start();
+                    LaunchApplicationNow();
                 }
+
             }
         }
 

diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/bin/Release/EnvDTE.dll b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/bin/Release/EnvDTE.dll
diff --git a/...od Manager (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.exe b/...od Manager (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.exe
diff --git a/...ger (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.exe.config b/...ger (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.exe.config
@@ -41,7 +41,7 @@
                 <value />
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>220701</value>
+                <value>220702</value>
             </setting>
             <setting name="CheckUpdateOnStartup" serializeAs="String">
                 <value>TRUE</value>

diff --git a/...od Manager (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.pdb b/...od Manager (Facelift Development)/Stardew Mod Manager/bin/Release/Stardew Mod Manager.pdb
diff --git a/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/bin/Release/stdole.dll b/source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/bin/Release/stdole.dll
diff --git a/...ft Development)/Stardew Mod Manager/obj/Release/DesignTimeResolveAssemblyReferences.cache b/...ft Development)/Stardew Mod Manager/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/...velopment)/Stardew Mod Manager/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/...velopment)/Stardew Mod Manager/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/...pment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.AssemblyReference.cache b/...pment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.AssemblyReference.cache
diff --git a/...pment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.CoreCompileInputs.cache b/...pment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a047d781ee0052058123ec1f66e76e50ae002f91
+21de7a232b4340ca341af0b43783e044006dc448
diff --git a/...elopment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.FileListAbsolute.txt b/...elopment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.FileListAbsolute.txt
@@ -172,3 +172,4 @@ C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manag
 C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\obj\Release\Stardew Mod Manager.exe
 C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\obj\Release\Stardew Mod Manager.pdb
 C:\Users\rwalpole\Documents\GitHub\Stardew-Valley-Mod-Framework\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\obj\Release\Stardew_Mod_Manager.Forms.SMAPI_Updater.resources
+C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\obj\Release\Stardew_Mod_Manager.Forms.SMAPI_Updater.resources
diff --git a/...opment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.GenerateResource.cache b/...opment)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.csproj.GenerateResource.cache
diff --git a/...od Manager (Facelift Development)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.exe b/...od Manager (Facelift Development)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.exe
diff --git a/...od Manager (Facelift Development)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.pdb b/...od Manager (Facelift Development)/Stardew Mod Manager/obj/Release/Stardew Mod Manager.pdb
diff --git a/... Development)/Stardew Mod Manager/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/... Development)/Stardew Mod Manager/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/version/Install Scripts/SDV_InstallerScript_320WSR.iss b/version/Install Scripts/SDV_InstallerScript_320WSR.iss
@@ -2,10 +2,15 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Stardew Valley Mod Manager"
-#define MyAppVersion "220302"
-#define MyAppPublisher "RWE Softworks, Ryan Walpole Enterprises"
-#define MyAppURL "https://www.ryanwalpole.com/"
+#define MyAppVersion "220702"
+#define MyAppPublisher "RWE Labs"
+#define MyAppURL "https://rwe.app/labs/sdvmm"
+#define RWELabsURL "https://rwelabs.github.io/"
+#define SDVMMDocs "https://rwe.app/labs/sdvmm/docs"
 #define MyAppExeName "Stardew Mod Manager.exe"
+#define MyAppAssocName "Stardew Valley Modpack File"
+#define MyAppAssocExt ".sdvmp"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -15,29 +20,39 @@ AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
+AppPublisherURL={#RWELabsURL}
+AppSupportURL={#SDVMMDocs}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName=C:\Program Files (x86)\RWE Labs\Stardew Valley Mod Manager\
+ChangesAssociations=yes
 DisableDirPage=yes
-LicenseFile=C:\Users\ryanw\Documents\GitHub\SDV\license.rtf
+LicenseFile=C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\web\license.rtf
 DefaultGroupName=Stardew Valley Mod Manager
 DisableProgramGroupPage=yes
-OutputDir=C:\Users\ryanw\Documents\GitHub\SDV\version
+OutputDir=C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\version\Latest\
 OutputBaseFilename=StardewModManagerSetup
-SetupIconFile=C:\Users\ryanw\Documents\GitHub\SDV\source-code\Mod Manager\Stardew Mod Manager\Resources\defaultsdvicon.ico
+SetupIconFile=CC:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager\Stardew Mod Manager\Resources\defaultsdvicon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
+UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayName=Stardew Valley Mod Manager
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "C:\Users\ryanw\Documents\GitHub\SDV\source-code\Mod Manager\Stardew Mod Manager\bin\Release\Stardew Mod Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\ryanw\Documents\GitHub\SDV\source-code\Mod Manager\Stardew Mod Manager\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\bin\Release\Stardew Mod Manager.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\ryanw\Documents\GitHub\Stardew-Valley-Mod-Manager\source-code\Mod Manager (Facelift Development)\Stardew Mod Manager\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\SDVMPFile.ico,0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: ""
+
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 

diff --git a/version/Latest/StardewModManagerSetup.exe b/version/Latest/StardewModManagerSetup.exe
diff --git a/version/SDVMM_v220701.exe b/version/SDVMM_v220701.exe
diff --git a/version/StardewModManagerSetup.exe b/version/StardewModManagerSetup.exe
diff --git a/web/uc.xml b/web/uc.xml
@@ -1,5 +1,4 @@
 <xml>
     CVER:
-    - 220601
-    - 220701
+    - 220702
 </xml>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a047d781ee0052058123ec1f66e76e50ae002f91
		21de7a232b4340ca341af0b43783e044006dc448
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     <xml>
         CVER:
-        - 220601
-        - 220701
+        - 220702
     </xml>