From 5c4d42ac131450eb179aa8fe82e523b6f7345175 Mon Sep 17 00:00:00 2001
From: T E Dixon <dixonte@gmail.com>
Date: Thu, 7 May 2020 13:27:36 +1000
Subject: [PATCH] Clean before building for installer

---
 HidVanguard.Install/Fragments/Generated/Components.wxs | 4 ----
 HidVanguard.Install/HidVanguard.Install.wixproj        | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/HidVanguard.Install/Fragments/Generated/Components.wxs b/HidVanguard.Install/Fragments/Generated/Components.wxs
index 07f38c6..b6ac332 100644
--- a/HidVanguard.Install/Fragments/Generated/Components.wxs
+++ b/HidVanguard.Install/Fragments/Generated/Components.wxs
@@ -303,9 +303,6 @@
             <Component Id="cmp3837E3CC94C2C3BBC9B9A3026EA988AD" Guid="*" Win64="$(var.Win64)">
                 <File Id="filF60D45962A59C9DFE1501A3960A49B8D" KeyPath="yes" Source="$(var.SourceDir)\mscordaccore.dll" />
             </Component>
-            <Component Id="cmp75A09585F70F34562319DA62E03088AA" Guid="*" Win64="$(var.Win64)">
-                <File Id="fil54FFF081084437C1BB2A312E98A900AC" KeyPath="yes" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_4.700.19.60701.dll" />
-            </Component>
             <Component Id="cmp99C4CD51A9DBBCAAC3147D792C62F605" Guid="*" Win64="$(var.Win64)">
                 <File Id="filA597AE8E3CBA5ED9CA8968485ABD64AF" KeyPath="yes" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_4.700.20.11803.dll" />
             </Component>
@@ -1753,7 +1750,6 @@
             <ComponentRef Id="cmp71B1F6C717C44D8CE8FF4612229E0569" />
             <ComponentRef Id="cmpCE6167BB9F42BFE7A5F9CB8DA7480F34" />
             <ComponentRef Id="cmp3837E3CC94C2C3BBC9B9A3026EA988AD" />
-            <ComponentRef Id="cmp75A09585F70F34562319DA62E03088AA" />
             <ComponentRef Id="cmp99C4CD51A9DBBCAAC3147D792C62F605" />
             <ComponentRef Id="cmpE3ADF6CADBF3830225D645491DFDE4DD" />
             <ComponentRef Id="cmpFAE67B05813B320774F72AFC4AB5C9D1" />
diff --git a/HidVanguard.Install/HidVanguard.Install.wixproj b/HidVanguard.Install/HidVanguard.Install.wixproj
index 91c1630..b63d459 100644
--- a/HidVanguard.Install/HidVanguard.Install.wixproj
+++ b/HidVanguard.Install/HidVanguard.Install.wixproj
@@ -52,6 +52,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>
   <Target Name="BeforeBuild">
+    <RemoveDir Directories="$(SolutionDir)Publish" />
     <Exec Command="dotnet publish $(SolutionDir)HidVanguard.Config\HidVanguard.Config.csproj --nologo -c Release --self-contained -r win-x64 -o $(SolutionDir)Publish" />
     <Exec Command="dotnet publish $(SolutionDir)HidVanguard.Service\HidVanguard.Service.csproj --nologo -c Release --self-contained -r win-x64 -o $(SolutionDir)Publish" />
     <HeatDirectory RunAsSeparateProcess="true" NoLogo="$(HarvestDirectoryNoLogo)" SuppressAllWarnings="$(HarvestDirectorySuppressAllWarnings)" SuppressSpecificWarnings="$(HarvestDirectorySuppressSpecificWarnings)" ToolPath="$(Wix)bin" TreatWarningsAsErrors="$(HarvestDirectoryTreatWarningsAsErrors)" TreatSpecificWarningsAsErrors="$(HarvestDirectoryTreatSpecificWarningsAsErrors)" VerboseOutput="$(HarvestDirectoryVerboseOutput)" AutogenerateGuids="$(HarvestDirectoryAutogenerateGuids)" GenerateGuidsNow="$(HarvestDirectoryGenerateGuidsNow)" OutputFile="$(ProjectDir)Fragments\Generated\Components.wxs" SuppressFragments="$(HarvestDirectorySuppressFragments)" SuppressUniqueIds="$(HarvestDirectorySuppressUniqueIds)" Transforms="$(ProjectDir)Xsl\ComponentsFilter.xsl" Directory="$(SolutionDir)Publish" ComponentGroupName="C_CommonAssemblies" DirectoryRefId="InstallLocation" KeepEmptyDirectories="false" PreprocessorVariable="var.SourceDir" SuppressCom="true" SuppressRootDirectory="true" SuppressRegistry="true">