From 93fc295bf2c1fbff09f3806e463472d3dc970624 Mon Sep 17 00:00:00 2001
From: Terry MacDonald <terry.macdonald@cosive.com>
Date: Mon, 28 Dec 2020 23:17:13 +1300
Subject: [PATCH] Fixing automatic admin version upgrade

Upgrade processs wasn't upgrading using
elevated privileges. Appears to be doing so
now.
---
 DisplayMagician/Program.cs                    |   2 +-
 DisplayMagician/UIForms/MainForm.cs           |   2 +
 .../DisplayMagicianSetup.wixproj              |   2 +-
 .../DisplayMagicianFilesFragment.wxs          | 110 +++++++++---------
 docs/update/index.json                        |   2 +-
 5 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/DisplayMagician/Program.cs b/DisplayMagician/Program.cs
index 2089b8d..2700d58 100644
--- a/DisplayMagician/Program.cs
+++ b/DisplayMagician/Program.cs
@@ -362,7 +362,7 @@ namespace DisplayMagician {
             catch (Exception ex)
             {
                 Console.WriteLine($"Program/StartUpNormally exception 3: {ex.Message}: {ex.StackTrace} - {ex.InnerException}");
-                logger.Error(ex, $"Program/StartUpNormally top level exception");
+                logger.Error(ex, $"Program/StartUpNormally top level exception: {ex.Message}: {ex.StackTrace} - {ex.InnerException}");
                 MessageBox.Show(
                     ex.Message,
                     Language.Fatal_Error,
diff --git a/DisplayMagician/UIForms/MainForm.cs b/DisplayMagician/UIForms/MainForm.cs
index 21c4ad9..2572cb2 100644
--- a/DisplayMagician/UIForms/MainForm.cs
+++ b/DisplayMagician/UIForms/MainForm.cs
@@ -179,6 +179,8 @@ namespace DisplayMagician.UIForms
             //Run the AutoUpdater to see if there are any updates available.
             AutoUpdater.CheckForUpdateEvent += AutoUpdaterOnCheckForUpdateEvent;
             AutoUpdater.ParseUpdateInfoEvent += AutoUpdaterOnParseUpdateInfoEvent;
+            AutoUpdater.RunUpdateAsAdmin = true;
+            AutoUpdater.HttpUserAgent = "DisplayMagician AutoUpdater";
             AutoUpdater.Start("http://displaymagician.littlebitbig.com/update/");
         }
 
diff --git a/DisplayMagicianSetup/DisplayMagicianSetup.wixproj b/DisplayMagicianSetup/DisplayMagicianSetup.wixproj
index 61a16d2..c913b7e 100644
--- a/DisplayMagicianSetup/DisplayMagicianSetup.wixproj
+++ b/DisplayMagicianSetup/DisplayMagicianSetup.wixproj
@@ -122,7 +122,7 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <PropertyGroup>
-    <PreBuildEvent>"$(WIX)bin\heat.exe" dir H:\vscode-projects\DisplayMagician\DisplayMagician\bin\Debug -cg DisplayMagicianFiles -gg -scom -sreg -sfrag -srd -dr APPLICATIONROOTDIRECTORY -var var.DisplayMagicianFilesDir -out "$(ProjectDir)Fragments\DisplayMagicianFilesFragment.wxs"</PreBuildEvent>
+    <PreBuildEvent />
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs b/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs
index 4e5a09a..f8af81e 100644
--- a/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs
+++ b/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs
@@ -3,196 +3,196 @@
     <Fragment>
         <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
             <Component Id="cmp53B07BB21F5AFE76F5469BD1F4BA65C9" Guid="{F94AE60F-3741-4392-98E2-AE3C90B73EA9}">
-                <File Id="fil8CC3C83921B00F72D50A1E4EEB792DFE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.CoreAudio.dll" />
+                <File Id="fil8CC3C83921B00F72D50A1E4EEB792DFE" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\AudioSwitcher.AudioApi.CoreAudio.dll" />
             </Component>
             <Component Id="cmp8243CB1E312705B4BA74BC791635270C" Guid="{2D600617-04F0-4326-9A50-B1574BEE6FD5}">
-                <File Id="filC0B7F66C67664353137460031E28BC1B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.dll" />
+                <File Id="filC0B7F66C67664353137460031E28BC1B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\AudioSwitcher.AudioApi.dll" />
             </Component>
             <Component Id="cmp493DD683A43D05F764F3DEEF08ECA4C6" Guid="{C9EFE417-63F4-4D9B-A228-CA938D284698}">
-                <File Id="filC8194EB99DFB64B8589F5D80DC8E3B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.dll" />
+                <File Id="filC8194EB99DFB64B8589F5D80DC8E3B4D" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\AutoUpdater.NET.dll" />
             </Component>
             <Component Id="cmp357CADF4E916AADB1DD6BD7938986798" Guid="{02FA1010-E6D4-4976-8B7F-1B7A29C032CD}">
-                <File Id="fil900464E773972F43219693B12A52EDE2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.pdb" />
+                <File Id="fil900464E773972F43219693B12A52EDE2" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\AutoUpdater.NET.pdb" />
             </Component>
             <Component Id="cmp78B9C7C9D51B2878B72DCBACE49DE398" Guid="{7C47A814-6D6C-4FCD-8667-57AB408D657C}">
-                <File Id="filDE7F24A649EB60701DC0EC41FE83CBBE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\CircularProgressBar.dll" />
+                <File Id="filDE7F24A649EB60701DC0EC41FE83CBBE" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\CircularProgressBar.dll" />
             </Component>
             <Component Id="cmp7EE113DB90D07F08FCE70C1861DEA947" Guid="{1E72FC84-ACAD-4A17-85B4-4D14A745882F}">
-                <File Id="filF7D383DE2E27A23D8552666CEA0DDC80" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe" />
+                <File Id="filF7D383DE2E27A23D8552666CEA0DDC80" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\DisplayMagician.exe" />
             </Component>
             <Component Id="cmpCF520827D65E51E3ECB59344A6F528D0" Guid="{13A3918C-64B7-40B5-8AFE-362620B43184}">
-                <File Id="fil2841FB135B81D3B7EF6634B1E3E562DA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe.config" />
+                <File Id="fil2841FB135B81D3B7EF6634B1E3E562DA" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\DisplayMagician.exe.config" />
             </Component>
             <Component Id="cmp20CF355FCD243C61CF66FB91F20BEA24" Guid="{9EDC542A-48AE-480F-82AA-EAD88207A38D}">
-                <File Id="fil00FEE1F8F6F3766FD0431A9B72F4FCC7" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.pdb" />
+                <File Id="fil00FEE1F8F6F3766FD0431A9B72F4FCC7" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\DisplayMagician.pdb" />
             </Component>
             <Component Id="cmp936B3459EEFF10D8EB978B7DD0F9FDDA" Guid="{725E0C5E-EEE0-4D5D-AD9D-90D193D50CFF}">
-                <File Id="fil44F64B4F8FBBEAA84A71077F7F3B6B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.dll" />
+                <File Id="fil44F64B4F8FBBEAA84A71077F7F3B6B4D" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\DisplayMagician.Shared.dll" />
             </Component>
             <Component Id="cmpEFA0EED8369E2F430E0ED6D9EB027553" Guid="{43D90CFF-1B51-4C5A-9346-463616C42998}">
-                <File Id="fil52BE9F94EBFDF8C5CFEC426A17966F40" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.pdb" />
+                <File Id="fil52BE9F94EBFDF8C5CFEC426A17966F40" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\DisplayMagician.Shared.pdb" />
             </Component>
             <Component Id="cmpE8833A8E220525D7707A018B20CEDD87" Guid="{EBC27E33-6C4D-4612-BC5F-AC0A09DDD636}">
-                <File Id="filD4FD53D2FBF78674DBC3A1B446B44FC5" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\EDIDParser.dll" />
+                <File Id="filD4FD53D2FBF78674DBC3A1B446B44FC5" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\EDIDParser.dll" />
             </Component>
             <Component Id="cmp8C52E948AAB2D43DF696BB7D003A8E4B" Guid="{3C8F90C4-CFD5-4B8C-9929-44239BAECE94}">
-                <File Id="fil1965347683EC48A269FE672473CD04C2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.dll" />
+                <File Id="fil1965347683EC48A269FE672473CD04C2" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\HtmlAgilityPack.dll" />
             </Component>
             <Component Id="cmp137F8F514DF6364F5BBFCBDB1B1B9807" Guid="{B0D355DF-2273-4B35-8447-30CB090999A3}">
-                <File Id="filA79B24FCE8AA4DA0DC9A3ACBE5D830DD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.pdb" />
+                <File Id="filA79B24FCE8AA4DA0DC9A3ACBE5D830DD" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\HtmlAgilityPack.pdb" />
             </Component>
             <Component Id="cmpC13B4DB64E30D03117ECF099B1A9CD9C" Guid="{36C70104-58C9-497D-9775-38E65F1809CD}">
-                <File Id="fil44FFB513E29A8346713440B4BCB7F1E6" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconExtractor.dll" />
+                <File Id="fil44FFB513E29A8346713440B4BCB7F1E6" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\IconExtractor.dll" />
             </Component>
             <Component Id="cmp6AB92D1CF70395670A490E1B9BD347DE" Guid="{F3E775D7-8086-4922-AB65-2CA46CBB394D}">
-                <File Id="fil4DD582D50D7AC9DDD5292A76257854FA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconLib.dll" />
+                <File Id="fil4DD582D50D7AC9DDD5292A76257854FA" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\IconLib.dll" />
             </Component>
             <Component Id="cmp23C6CFB3962E9B4E2A7E8EF56F20A99F" Guid="{C2852F65-B3BC-4D96-B7E3-83D11B783CFC}">
-                <File Id="fil0F18A66FBBBB6C44A052B9FB77ACD8F8" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconPicker.dll" />
+                <File Id="fil0F18A66FBBBB6C44A052B9FB77ACD8F8" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\IconPicker.dll" />
             </Component>
             <Component Id="cmp5069692C1912B298A026EA30A39A2F36" Guid="{D4058D15-E089-4DAB-8CF7-4AA14F094703}">
-                <File Id="fil15BCAD6A05EB985A23A6B9DE3EFEB933" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ImageListView.dll" />
+                <File Id="fil15BCAD6A05EB985A23A6B9DE3EFEB933" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ImageListView.dll" />
             </Component>
             <Component Id="cmp6B91543EC1EAFC09F3C7747C1333F99A" Guid="{C7189742-5B1D-4323-89D6-E91FD58A5F99}">
-                <File Id="fil34AC49C1FA6CC0335FB4F16BCD03AA7B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\McMaster.Extensions.CommandLineUtils.dll" />
+                <File Id="fil34AC49C1FA6CC0335FB4F16BCD03AA7B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\McMaster.Extensions.CommandLineUtils.dll" />
             </Component>
             <Component Id="cmp8A11CDCDF04C29EC9CA9A0C1D0D78B04" Guid="{5ECD1594-F851-4CE4-996C-6892EF8EA05A}">
-                <File Id="fil151DD1163831E94E80724A88F88C2231" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.dll" />
+                <File Id="fil151DD1163831E94E80724A88F88C2231" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\Microsoft.Toolkit.Uwp.Notifications.dll" />
             </Component>
             <Component Id="cmp62D956D9975F1430FEAB37FCAD94474F" Guid="{FFC586AD-A68D-44FF-84A9-3142DAC56A94}">
-                <File Id="fil4F519990E7E5387E7BAEB5C056617826" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.pdb" />
+                <File Id="fil4F519990E7E5387E7BAEB5C056617826" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\Microsoft.Toolkit.Uwp.Notifications.pdb" />
             </Component>
             <Component Id="cmpA6AEEDB3EBF416E3AD000E7408FE3402" Guid="{AC91358C-DB0E-4DD7-8C45-2558D3372277}">
-                <File Id="filA93EB7C7565EEDD39AF3362752AE09DB" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\MintPlayer.IconUtils.dll" />
+                <File Id="filA93EB7C7565EEDD39AF3362752AE09DB" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\MintPlayer.IconUtils.dll" />
             </Component>
             <Component Id="cmpA7927FF61A499CF81EE0A562CDFEDEC7" Guid="{6D08FDFC-F2BA-462E-A678-6DAABBE3A2C8}">
-                <File Id="filD7DC5F43B3964ACECD7725F05E664960" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Newtonsoft.Json.dll" />
+                <File Id="filD7DC5F43B3964ACECD7725F05E664960" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\Newtonsoft.Json.dll" />
             </Component>
             <Component Id="cmpC64ECA245317593760E42F3996F3A079" Guid="{AF290F63-703E-441F-86C8-2F00DADDEF9B}">
-                <File Id="fil5299F0448E950048C778AA65A04FB498" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NLog.dll" />
+                <File Id="fil5299F0448E950048C778AA65A04FB498" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\NLog.dll" />
             </Component>
             <Component Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" Guid="{F5FC1F41-141E-4DDE-97D7-4D8E0BAF0578}">
-                <File Id="filDB484734B403A8C8EE2F5B5165068C91" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NvAPIWrapper.dll" />
+                <File Id="filDB484734B403A8C8EE2F5B5165068C91" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\NvAPIWrapper.dll" />
             </Component>
             <Component Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" Guid="{9845F3EB-281F-4BB1-9B88-5B5D454F0977}">
-                <File Id="fil8C59ED1965E9E2D1C82459BE5C1E903E" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.dll" />
+                <File Id="fil8C59ED1965E9E2D1C82459BE5C1E903E" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\QueryString.NETCore.dll" />
             </Component>
             <Component Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" Guid="{25A74C53-3692-4567-9F21-BD02146E6329}">
-                <File Id="filD448167ABB54E447850BA2A203C5FCA1" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.pdb" />
+                <File Id="filD448167ABB54E447850BA2A203C5FCA1" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\QueryString.NETCore.pdb" />
             </Component>
-            <Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{66364E96-D089-4ACD-A6AA-CF06A5ABC5FB}">
-                <File Id="fil8A5957F9C3DCF1A6D414F9F34402CB53" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.Drawing.Common.dll" />
+            <!-- <Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{66364E96-D089-4ACD-A6AA-CF06A5ABC5FB}">
+                <File Id="fil8A5957F9C3DCF1A6D414F9F34402CB53" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\System.Drawing.Common.dll" />
             </Component>
             <Component Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" Guid="{6C0C5BB3-D0B5-415F-AAB5-703ED99CBF25}">
-                <File Id="fil9DF3290031BCB652454E62345D1FAE6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.ValueTuple.dll" />
-            </Component>
+                <File Id="fil9DF3290031BCB652454E62345D1FAE6B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\System.ValueTuple.dll" />
+            </Component> -->
             <Component Id="cmpA8825A49786C04320E75BCFC8E961667" Guid="{0251CC67-EF00-4307-BA6D-AAF348203A52}">
-                <File Id="filD5FED76D92088BA98BD9CF7D4D9B7EF2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ValveKeyValue.dll" />
+                <File Id="filD5FED76D92088BA98BD9CF7D4D9B7EF2" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ValveKeyValue.dll" />
             </Component>
             <Component Id="cmp650327FC006E09EDFC7039D6E7A6F340" Guid="{0E23D825-0659-495E-9298-EC59C28F369C}">
-                <File Id="filB58835925907FAE2AB432C29CD8C03B4" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WindowsDisplayAPI.dll" />
+                <File Id="filB58835925907FAE2AB432C29CD8C03B4" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\WindowsDisplayAPI.dll" />
             </Component>
             <Component Id="cmp27AC6F10258FA1C97C54F3C1D153D122" Guid="{06BD97C2-07D8-4032-842C-AD16D1560803}">
-                <File Id="fil01CF08752F4284E3144706F10481AEA0" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WinFormAnimation.dll" />
+                <File Id="fil01CF08752F4284E3144706F10481AEA0" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\WinFormAnimation.dll" />
             </Component>
             <Directory Id="dirC9CEBA44737D7806DC2F52AE07FB1335" Name="ar">
                 <Component Id="cmp1D8A437520B8A88B5329BA85AF49F972" Guid="{FBCE860E-96DC-4F12-BE56-238523897F41}">
-                    <File Id="filC934041A1382ABA35ECB5DE3BB6C4148" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ar\AutoUpdater.NET.resources.dll" />
+                    <File Id="filC934041A1382ABA35ECB5DE3BB6C4148" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ar\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir1764AC367AADA7667CA18D19856EB829" Name="cs">
                 <Component Id="cmp1B983AD82D33902E3869C2CD3E625557" Guid="{8AF1455C-DC99-4910-A080-86F15ED701DD}">
-                    <File Id="fil5CE1877B3764F3FA8C53E465EC4F1E6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\cs\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil5CE1877B3764F3FA8C53E465EC4F1E6B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\cs\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir70240FB68A7D32052E3646DFEC7177A6" Name="da">
                 <Component Id="cmp645D07231E6F1B4B9F84AAED05DE08B9" Guid="{B54F8BA5-707B-4FB7-92E9-2D8B9EA4C684}">
-                    <File Id="fil6664ED7C2E9121315323240F4A94F71F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\da\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil6664ED7C2E9121315323240F4A94F71F" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\da\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir1C628EE15A29CD6ED08798D6B0A06B2F" Name="de">
                 <Component Id="cmpF7E34D6BF19681066F5E973C8D30C63A" Guid="{534D8216-0FC8-4B4B-9F1A-A1EA54B00166}">
-                    <File Id="filC2D506AF5C5B86FA443A326E067EF823" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\de\AutoUpdater.NET.resources.dll" />
+                    <File Id="filC2D506AF5C5B86FA443A326E067EF823" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\de\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir6B7DF5E7779A02DE589C2D4AABF889BA" Name="es">
                 <Component Id="cmpB54DE98A33D508FC6EF7E3761CDF0661" Guid="{E84B0609-1EFD-4D4E-A0A6-4803F1499A60}">
-                    <File Id="filCDFD6865877E32514969EAE54D3CC9F9" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\es\AutoUpdater.NET.resources.dll" />
+                    <File Id="filCDFD6865877E32514969EAE54D3CC9F9" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\es\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirCCE997692B032DBDA6174416BFED255E" Name="fr">
                 <Component Id="cmp81105D91EF7C9FAB44E52202DBAF417C" Guid="{600FF9A6-8D87-48A8-BDE5-953A32C91C67}">
-                    <File Id="fil6B84F6EC6C9F50B7139B0E99914B401A" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\fr\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil6B84F6EC6C9F50B7139B0E99914B401A" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\fr\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirC0620602576770B728F6D7CF835E4230" Name="it">
                 <Component Id="cmpCC505044A437DF227E44E7B31A54D0BF" Guid="{3B3C9838-EEF0-446A-98DA-235A1E916F8E}">
-                    <File Id="filD812096039F1E9D729065E7109AB857F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\it\AutoUpdater.NET.resources.dll" />
+                    <File Id="filD812096039F1E9D729065E7109AB857F" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\it\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir299EDA906CCCF90FED2B1DE9A0AE661D" Name="ja-JP">
                 <Component Id="cmp2B1808EAFED02DC5D42D475F2BB83458" Guid="{1A9C1A3B-113F-4DB2-9C91-D8B053FBBE39}">
-                    <File Id="filA3B2CB69DE697F856902A5EB591C1BA9" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ja-JP\AutoUpdater.NET.resources.dll" />
+                    <File Id="filA3B2CB69DE697F856902A5EB591C1BA9" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ja-JP\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir5F675FF0062E1C1CACE0170EC20A5208" Name="ko">
                 <Component Id="cmpE8B7CCFB66BD36E9CF741814FEE6AD14" Guid="{4AC29024-C3E3-4916-BAD7-43C3434486AF}">
-                    <File Id="fil1A20D0790F057F2E9E188792193A32BD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ko\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil1A20D0790F057F2E9E188792193A32BD" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ko\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir0BFBA37D9F94C8F490A10DA87815DED5" Name="nl">
                 <Component Id="cmp9449E2C32768367A145DF20983A12FF7" Guid="{B03F6EC5-F5E8-48F0-8910-D121A4769470}">
-                    <File Id="filE87E30BFF942128946D7656D111B9E28" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\nl\AutoUpdater.NET.resources.dll" />
+                    <File Id="filE87E30BFF942128946D7656D111B9E28" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\nl\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir5D30DDBDF1F855D2C3CFCAE5A7D4DFB7" Name="pl">
                 <Component Id="cmp34EDF353BCC5E92A39657F713CAF1AA0" Guid="{F83A89B4-BCF1-4C8C-B158-3DEADE8BD5D2}">
-                    <File Id="filB0BCC1B40E0F3F37F614E9AC51A1BEDF" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pl\AutoUpdater.NET.resources.dll" />
+                    <File Id="filB0BCC1B40E0F3F37F614E9AC51A1BEDF" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\pl\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir32D9AD0C9188498053C05E4C1D09269D" Name="pt">
                 <Component Id="cmp1E67A3938BF74EC5ADD54FAB69A80CB3" Guid="{C052FA08-2965-4127-91EE-2194A60702B5}">
-                    <File Id="filB6A7729764F42969B1A0A1093D3F600D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pt\AutoUpdater.NET.resources.dll" />
+                    <File Id="filB6A7729764F42969B1A0A1093D3F600D" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\pt\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir3EA1054A4A68F70CEF22E983B9D684DB" Name="pt-BR">
                 <Component Id="cmpEEAAA81C74F88DC87008EB031C2F1030" Guid="{1046ABBC-0BCB-4BE4-8F4A-583A6C52424B}">
-                    <File Id="filBDE4FF11B65DE8486E6AE2917075C4F2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pt-BR\AutoUpdater.NET.resources.dll" />
+                    <File Id="filBDE4FF11B65DE8486E6AE2917075C4F2" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\pt-BR\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirF9A13AB290C9570B2C0CE7CB6EF9D86E" Name="ru">
                 <Component Id="cmpA923B5BC9CB54BE671D485B3A39D93A5" Guid="{5F627B90-B645-47E6-9FC8-2402841B59B1}">
-                    <File Id="fil0672B3CFA1451A14C32747BE1794732F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ru\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil0672B3CFA1451A14C32747BE1794732F" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\ru\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dir0A61397BAE3772A68E21EF1C51156F2C" Name="sk">
                 <Component Id="cmp8D4C4B444510137E2D82B4FD6A0B9776" Guid="{A2DC0C16-C549-45FF-B6DD-7501794F7B4E}">
-                    <File Id="filC5765B8E01B5B47AAF9794806A76E690" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sk\AutoUpdater.NET.resources.dll" />
+                    <File Id="filC5765B8E01B5B47AAF9794806A76E690" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\sk\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirBBD306FA33D57073FD02CF4EFC3A0326" Name="sv">
                 <Component Id="cmpFB55A1004D6DF4923A748FDC2F523D8B" Guid="{FB3C569B-6F82-4596-A397-6C6EF27A6401}">
-                    <File Id="fil54738B12543ED9C06F79D373D2EB015B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sv\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil54738B12543ED9C06F79D373D2EB015B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\sv\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirCE3BF130A177608F70523C718370D4AB" Name="th">
                 <Component Id="cmp4490FE644B0447492BBB39E2832B87C0" Guid="{07CEC235-B158-4EC2-AA11-3E92A4174CC1}">
-                    <File Id="fil4735CFBE1739CDA690669E71EA774734" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\th\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil4735CFBE1739CDA690669E71EA774734" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\th\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirC06FC06848A827DE7E1246A3EEE173B9" Name="tr">
                 <Component Id="cmp7311ACB3A3BB0005E1BD421A03BAC70D" Guid="{FDA8C7A5-8CA9-4560-9EFB-106970CB7098}">
-                    <File Id="fil9EDE895C94E3E737A7E2345A3354E4ED" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\tr\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil9EDE895C94E3E737A7E2345A3354E4ED" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\tr\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirA9E5CFBEBA3415CA12E141D142550091" Name="zh">
                 <Component Id="cmp0E8893641CCC97E160269D736795633C" Guid="{D323F9F0-18A0-4444-A0AD-89022844426D}">
-                    <File Id="filD14D5D68900793C75702C773F11A305F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\zh\AutoUpdater.NET.resources.dll" />
+                    <File Id="filD14D5D68900793C75702C773F11A305F" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\zh\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
             <Directory Id="dirB915F738D24EC7F5CE340DC7A43B9BD1" Name="zh-tw">
                 <Component Id="cmp1D85EF433AB8DDB383D91C1C33BAA91A" Guid="{19B616EC-7E1D-4DEA-B53B-8DC8990ED851}">
-                    <File Id="fil03FB6CBB0D2712EFAD51B20D66FE4B9B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\zh-tw\AutoUpdater.NET.resources.dll" />
+                    <File Id="fil03FB6CBB0D2712EFAD51B20D66FE4B9B" KeyPath="yes" Source="$(var.DisplayMagician.TargetDir)\zh-tw\AutoUpdater.NET.resources.dll" />
                 </Component>
             </Directory>
         </DirectoryRef>
@@ -225,8 +225,8 @@
             <ComponentRef Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" />
             <ComponentRef Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" />
             <ComponentRef Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" />
-            <ComponentRef Id="cmpB76F273FDED5EA841158E966B403CFC8" />
-            <ComponentRef Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" />
+            <!-- <ComponentRef Id="cmpB76F273FDED5EA841158E966B403CFC8" />
+            <ComponentRef Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" />-->
             <ComponentRef Id="cmpA8825A49786C04320E75BCFC8E961667" />
             <ComponentRef Id="cmp650327FC006E09EDFC7039D6E7A6F340" />
             <ComponentRef Id="cmp27AC6F10258FA1C97C54F3C1D153D122" />
diff --git a/docs/update/index.json b/docs/update/index.json
index e7412b7..73f7f7e 100644
--- a/docs/update/index.json
+++ b/docs/update/index.json
@@ -8,7 +8,7 @@
     "mode": 0
   },
   "checksum": {
-    "value": "E8CC37A0E526028EB22C438282FDAE4BA6F9ECA6F7C3093AD03338E72FE04261",
+    "value": "D229B8E97A7490725383811C1C74B0D0A4AE2AD9781A49C3ADE61D3E9C37BBAD",
     "hashingAlgorithm": "SHA256"
   }
 }
\ No newline at end of file