Integrate Dependency into Core

Only the custom action handling is left in Dependency.wixext

Partially fixes wixtoolset/issues#5945

5 files changed, 12 insertions, 32 deletions

diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
index 0f729534..968b8de6 100644
--- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
@@ -15,9 +15,10 @@ namespace WixToolsetTest.Dependency
             var folder = TestData.Get(@"TestData\UsingProvides");
             var build = new Builder(folder, typeof(DependencyExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "WixDependencyProvider");
+            var results = build.BuildAndQuery(Build, "CustomAction", "WixDependencyProvider");
             Assert.Equal(new[]
             {
+                "CustomAction:Wix4DependencyCheck_X86\t1\tDependencyCA_X86\tWixDependencyCheck\t",
                 "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
             }, results);
         }
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
index 44820bdd..b15ae8da 100644
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
+++ b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
@@ -1,21 +1,16 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
   <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
-    
-
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    
 
+    <Directory Id="INSTALLFOLDER" Name="ProgramFilesFolder:\MsiPackage" />
+      
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
+      <Component Directory="INSTALLFOLDER">
+        <File Name="example.txt" Source="Package.wxs" />
+        <Provides Key="UsingProvides" dep:Check="yes" />
+      </Component>
     </Feature>
-    
-  </Package>
 
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
+  </Package>
 </Wix>
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs
deleted file mode 100644
index e241fb17..00000000
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/PackageComponents.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-        <Component>
-            <File Source="example.txt" />
-            <dep:Provides Key="UsingProvides" />
-        </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt
deleted file mode 100644
index 1b4ffe8a..00000000
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is example.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
index 7bedc47d..2d3e40c3 100644
--- a/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+++ b/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
@@ -12,10 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="TestData\UsingProvides\example.txt" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\UsingProvides\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\UsingProvides\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\UsingProvides\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>