From 03d5c46cbbb94f73ac468709345fc6a0e50def8d Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 22 Apr 2021 17:57:31 -0700
Subject: Move Tools into wix

---
 .../WixBuildTaskFixture.cs                         | 67 ----------------------
 .../WixToolsetTest.BuildTasks.csproj               | 35 -----------
 .../WixToolsetTest.BuildTasks.v3.ncrunchproject    |  8 ---
 3 files changed, 110 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject

(limited to 'src/test/WixToolsetTest.BuildTasks')

diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
deleted file mode 100644
index 9d132f66..00000000
--- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ /dev/null
@@ -1,67 +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.BuildTasks
-{
-    using System.IO;
-    using System.Linq;
-    using Microsoft.Build.Utilities;
-    using WixBuildTools.TestSupport;
-    using WixToolset.BuildTasks;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using Xunit;
-
-    public class WixBuildTaskFixture
-    {
-        [Fact]
-        public void CanBuildSimpleMsiPackage()
-        {
-            var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb");
-                var engine = new FakeBuildEngine();
-
-                var task = new WixBuild
-                {
-                    BuildEngine = engine,
-                    SourceFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.wxs")),
-                        new TaskItem(Path.Combine(folder, "PackageComponents.wxs")),
-                    },
-                    LocalizationFiles = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
-                    },
-                    BindInputPaths = new[]
-                    {
-                        new TaskItem(Path.Combine(folder, "data")),
-                    },
-                    IntermediateDirectory = new TaskItem(intermediateFolder),
-                    OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
-                    PdbType = "Full",
-                    PdbFile = new TaskItem(pdbPath),
-                    DefaultCompressionLevel = "nOnE",
-                };
-
-                var result = task.Execute();
-                Assert.True(result, $"MSBuild task failed unexpectedly. Output:\r\n{engine.Output}");
-
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(pdbPath));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\cab1.cab")));
-
-                var intermediate = Intermediate.Load(pdbPath);
-                var section = intermediate.Sections.Single();
-
-                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
deleted file mode 100644
index c01860cd..00000000
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ /dev/null
@@ -1,35 +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>net461</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" Link="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\WixToolsetTest.Sdk\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" Condition="'$(TargetFramework)'=='netcoreapp3.1' " />
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
-    <PackageReference Include="WixToolset.Core.TestPackage" 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>
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
deleted file mode 100644
index f1d03cd7..00000000
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+++ /dev/null
@@ -1,8 +0,0 @@
-<ProjectConfiguration>
-  <Settings>
-    <HiddenComponentWarnings />
-    <IgnoredTests>
-      <AllTestsSelector />
-    </IgnoredTests>
-  </Settings>
-</ProjectConfiguration>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb