aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-05-04 12:07:04 -0700
committerRob Mensching <rob@firegiant.com>2021-05-04 12:07:04 -0700
commit3caaf742fcd19170a8732570654d3b2cbb18830f (patch)
tree2b0d1bf83b0ced8f0620be4aaec4c597b825d372 /src/test
parentfb095340926a93e3eec9592e3e255b7d7b04d9d5 (diff)
downloadwix-3caaf742fcd19170a8732570654d3b2cbb18830f.tar.gz
wix-3caaf742fcd19170a8732570654d3b2cbb18830f.tar.bz2
wix-3caaf742fcd19170a8732570654d3b2cbb18830f.zip
Move Dependency.wixext into ext
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs38
-rw-r--r--src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.en-us.wxl11
-rw-r--r--src/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs21
-rw-r--r--src/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj39
4 files changed, 0 insertions, 109 deletions
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 @@
1// 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.
2
3namespace WixToolsetTest.Dependency
4{
5 using System.Linq;
6 using System.Text.RegularExpressions;
7 using WixBuildTools.TestSupport;
8 using WixToolset.Core.TestPackage;
9 using WixToolset.Dependency;
10 using Xunit;
11
12 public class DependencyExtensionFixture
13 {
14 [Fact]
15 public void CanBuildUsingProvides()
16 {
17 var folder = TestData.Get(@"TestData\UsingProvides");
18 var build = new Builder(folder, typeof(DependencyExtensionFactory), new[] { folder });
19
20 var results = build.BuildAndQuery(Build, "CustomAction", "WixDependencyProvider")
21 .Select(r => Regex.Replace(r, "{[^}]*}", "{*}"))
22 .ToArray();
23 WixAssert.CompareLineByLine(new[]
24 {
25 "CustomAction:Wix4DependencyCheck_X86\t1\tDependencyCA_X86\tWixDependencyCheck\t",
26 "CustomAction:Wix4DependencyRequire_X86\t1\tDependencyCA_X86\tWixDependencyRequire\t",
27 "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
28 "WixDependencyProvider:depTpv28q7slcxvXPWmU4Z0GfbiI.4\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t{*}\t\t\t",
29 }, results);
30 }
31
32 private static void Build(string[] args)
33 {
34 var result = WixRunner.Execute(args)
35 .AssertSuccess();
36 }
37 }
38}
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4This file contains the declaration of all the localizable strings.
5-->
6<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
7
8 <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
9 <String Id="FeatureTitle">MsiPackage</String>
10
11</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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
2 xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
3 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
4 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
5
6 <StandardDirectory Id="ProgramFilesFolder">
7 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
8 </StandardDirectory>
9
10 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
11 <Component Directory="INSTALLFOLDER">
12 <File Name="example.txt" Source="Package.wxs" />
13 <Provides Key="UsingProvides" dep:Check="yes" />
14 <Provides>
15 <Requires ProviderKey="UsingRequires" Minimum="1.0.0.0" dep:Enforce="yes" />
16 </Provides>
17 </Component>
18 </Feature>
19
20 </Package>
21</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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3
4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <DebugType>embedded</DebugType>
8 <IsPackable>false</IsPackable>
9 </PropertyGroup>
10
11 <PropertyGroup>
12 <NoWarn>NU1701</NoWarn>
13 </PropertyGroup>
14
15 <ItemGroup>
16 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
17 </ItemGroup>
18
19 <ItemGroup>
20 <ProjectReference Include="..\..\wixext\WixToolset.Dependency.wixext.csproj" />
21 </ItemGroup>
22
23 <ItemGroup>
24 <PackageReference Include="WixToolset.Core" Version="4.0.*" />
25 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
26 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
27 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
28 </ItemGroup>
29
30 <ItemGroup>
31 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
32 </ItemGroup>
33
34 <ItemGroup>
35 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
36 <PackageReference Include="xunit" Version="2.4.1" />
37 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
38 </ItemGroup>
39</Project>