From b00c72ed0ef19d2e46f60361fa06821b0bd5ec94 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 5 Jan 2021 15:13:04 -0800
Subject: Fix up tests to work well under NCrunch plus whitespace clean up

---
 .../Example.Extension/Example.Extension.csproj     | 28 ++++------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'src/test/Example.Extension')

diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index d7a3b729..f8a09164 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -6,39 +6,19 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
-    <CompileWixlibDllPath>$(OutputPath)netcoreapp2.1\CompileCoreTestExtensionWixlib.dll</CompileWixlibDllPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Try to hack around VS up-to-date detection -->
-    <Content Include="$(CompileWixlibDllPath)" CopyToOutputDirectory="PreserveNewest">
-      <Visible>false</Visible>
-    </Content>
-    <Content Include="Data\example.wxs" CopyToOutputDirectory="PreserveNewest">
-      <Visible>false</Visible>
-    </Content>
-    <ExtensionWxs Include="Data\example.wxs" />
+    <!-- This .wixlib is built by CompileCoreTestExtensionWixlib.csproj -->
+    <EmbeddedResource Include="$(BaseOutputPath)TestData\$(Configuration)\Example.wixlib" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
+    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
   </ItemGroup>
 
-  <Target Name="SetExtensionWixlib">
-    <PropertyGroup>
-      <WixlibPath>$(IntermediateOutputPath)Example.wixlib</WixlibPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <EmbeddedResource Include="$(WixlibPath)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibDllPath)" Outputs="$(WixlibPath)">
-    <Exec Command='dotnet $(CompileWixlibDllPath) "$(IntermediateOutputPath) " "$(WixlibPath)" "@(ExtensionWxs)"' />
-  </Target>
 </Project>
-- 
cgit v1.2.3-55-g6feb