From 7a14f6225c0b9cceef0cebaad9287f52aee93ba9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 10 Jan 2022 14:23:58 -0800
Subject: Some code clean up

---
 src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs          | 2 +-
 src/wix/WixToolset.Converters/ConverterExtensionFactory.cs             | 1 -
 .../WixToolsetTest.CoreIntegration.csproj                              | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs b/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
index 5610987e..fb61122d 100644
--- a/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
@@ -13,7 +13,7 @@ namespace WixBuildTools.TestSupport
 
         public void AssertSuccess()
         {
-            Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Output)}");
+            Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:{Environment.NewLine}{String.Join(Environment.NewLine, this.Output)}");
         }
     }
 }
diff --git a/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs b/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs
index d4f480aa..25d2e81a 100644
--- a/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs
+++ b/src/wix/WixToolset.Converters/ConverterExtensionFactory.cs
@@ -4,7 +4,6 @@ namespace WixToolset.Converters
 {
     using System;
     using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
 
     internal class ConverterExtensionFactory : IExtensionFactory
     {
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 72d4dc59..c03418e8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -22,8 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
-    <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+     <PackageReference Include="WixBuildTools.TestSupport" /> 
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb