From 3caaf742fcd19170a8732570654d3b2cbb18830f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 4 May 2021 12:07:04 -0700
Subject: Move Dependency.wixext into ext

---
 .../DependencyExtensionFixture.cs                  | 38 ---------------------
 .../TestData/UsingProvides/Package.en-us.wxl       | 11 ------
 .../TestData/UsingProvides/Package.wxs             | 21 ------------
 .../WixToolsetTest.Dependency.csproj               | 39 ----------------------
 4 files changed, 109 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
 delete mode 100644 src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj

(limited to 'src/test')

diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
deleted file mode 100644
index 708ae658..00000000
--- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.
-
-namespace WixToolsetTest.Dependency
-{
-    using System.Linq;
-    using System.Text.RegularExpressions;
-    using WixBuildTools.TestSupport;
-    using WixToolset.Core.TestPackage;
-    using WixToolset.Dependency;
-    using Xunit;
-
-    public class DependencyExtensionFixture
-    {
-        [Fact]
-        public void CanBuildUsingProvides()
-        {
-            var folder = TestData.Get(@"TestData\UsingProvides");
-            var build = new Builder(folder, typeof(DependencyExtensionFactory), new[] { folder });
-
-            var results = build.BuildAndQuery(Build, "CustomAction", "WixDependencyProvider")
-                               .Select(r => Regex.Replace(r, "{[^}]*}", "{*}"))
-                               .ToArray();
-            WixAssert.CompareLineByLine(new[]
-            {
-                "CustomAction:Wix4DependencyCheck_X86\t1\tDependencyCA_X86\tWixDependencyCheck\t",
-                "CustomAction:Wix4DependencyRequire_X86\t1\tDependencyCA_X86\tWixDependencyRequire\t",
-                "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
-                "WixDependencyProvider:depTpv28q7slcxvXPWmU4Z0GfbiI.4\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t{*}\t\t\t",
-            }, results);
-        }
-
-        private static void Build(string[] args)
-        {
-            var result = WixRunner.Execute(args)
-                                  .AssertSuccess();
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.en-us.wxl b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
deleted file mode 100644
index 65984395..00000000
--- a/src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<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)" />
-
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-    </StandardDirectory>
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <Component Directory="INSTALLFOLDER">
-        <File Name="example.txt" Source="Package.wxs" />
-        <Provides Key="UsingProvides" dep:Check="yes" />
-        <Provides>
-          <Requires ProviderKey="UsingRequires" Minimum="1.0.0.0" dep:Enforce="yes" />
-        </Provides>
-      </Component>
-    </Feature>
-
-  </Package>
-</Wix>
diff --git a/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
deleted file mode 100644
index 0b80dc83..00000000
--- a/src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <DebugType>embedded</DebugType>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\wixext\WixToolset.Dependency.wixext.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Core" Version="4.0.*" />
-    <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
-    <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
-    <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
-- 
cgit v1.2.3-55-g6feb