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/Util/util.cmd | 7 ++-----
src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 7 +++----
2 files changed, 5 insertions(+), 9 deletions(-)
(limited to 'src/ext/Util')
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd
index 3913c892..0ae8851d 100644
--- a/src/ext/Util/util.cmd
+++ b/src/ext/Util/util.cmd
@@ -8,17 +8,14 @@
@echo Building ext\Util %_C% using %_N%
-:: Restore
-msbuild -t:Restore -p:Configuration=%_C% || exit /b
-
:: Build
-msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
+msbuild -Restore -p:Configuration=%_C% || exit /b
:: Test
dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b
:: Pack
-msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b
+msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
@popd
@endlocal
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index ea1e8921..94e13139 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -15,12 +15,11 @@
<EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+ <ItemGroup Condition=" '$(NCrunch)'=='' ">
+ <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WixToolset.Data" />
- <PackageReference Include="WixToolset.Extensibility" />
+ <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
</ItemGroup>
</Project>
--
cgit v1.2.3-55-g6feb