Move the BootstrapperApplication out of proc

4 files changed, 4 insertions, 8 deletions

diff --git a/src/ext/Util/ca/test.cpp b/src/ext/Util/ca/test.cpp
index c4d215f0..e9d02ed3 100644
--- a/src/ext/Util/ca/test.cpp
+++ b/src/ext/Util/ca/test.cpp
@@ -216,7 +216,7 @@ static DWORD WINAPI ThreadProc(
 
     // Create the window to handle reboots without activating it.
     hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, SW_SHOWNA, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, NULL);
-    ExitOnNullWithLastError(hWnd, hr, "Failed to create window.");
+    ExitOnNullWithLastError(hWnd, hr, "Failed to create test UI thread window.");
 
     // Persist the window handle and let the caller know we've initialized.
     pContext->hWnd = hWnd;
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
index 45147066..09ce72a5 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
@@ -1,8 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
+        <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <util:RegistrySearchRef Id="RegistrySearchId" />
         <util:RegistrySearchRef Id="RegistrySearchId64" />
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
index cc7162d7..db36f9b4 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
@@ -1,8 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
     <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <BootstrapperApplication>
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
+        <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <util:RegistrySearchRef Id="RegistrySearchId" />
         <util:RegistrySearchRef Id="RegistrySearchId64" />
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index f7bb0614..6221c052 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -800,7 +800,7 @@ namespace WixToolset.Util
             }
 
             var componentKeyPath = this.CreateComponentKeyPath();
-            componentKeyPath.Id = id.Id;
+            componentKeyPath.Id = id;
             componentKeyPath.Explicit = isKeyPath;
             componentKeyPath.Type = PossibleKeyPathType.Registry;
             return componentKeyPath;