From 1717b6b6273ef09bed9cc359d1c062c55650fd7e Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 14 Jul 2020 14:40:06 +1000
Subject: Update CompileCoreTestExtensionWixlib to be a .NET Core app.

---
 .../CompileCoreTestExtensionWixlib.csproj               |  2 +-
 src/test/Example.Extension/Example.Extension.csproj     | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/test')

diff --git a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
index 7e5c33ef..41c10d40 100644
--- a/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+++ b/src/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/test/Example.Extension/Example.Extension.csproj b/src/test/Example.Extension/Example.Extension.csproj
index fe05fcb2..d7a3b729 100644
--- a/src/test/Example.Extension/Example.Extension.csproj
+++ b/src/test/Example.Extension/Example.Extension.csproj
@@ -3,15 +3,18 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
-    <CompileWixlibExePath>$(OutputPath)net472\CompileCoreTestExtensionWixlib.exe</CompileWixlibExePath>
+    <CompileWixlibDllPath>$(OutputPath)netcoreapp2.1\CompileCoreTestExtensionWixlib.dll</CompileWixlibDllPath>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- Try to hack around VS up-to-date detection -->
-    <Content Include="$(CompileWixlibExePath)" CopyToOutputDirectory="PreserveNewest">
+    <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" />
@@ -22,9 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj">
-      <Private>false</Private>
-    </ProjectReference>
+    <ProjectReference Include="..\CompileCoreTestExtensionWixlib\CompileCoreTestExtensionWixlib.csproj" />
   </ItemGroup>
 
   <Target Name="SetExtensionWixlib">
@@ -37,7 +38,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BuildExtensionWixlib" AfterTargets="ResolveProjectReferences" DependsOnTargets="ResolveProjectReferences;SetExtensionWixlib" Inputs="@(ExtensionWxs);$(CompileWixlibExePath)" Outputs="$(WixlibPath)">
-    <Exec Command='$(CompileWixlibExePath) "$(IntermediateOutputPath)\" "$(WixlibPath)" "@(ExtensionWxs)"' />
+  <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