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/ComPlus/complus.cmd                             | 17 ++++++++---------
 src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj |  8 +++-----
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'src/ext/ComPlus')

diff --git a/src/ext/ComPlus/complus.cmd b/src/ext/ComPlus/complus.cmd
index bea27765..67e55339 100644
--- a/src/ext/ComPlus/complus.cmd
+++ b/src/ext/ComPlus/complus.cmd
@@ -1,22 +1,21 @@
 @setlocal
 @pushd %~dp0
-@set _C=Release
-@if /i "%1"=="debug" set _C=Debug
 
-:: Restore
-msbuild -p:Configuration=%_C% -t:Restore || exit /b
+@set _C=Debug
+:parse_args
+@if /i "%1"=="release" set _C=Release
+@if not "%1"=="" shift & goto parse_args
 
-:: Build
-::msbuild -p:Configuration=%_C% -p:Platform=Win32 ca\complusca.vcxproj || exit /b
-::msbuild -p:Configuration=%_C% -p:Platform=x64 ca\complusca.vcxproj || exit /b
+@echo ComPlus.wixext build %_C%
 
-msbuild -p:Configuration=%_C% test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
+:: Build
+msbuild -Restore -p:Configuration=%_C% || exit /b
 
 :: Test
 dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b
 
 :: Pack
-msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.ComPlus.wixext.csproj || exit /b
+msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
 
 @popd
 @endlocal
\ No newline at end of file
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
index 806977b2..57db47a5 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
@@ -4,11 +4,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <DebugType>embedded</DebugType>
     <RootNamespace>WixToolset.ComPlus</RootNamespace>
     <Description>WiX Toolset ComPlus Extension</Description>
     <Title>WiX Toolset ComPlus Extension</Title>
-    <IsTool>true</IsTool>
+    <DebugType>embedded</DebugType>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
@@ -16,12 +15,11 @@
     <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
     <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb