From 0aee408e0b07b92d90ede67800616f7f278a3dc4 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 19 Dec 2021 12:09:04 -0800
Subject: Simplify and normalize ext projects

Now that wix.targets is more compatible with MS.Common.targets
the extension projects can be simplified. Also made their project
files more consistent with each other.
---
 src/ext/PowerShell/ps.cmd                                     |  5 +----
 src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj | 11 +++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/ext/PowerShell')

diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd
index b5a0657b..cfb1274b 100644
--- a/src/ext/PowerShell/ps.cmd
+++ b/src/ext/PowerShell/ps.cmd
@@ -8,11 +8,8 @@
 
 @echo PowerShell.wixext build %_C%
 
-:: Restore
-msbuild -t:Restore -p:Configuration=%_C% || exit /b
-
 :: Build
-msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b
+msbuild -Restore -p:Configuration=%_C% || exit /b
 
 :: Test
 dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
index 4d5403d7..58272eea 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
@@ -7,20 +7,19 @@
     <RootNamespace>WixToolset.PowerShell</RootNamespace>
     <Description>WiX Toolset PowerShell Extension</Description>
     <Title>WiX Toolset PowerShell Extension</Title>
-    <IsTool>true</IsTool>
-    <ContentTargetFolders>build</ContentTargetFolders>
+    <DebugType>embedded</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(MSBuildThisFileName).targets" />
     <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb