Successfully points to .exe file in the registry key now

PakYouMu · Jun 12, 2023 · c593547 · c593547
1 parent fa58bb5
commit c593547
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -30,13 +30,13 @@
 	<Fragment>
 		<ComponentGroup Id="ProductComponents">
 			<Component Id="PublishedFiles" Guid="fa7fb4c4-e0d3-4a86-887c-1e86f4d2856b" Directory="INSTALLFOLDER">
-				<File Id="File1" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\Newtonsoft.Json.dll" />
+				<File Id="File1" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.exe" />
+
+				<File Id="File2" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\Newtonsoft.Json.dll" />
 
-				<File Id="File2" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.deps.json" />
+				<File Id="File3" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.deps.json" />
 
-				<File Id="File3" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.dll" />
-
-				<File Id="File4" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.exe" />
+				<File Id="File4" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.dll" />
 
 				<File Id="File5" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\bin\Release\net7.0-windows\publish\The Stoic Way.pdb" />
 
@@ -51,6 +51,9 @@
 				<File Id="DataFile1" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\Data\quotes.json" />
 				<File Id="DataFile2" Source="C:\Users\youmu\source\repos\PakYouMu\The-Stoic-Way\The Stoic Way\Data\User Manual.pdf" />
 			</Component>
+
 		</ComponentGroup>
+
 	</Fragment>
+
 </Wix>
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
@@ -21,6 +21,16 @@
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\The Stoic Way\The Stoic Way.csproj">
+      <Name>The Stoic Way</Name>
+      <Project>{b4eef0f6-f5aa-4187-8574-e8f357bb0c7b}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

diff --git a/The Stoic Way/Classes/Program.cs b/The Stoic Way/Classes/Program.cs
@@ -10,8 +10,9 @@ public class AutostartManager
 
         public static void AddToAutostart()
         {
+            string exePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
             RegistryKey startupKey = Registry.CurrentUser.OpenSubKey(RunKey, true);
-            startupKey.SetValue(AppName, System.Reflection.Assembly.GetExecutingAssembly().Location);
+            startupKey.SetValue(AppName, exePath);
             startupKey.Close();
         }