From 22c97adba70fa838b8f285d404750d0f8fe685d8 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 20 Mar 2020 19:55:02 +1000
Subject: Update Example.Extension to automatically update based on its
 Example.wxs. Use .wixlib instead of .wir, and skip tests which are now
 failing. Add more bundle tests.

---
 src/test/Example.Extension/Data/example.wxs        |  3 +++
 .../Example.Extension/Example.Extension.csproj     | 22 +++++++++++++++++++++-
 src/test/Example.Extension/ExampleExtensionData.cs |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'src/test/Example.Extension')

diff --git a/src/test/Example.Extension/Data/example.wxs b/src/test/Example.Extension/Data/example.wxs
index 53531e99..cb100adf 100644
--- a/src/test/Example.Extension/Data/example.wxs
+++ b/src/test/Example.Extension/Data/example.wxs
@@ -5,4 +5,7 @@
 
     <Binary Id="BinFromWir" SourceFile="example.txt" />
   </Fragment>
+  <Fragment>
+    <BootstrapperApplication Id="fakeba" SourceFile="example.txt" />
+  </Fragment>
 </Wix>
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index 32560e60..e9483c72 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -9,11 +9,31 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Data\Example.wir" />
+    <ExtensionWxs Include="Data\example.wxs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Target Name="SetExtensionWixlib">
+    <PropertyGroup>
+      <CompileWixlibExePath>$(OutputPath)..\net461\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
+      <WixlibPath>$(IntermediateOutputPath)Example.wixlib</WixlibPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Include="$(WixlibPath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="SetExtensionWixlib" Inputs="@(ExtensionWxs)" Outputs="$(WixlibPath)">
+    <Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' />
+  </Target>
 </Project>
diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs
index 724f9eea..de0b8899 100644
--- a/src/test/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/Example.Extension/ExampleExtensionData.cs
@@ -11,7 +11,7 @@ namespace Example.Extension
 
         public Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
         {
-            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Data.Example.wir", tupleDefinitions);
+            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", tupleDefinitions);
         }
 
         public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
-- 
cgit v1.2.3-55-g6feb