9 files changed, 100 insertions, 43 deletions

diff --git a/src/test/dtf/EmbeddedUI/AssemblyInfo.cs b/src/test/dtf/EmbeddedUI/AssemblyInfo.cs
deleted file mode 100644
index 27aeb535..00000000
--- a/src/test/dtf/EmbeddedUI/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyDescription("Sample managed embedded external UI")]
diff --git a/src/test/dtf/EmbeddedUI/EmbeddedUI.config b/src/test/dtf/EmbeddedUI/EmbeddedUI.config
new file mode 100644
index 00000000..700aff6f
--- /dev/null
+++ b/src/test/dtf/EmbeddedUI/EmbeddedUI.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<configuration>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v2.0.50727" />
+    </startup>
+</configuration>
diff --git a/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj b/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj
index 9f745a19..a6339220 100644
--- a/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj
+++ b/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj
@@ -1,49 +1,24 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{864B8C50-7895-4485-AC89-900D86FD8C0D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>WixToolset.Samples.EmbeddedUI</RootNamespace>
-    <AssemblyName>WixToolset.Samples.EmbeddedUI</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net35</TargetFramework>
+    <Description>Sample managed embedded external UI</Description>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="InstallProgressCounter.cs" />
-    <Compile Include="SampleEmbeddedUI.cs" />
-    <Compile Include="SetupWizard.xaml.cs">
-      <DependentUpon>SetupWizard.xaml</DependentUpon>
-    </Compile>
+    <Content Include="EmbeddedUI.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <Page Include="SetupWizard.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Dtf.CustomAction" />
   </ItemGroup>
-
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs b/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs
index b9cd213a..ae86dc97 100644
--- a/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs
+++ b/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Samples.EmbeddedUI
 
     public class SampleEmbeddedUI : IEmbeddedUI
     {
+        private bool isMaintenance;
         private Thread appThread;
         private Application app;
         private SetupWizard setupWizard;
@@ -46,11 +47,11 @@ namespace WixToolset.Samples.EmbeddedUI
 
                 if (String.Equals(session["REMOVE"], "All", StringComparison.OrdinalIgnoreCase))
                 {
-                    // Don't show custom UI when uninstalling.
+                    // Don't show custom UI when uninstall was specified on the command line.
                     return false;
-
-                    // An embedded UI could display an uninstall wizard, it's just not imlemented here.
                 }
+
+                this.isMaintenance = session.EvaluateCondition("Installed");
             }
 
             // Start the setup wizard on a separate thread.
@@ -69,6 +70,16 @@ namespace WixToolset.Samples.EmbeddedUI
             }
             else
             {
+                switch (this.setupWizard.Operation)
+                {
+                    case SetupOperationType.Repair:
+                        session["REINSTALL"] = "ALL";
+                        break;
+                    case SetupOperationType.Uninstall:
+                        session["REMOVE"] = "ALL";
+                        break;
+                }
+
                 // Start the installation with a silenced internal UI.
                 // This "embedded external UI" will handle message types except for source resolution.
                 internalUILevel = InstallUIOptions.NoChange | InstallUIOptions.SourceResolutionOnly;
@@ -121,7 +132,7 @@ namespace WixToolset.Samples.EmbeddedUI
         private void Run()
         {
             this.app = new Application();
-            this.setupWizard = new SetupWizard(this.installStartEvent);
+            this.setupWizard = new SetupWizard(this.installStartEvent, this.isMaintenance);
             this.setupWizard.InitializeComponent();
             this.app.Run(this.setupWizard);
             this.installExitEvent.Set();
diff --git a/src/test/dtf/EmbeddedUI/SetupWizard.xaml b/src/test/dtf/EmbeddedUI/SetupWizard.xaml
index 9fd493a7..97e406c2 100644
--- a/src/test/dtf/EmbeddedUI/SetupWizard.xaml
+++ b/src/test/dtf/EmbeddedUI/SetupWizard.xaml
@@ -8,6 +8,8 @@
         Title="Sample Embedded UI" Height="400" Width="540" Visibility="Visible">
         <Grid>
                 <TextBox Margin="8,8,8,63" Name="messagesTextBox" IsReadOnly="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto" FontFamily="Lucida Console" FontSize="10" />
+                <Button Height="23" HorizontalAlignment="Left" Name="repairButton" VerticalAlignment="Bottom" Width="75" Visibility="Hidden" Click="repairButton_Click" Margin="8,0,0,8">Repair</Button>
+                <Button Height="23" HorizontalAlignment="Left" Name="uninstallButton" VerticalAlignment="Bottom" Width="75" Visibility="Hidden" Click="uninstallButton_Click" Margin="91,0,0,8">Uninstall</Button>
                 <Button Height="23" HorizontalAlignment="Right" Name="installButton" VerticalAlignment="Bottom" Width="75" Click="installButton_Click" Margin="0,0,91,8">Install</Button>
                 <Button Height="23" HorizontalAlignment="Right" Name="exitButton" VerticalAlignment="Bottom" Width="75" Visibility="Hidden" Click="exitButton_Click" Margin="0,0,8,8">Exit</Button>
                 <Button Height="23" Margin="0,0,8,8" Name="cancelButton" VerticalAlignment="Bottom" Width="75" HorizontalAlignment="Right" Click="cancelButton_Click">Cancel</Button>
diff --git a/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs b/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs
index b846d61f..a4345481 100644
--- a/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs
+++ b/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs
@@ -16,19 +16,44 @@ namespace WixToolset.Samples.EmbeddedUI
     using System.Windows.Shapes;
     using WixToolset.Dtf.WindowsInstaller;
 
+    public enum SetupOperationType
+    {
+        Install,
+        Repair,
+        Uninstall
+    }
+
     /// <summary>
     /// Interaction logic for SetupWizard.xaml
     /// </summary>
     public partial class SetupWizard : Window
     {
+        private bool isMaintenance;
         private ManualResetEvent installStartEvent;
         private InstallProgressCounter progressCounter;
         private bool canceled;
 
-        public SetupWizard(ManualResetEvent installStartEvent)
+        public SetupOperationType Operation { get; private set; }
+
+        public SetupWizard(ManualResetEvent installStartEvent, bool isMaintenance)
         {
             this.installStartEvent = installStartEvent;
             this.progressCounter = new InstallProgressCounter(0.5);
+            this.isMaintenance = isMaintenance;
+
+            this.Loaded += this.SetupWizard_Loaded;
+        }
+
+        private void SetupWizard_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= this.SetupWizard_Loaded;
+
+            if (this.isMaintenance)
+            {
+                this.installButton.Visibility = Visibility.Hidden;
+                this.repairButton.Visibility = Visibility.Visible;
+                this.uninstallButton.Visibility = Visibility.Visible;
+            }
         }
 
         public MessageResult ProcessMessage(InstallMessage messageType, Record messageRecord,
@@ -82,7 +107,27 @@ namespace WixToolset.Samples.EmbeddedUI
 
         private void installButton_Click(object sender, RoutedEventArgs e)
         {
+            this.Operation = SetupOperationType.Install;
+            this.StartInstall();
+        }
+
+        private void repairButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.Operation = SetupOperationType.Repair;
+            this.StartInstall();
+        }
+
+        private void uninstallButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.Operation = SetupOperationType.Uninstall;
+            this.StartInstall();
+        }
+
+        private void StartInstall()
+        {
             this.installButton.Visibility = Visibility.Hidden;
+            this.repairButton.Visibility = Visibility.Hidden;
+            this.uninstallButton.Visibility = Visibility.Hidden;
             this.progressBar.Visibility = Visibility.Visible;
             this.progressLabel.Visibility = Visibility.Visible;
             this.installStartEvent.Set();
diff --git a/src/test/dtf/SampleCA/CustomAction.config b/src/test/dtf/SampleCA/CustomAction.config
new file mode 100644
index 00000000..700aff6f
--- /dev/null
+++ b/src/test/dtf/SampleCA/CustomAction.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<configuration>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v2.0.50727" />
+    </startup>
+</configuration>
diff --git a/src/test/dtf/SampleCA/SampleCA.csproj b/src/test/dtf/SampleCA/SampleCA.csproj
index fb6d8dca..866b7575 100644
--- a/src/test/dtf/SampleCA/SampleCA.csproj
+++ b/src/test/dtf/SampleCA/SampleCA.csproj
@@ -1,10 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net20</TargetFramework>
     <Description>Sample managed custom actions</Description>
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="CustomAction.config" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="testsub\testfile.txt" CopyToOutputDirectory="PreserveNewest" />
+    <CustomActionContents Include="testsub\SampleCAs.cs=$(OutputDirectory)testsub\testfile.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="WixToolset.Dtf.CustomAction" />
   </ItemGroup>
 </Project>
diff --git a/src/test/dtf/SampleCA/testsub/testfile.txt b/src/test/dtf/SampleCA/testsub/testfile.txt
new file mode 100644
index 00000000..8056aefd
--- /dev/null
+++ b/src/test/dtf/SampleCA/testsub/testfile.txt
@@ -0,0 +1 @@
+test file for testing subdirectory support and binary stream reading