From 64d50585441e3c2c4ece6c854d11161ef631e29f Mon Sep 17 00:00:00 2001
From: Ferdinand Schober <ferdinandschober20@gmail.com>
Date: Wed, 19 Mar 2025 01:06:43 +0100
Subject: [PATCH] bundle vc_redist.x64.exe

---
 wix/{ => bundle}/.gitignore                |  0
 wix/bundle/Bundle.wixproj                  | 16 +++++++++
 wix/bundle/Bundle.wxs                      | 42 ++++++++++++++++++++++
 wix/lan-mouse/.gitignore                   |  3 ++
 wix/{ => lan-mouse}/Folders.wxs            |  0
 wix/{ => lan-mouse}/LanMouse.wixproj       |  0
 wix/{ => lan-mouse}/LanMouseComponents.wxs |  6 ++--
 wix/{ => lan-mouse}/Package.en-us.wxl      |  0
 wix/{package.wxs => lan-mouse/Package.wxs} |  9 +++--
 wix/{ => lan-mouse}/build.ps1              |  0
 10 files changed, 68 insertions(+), 8 deletions(-)
 rename wix/{ => bundle}/.gitignore (100%)
 create mode 100644 wix/bundle/Bundle.wixproj
 create mode 100644 wix/bundle/Bundle.wxs
 create mode 100644 wix/lan-mouse/.gitignore
 rename wix/{ => lan-mouse}/Folders.wxs (100%)
 rename wix/{ => lan-mouse}/LanMouse.wixproj (100%)
 rename wix/{ => lan-mouse}/LanMouseComponents.wxs (83%)
 rename wix/{ => lan-mouse}/Package.en-us.wxl (100%)
 rename wix/{package.wxs => lan-mouse/Package.wxs} (71%)
 rename wix/{ => lan-mouse}/build.ps1 (100%)

diff --git a/wix/.gitignore b/wix/bundle/.gitignore
similarity index 100%
rename from wix/.gitignore
rename to wix/bundle/.gitignore
diff --git a/wix/bundle/Bundle.wixproj b/wix/bundle/Bundle.wixproj
new file mode 100644
index 0000000..8e0b901
--- /dev/null
+++ b/wix/bundle/Bundle.wixproj
@@ -0,0 +1,16 @@
+<Project Sdk="WixToolset.Sdk/5.0.0">
+	<PropertyGroup>
+		<OutputType>Bundle</OutputType>
+		<TargetExt>.exe</TargetExt>
+		<Platforms>x64</Platforms>
+		<InstallerPlatform>x64</InstallerPlatform>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="WixToolset.Heat">
+		  <Version>5.0.2</Version>
+		</PackageReference>
+		<PackageReference Include="WixToolset.Bal.wixext">
+		  <Version>5.0.2</Version>
+		</PackageReference>
+	</ItemGroup>
+</Project>
diff --git a/wix/bundle/Bundle.wxs b/wix/bundle/Bundle.wxs
new file mode 100644
index 0000000..9c9e3c3
--- /dev/null
+++ b/wix/bundle/Bundle.wxs
@@ -0,0 +1,42 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+    xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+
+    <Bundle
+        Name="Lan Mouse"
+        Version="0.10.0"
+        UpgradeCode="{39A9744D-9D6E-4CD3-A84F-9E034786A7B1}"
+        Compressed="no"
+        SplashScreenSourceFile="icon.ico">
+
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication
+                LicenseUrl=""
+                Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
+
+        <Chain>
+            <!-- Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810 -->
+            <ExePackage
+                Id="VC_REDIST_X64"
+                DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
+                PerMachine="yes"
+                Permanent="yes"
+                Protocol="burn"
+                InstallCondition="VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
+                DetectCondition="(VCRUNTIME_X64_VER &gt;= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
+                InstallArguments="/install /quiet /norestart"
+                RepairArguments="/repair /quiet /norestart"
+                UninstallArguments="/uninstall /quiet /norestart">
+                <ExePackagePayload
+                    Name="VC_redist.x64.exe"
+                    ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
+                    Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
+                    Hash="5935B69F5138AC3FBC33813C74DA853269BA079F910936AEFA95E230C6092B92F6225BFFB594E5DD35FF29BF260E4B35F91ADEDE90FDF5F062030D8666FD0104"
+                    Size="25397512"
+                    Version="14.40.33810.0"
+                    DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
+            </ExePackage>
+            <MsiPackage SourceFile="..\lan-mouse\bin\Debug\en-US\LanMouse.msi" Compressed="yes"/>
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/wix/lan-mouse/.gitignore b/wix/lan-mouse/.gitignore
new file mode 100644
index 0000000..38eac8c
--- /dev/null
+++ b/wix/lan-mouse/.gitignore
@@ -0,0 +1,3 @@
+/bin
+/obj
+icon.ico
diff --git a/wix/Folders.wxs b/wix/lan-mouse/Folders.wxs
similarity index 100%
rename from wix/Folders.wxs
rename to wix/lan-mouse/Folders.wxs
diff --git a/wix/LanMouse.wixproj b/wix/lan-mouse/LanMouse.wixproj
similarity index 100%
rename from wix/LanMouse.wixproj
rename to wix/lan-mouse/LanMouse.wixproj
diff --git a/wix/LanMouseComponents.wxs b/wix/lan-mouse/LanMouseComponents.wxs
similarity index 83%
rename from wix/LanMouseComponents.wxs
rename to wix/lan-mouse/LanMouseComponents.wxs
index 1fe2323..8466c14 100644
--- a/wix/LanMouseComponents.wxs
+++ b/wix/lan-mouse/LanMouseComponents.wxs
@@ -3,11 +3,11 @@
 		<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER" Subdirectory="bin">
 			<Component Guid="{ECB52D3E-28AD-4BEC-B9DF-E01CCAB356BE}">
 				<!-- the main binary -->
-				<File Source="..\target\release\lan-mouse.exe"/>
+				<File Source="..\..\target\release\lan-mouse.exe"/>
 
 				<!-- visual c runtime dll -->
-				<File Source="C:\windows\system32\VCRUNTIME140.dll"/>
-				<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>
+				<!--<File Source="C:\windows\system32\VCRUNTIME140.dll"/>-->
+				<!--<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>-->
 			</Component>
 			<!-- start menu entry-->
 			<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">
diff --git a/wix/Package.en-us.wxl b/wix/lan-mouse/Package.en-us.wxl
similarity index 100%
rename from wix/Package.en-us.wxl
rename to wix/lan-mouse/Package.en-us.wxl
diff --git a/wix/package.wxs b/wix/lan-mouse/Package.wxs
similarity index 71%
rename from wix/package.wxs
rename to wix/lan-mouse/Package.wxs
index 9b16a25..69a469b 100644
--- a/wix/package.wxs
+++ b/wix/lan-mouse/Package.wxs
@@ -1,9 +1,8 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package
-	  Name="Lan Mouse"
-	  Manufacturer="Ferdinand Schober"
-	  Version="0.10.0.0"
-	  UpgradeCode="a330cd60-4c35-4a54-8bb6-75b3049b46c6">
+  <Package Name="Lan Mouse"
+		   Manufacturer="Ferdinand Schober"
+		   Version="0.10.0.0"
+		   UpgradeCode="{a330cd60-4c35-4a54-8bb6-75b3049b46c6}">
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
     <MediaTemplate EmbedCab="yes"/>
diff --git a/wix/build.ps1 b/wix/lan-mouse/build.ps1
similarity index 100%
rename from wix/build.ps1
rename to wix/lan-mouse/build.ps1