[release/2.1] Make .msi GUIDs unique (#21803)

* Make .msi GUIDs unique

* Fix GuidInputs

Author: wtgodbe

src/Installers/Windows/Wix.targets

@@ -6,8 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GuidInputs>$(Version);$(Platform)</GuidInputs>
-    <GuidInputs Condition="'$(IsFinalBuild)' != 'true'">$(GuidInputs);$(BuildNumber)</GuidInputs>
+    <GuidInputs>$(Version);$(Platform);$(BuildNumber)</GuidInputs>
   </PropertyGroup>
 
   <UsingTask AssemblyFile="$(OutputPath)..\InstallerTasks\InstallerTasks.dll" TaskName="RepoTasks.GenerateGuid" />