Use DTF 5.0.2

Author: briantu

tools/windows/DatadogAgentInstaller/AgentCustomActions/AgentCustomActions.csproj

@@ -62,8 +62,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
-    <!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

tools/windows/DatadogAgentInstaller/CustomActions.Tests/CustomActions.Tests.csproj

@@ -56,8 +56,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
-    <!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

tools/windows/DatadogAgentInstaller/CustomActions/CustomActions.csproj

@@ -125,8 +125,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
-    <!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

tools/windows/DatadogAgentInstaller/InstallerCustomActions/InstallerCustomActions.csproj

@@ -62,8 +62,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- WiX 5 migration: Replaced assembly reference with NuGet package -->
-    <!-- Note: Using 4.0.5 because WixSharp's MakeSfxCA expects DTF assembly version 4.0.0.0 -->
-    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.5" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

tools/windows/DatadogAgentInstaller/WixSetup/Datadog Agent/AgentInstaller.cs

@@ -216,6 +216,7 @@ public Project Configure()
             // Always generate a new GUID otherwise WixSharp will generate one based on
             // the version
             project.ProductId = Guid.NewGuid();
+            project.AlwaysScheduleInitRuntime = false;
             project
                 .SetCustomActions(_agentCustomActions)
                 .SetProjectInfo(

tools/windows/DatadogAgentInstaller/WixSetup/Datadog Installer/DatadogInstaller.cs

@@ -90,6 +90,7 @@ public Project Configure()
             // Always generate a new GUID otherwise WixSharp will generate one based on
             // the version
             project.ProductId = Guid.NewGuid();
+            project.AlwaysScheduleInitRuntime = false;
             project
                 .SetCustomActions(_installerCustomActions)
                 .SetProjectInfo(

tools/windows/DatadogAgentInstaller/WixSetup/MutuallyExclusiveProduct.cs

@@ -51,8 +51,6 @@ public void Process(ProcessingContext context)
             var upgradeElement = new XElement("Upgrade");
             upgradeElement.SetAttributeValue("Id", UpgradeCode);
 
-            // Note: UpgradeVersion does NOT have an Id attribute in WiX 5
-            // Detect all versions of the conflicting product.
             // Omitting Maximum means "no upper bound" - detects all versions >= Minimum.
             var upgradeVersionElement = new XElement("UpgradeVersion",
                 new XAttribute("Minimum", "0.0.0"),