diff options
author | Rob Mensching <rob@firegiant.com> | 2022-01-10 14:23:58 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-01-10 17:08:43 -0800 |
commit | 7a14f6225c0b9cceef0cebaad9287f52aee93ba9 (patch) | |
tree | 9db135f11372b0c621bb00136d8873ffeaf286c5 | |
parent | c0e933d1cec2515e1c43aa1f3b3c4bde9a17e449 (diff) | |
download | wix-7a14f6225c0b9cceef0cebaad9287f52aee93ba9.tar.gz wix-7a14f6225c0b9cceef0cebaad9287f52aee93ba9.tar.bz2 wix-7a14f6225c0b9cceef0cebaad9287f52aee93ba9.zip |
Some code clean up
3 files changed, 2 insertions, 4 deletions
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 | |||
13 | 13 | ||
14 | public void AssertSuccess() | 14 | public void AssertSuccess() |
15 | { | 15 | { |
16 | Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Output)}"); | 16 | Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:{Environment.NewLine}{String.Join(Environment.NewLine, this.Output)}"); |
17 | } | 17 | } |
18 | } | 18 | } |
19 | } | 19 | } |
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 | |||
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using WixToolset.Extensibility; | 6 | using WixToolset.Extensibility; |
7 | using WixToolset.Extensibility.Services; | ||
8 | 7 | ||
9 | internal class ConverterExtensionFactory : IExtensionFactory | 8 | internal class ConverterExtensionFactory : IExtensionFactory |
10 | { | 9 | { |
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 @@ | |||
22 | </ItemGroup> | 22 | </ItemGroup> |
23 | 23 | ||
24 | <ItemGroup> | 24 | <ItemGroup> |
25 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> | 25 | <PackageReference Include="WixBuildTools.TestSupport" /> |
26 | <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> | ||
27 | </ItemGroup> | 26 | </ItemGroup> |
28 | 27 | ||
29 | <ItemGroup> | 28 | <ItemGroup> |