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.

2 files changed, 7 insertions, 11 deletions

diff --git a/src/ext/DifxApp/difxapp.cmd b/src/ext/DifxApp/difxapp.cmd
index da2fe7a9..3f822453 100644
--- a/src/ext/DifxApp/difxapp.cmd
+++ b/src/ext/DifxApp/difxapp.cmd
@@ -6,19 +6,16 @@
 @if /i "%1"=="release" set _C=Release
 @if not "%1"=="" shift & goto parse_args
 
-@echo Dependency.wixext build %_C%
-
-:: Restore
-msbuild -t:Restore -p:Configuration=%_C% || exit /b
+@echo DifxApp.wixext build %_C%
 
 :: Build
-msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b
+msbuild -Restore -p:Configuration=%_C% || exit /b
 
 :: Test
 dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b
 
 :: Pack
-msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DifxApp.wixext.csproj || exit /b
+msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.DifxApp.wixext.csproj || exit /b
 
 @popd
 @endlocal
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
index 4000d4b3..5a74ad9d 100644
--- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
+++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
@@ -7,17 +7,16 @@
     <RootNamespace>WixToolset.DifxApp</RootNamespace>
     <Description>WiX Toolset DIFxApp Extension</Description>
     <Title>WiX Toolset DIFxApp Extension</Title>
-    <IsTool>true</IsTool>
-    <ContentTargetFolders>build</ContentTargetFolders>
+    <DebugType>embedded</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(MSBuildThisFileName).targets" />
     <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 
   <ItemGroup>