From 14fdc9113bdc7270fb33e06990081988eb099ba9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 9 May 2019 08:43:08 -0700
Subject: Update to latest Core changes plus other minor fixes

---
 .../WixToolsetTest.BuildTasks/MsbuildFixture.cs     | 21 +++++++--------------
 .../WixToolsetTest.BuildTasks.csproj                |  4 ++--
 .../WixToolsetTest.BuildTasks.v3.ncrunchproject     |  1 -
 3 files changed, 9 insertions(+), 17 deletions(-)

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

diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
index 74978322..9f761c32 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
@@ -13,13 +13,6 @@ namespace WixToolsetTest.BuildTasks
     {
         private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets");
 
-        public MsbuildFixture()
-        {
-            this.MsbuildRunner = new MsbuildRunner();
-        }
-
-        private MsbuildRunner MsbuildRunner { get; }
-
         [Fact]
         public void CanBuildSimpleMsiPackage()
         {
@@ -31,7 +24,7 @@ namespace WixToolsetTest.BuildTasks
                 var binFolder = Path.Combine(baseFolder, @"bin\");
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -69,7 +62,7 @@ namespace WixToolsetTest.BuildTasks
                 var binFolder = Path.Combine(baseFolder, @"bin\");
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -94,7 +87,7 @@ namespace WixToolsetTest.BuildTasks
                 var binFolder = Path.Combine(baseFolder, @"bin\");
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -116,7 +109,7 @@ namespace WixToolsetTest.BuildTasks
                 var binFolder = Path.Combine(baseFolder, @"bin\");
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -141,7 +134,7 @@ namespace WixToolsetTest.BuildTasks
                 var binFolder = Path.Combine(baseFolder, @"bin\");
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -169,7 +162,7 @@ namespace WixToolsetTest.BuildTasks
                 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
 
                 // Build
-                var result = this.MsbuildRunner.Execute(projectPath, new[]
+                var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -187,7 +180,7 @@ namespace WixToolsetTest.BuildTasks
                 Assert.NotEmpty(createdPaths);
 
                 // Clean
-                result = this.MsbuildRunner.Execute(projectPath, new[]
+                result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index edab8a67..c5498de4 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.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
index 8f3624cb..cf22dfa9 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
@@ -1,6 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
     <HiddenComponentWarnings />
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb