@joebigelow / wix-1 / commits / 0aee408e

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.

Rob Mensching committed Dec 19, 2021 at 12:09 UTC 0aee408e0b07b92d90ede67800616f7f278a3dc4
34 files changed +113 -152
src/clean.cmd
+1
@@ -34,6 +34,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset
34 if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext"
35 if exist "%_NUGET_CACHE%\wixtoolset.sdk" rd /s/q "%_NUGET_CACHE%\wixtoolset.sdk"
36 if exist "%_NUGET_CACHE%\wixtoolset.util.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.util.wixext"
37 +if exist "%_NUGET_CACHE%\wixtoolset.ui.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.ui.wixext"
38 if exist "%_NUGET_CACHE%\wixtoolset.wcautil" rd /s/q "%_NUGET_CACHE%\wixtoolset.wcautil"
39
40 popd
src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+4 -6
@@ -12,16 +12,14 @@
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
21 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
24 - <ItemGroup Condition=" '$(NCrunch)'=='' ">
25 - <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" />
22 + <ItemGroup>
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/ComPlus/complus.cmd
+8 -9
@@ -1,22 +1,21 @@
1 @setlocal
2 @pushd %~dp0
3 -@set _C=Release
4 -@if /i "%1"=="debug" set _C=Debug
3
6 -:: Restore
7 -msbuild -p:Configuration=%_C% -t:Restore || exit /b
4 +@set _C=Debug
5 +:parse_args
6 +@if /i "%1"=="release" set _C=Release
7 +@if not "%1"=="" shift & goto parse_args
8
9 -:: Build
10 -::msbuild -p:Configuration=%_C% -p:Platform=Win32 ca\complusca.vcxproj || exit /b
11 -::msbuild -p:Configuration=%_C% -p:Platform=x64 ca\complusca.vcxproj || exit /b
9 +@echo ComPlus.wixext build %_C%
10
13 -msbuild -p:Configuration=%_C% test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
11 +:: Build
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b
16
17 :: Pack
19 -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.ComPlus.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
\ No newline at end of file
src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+3 -5
@@ -4,11 +4,10 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 - <DebugType>embedded</DebugType>
7 <RootNamespace>WixToolset.ComPlus</RootNamespace>
8 <Description>WiX Toolset ComPlus Extension</Description>
9 <Title>WiX Toolset ComPlus Extension</Title>
11 - <IsTool>true</IsTool>
10 + <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
@@ -16,12 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
24 - <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Dependency/dependency.cmd
+1 -4
@@ -8,11 +8,8 @@
8
9 @echo Dependency.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b
src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
+4 -6
@@ -4,11 +4,10 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 - <DebugType>embedded</DebugType>
7 <RootNamespace>WixToolset.Dependency</RootNamespace>
8 <Description>WiX Toolset Dependency Extension</Description>
9 <Title>WiX Toolset Dependency Extension</Title>
11 - <IsTool>true</IsTool>
10 + <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
@@ -16,12 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
24 - <PackageReference Include="WixToolset.Data" PrivateAssets="All" />
25 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/DifxApp/difxapp.cmd
+3 -6
@@ -6,19 +6,16 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
8
9 -@echo Dependency.wixext build %_C%
10 -
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
9 +@echo DifxApp.wixext build %_C%
10
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b
16
17 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DifxApp.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.DifxApp.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
+4 -5
@@ -7,17 +7,16 @@
7 <RootNamespace>WixToolset.DifxApp</RootNamespace>
8 <Description>WiX Toolset DIFxApp Extension</Description>
9 <Title>WiX Toolset DIFxApp Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+5 -7
@@ -7,21 +7,19 @@
7 <RootNamespace>WixToolset.DirectX</RootNamespace>
8 <Description>WiX Toolset DirectX Extension</Description>
9 <Title>WiX Toolset DirectX Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" PrivateAssets="All" />
21 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
25 - <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Firewall/Firewall.wixext.sln
+2
@@ -27,6 +27,7 @@ Global
27 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
28 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32
29 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32
30 + {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32
31 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32
32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
33 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
@@ -36,6 +37,7 @@ Global
37 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86
38 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86
39 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86
40 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86
41 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86
42 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86
43 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86
src/ext/Firewall/firewall.cmd
+2 -5
@@ -8,17 +8,14 @@
8
9 @echo Firewall.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b
16
17 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Firewall.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+5 -7
@@ -7,21 +7,19 @@
7 <RootNamespace>WixToolset.Firewall</RootNamespace>
8 <Description>WiX Toolset Firewallity Extension</Description>
9 <Title>WiX Toolset Firewall Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" PrivateAssets="All" />
21 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
25 - <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Http/http.cmd
+2 -5
@@ -8,17 +8,14 @@
8
9 @echo Http.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b
16
17 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Http.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Http.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Http/wixext/WixToolset.Http.wixext.csproj
+5 -7
@@ -7,21 +7,19 @@
7 <RootNamespace>WixToolset.Http</RootNamespace>
8 <Description>WiX Toolset Http Extension</Description>
9 <Title>WiX Toolset Http Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
21 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
25 - <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Iis/Iis.wixext.sln
+3
@@ -24,12 +24,15 @@ Global
24 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.ActiveCfg = Debug|Win32
25 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.Build.0 = Debug|Win32
26 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|Any CPU.ActiveCfg = Release|Win32
27 + {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|Any CPU.Build.0 = Release|Win32
28 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.ActiveCfg = Release|Win32
29 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.Build.0 = Release|Win32
30 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|Any CPU.ActiveCfg = Debug|x86
31 + {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|Any CPU.Build.0 = Debug|x86
32 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.ActiveCfg = Debug|x86
33 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.Build.0 = Debug|x86
34 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|Any CPU.ActiveCfg = Release|x86
35 + {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|Any CPU.Build.0 = Release|x86
36 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.ActiveCfg = Release|x86
37 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.Build.0 = Release|x86
38 {612029FB-B5D4-4D7E-B794-A0E202BFE493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
src/ext/Iis/iis.cmd
+2 -5
@@ -8,17 +8,14 @@
8
9 @echo Iis.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b
16
17 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Iis.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Iis.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
+5 -7
@@ -7,21 +7,19 @@
7 <RootNamespace>WixToolset.Iis</RootNamespace>
8 <Description>WiX Toolset Iis Extension</Description>
9 <Title>WiX Toolset Iis Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
21 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
25 - <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Iis/wixlib/iis.wixproj
+3 -3
@@ -14,9 +14,9 @@
14 </ItemGroup>
15
16 <ItemGroup>
17 - <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
18 - <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
19 - <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
17 + <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" />
18 + <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" />
19 + <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" />
20 </ItemGroup>
21
22 <ItemGroup>
src/ext/Msmq/msmq.cmd
+2 -5
@@ -8,17 +8,14 @@
8
9 @echo Msmq.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b
16
17 :: Pack
21 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Msmq.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Msmq.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
+5 -6
@@ -7,20 +7,19 @@
7 <RootNamespace>WixToolset.Msmq</RootNamespace>
8 <Description>WiX Toolset MSMQ Extension</Description>
9 <Title>WiX Toolset MSMQ Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
24 - <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/NetFx/netfx.cmd
+2 -5
@@ -6,13 +6,10 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
8
9 -@echo Building ext\NetFx %_C%
10 -
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
9 +@echo NetFx.wixext build %_C%
10
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+4 -5
@@ -4,10 +4,10 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 - <DebugType>embedded</DebugType>
7 <RootNamespace>WixToolset.Netfx</RootNamespace>
8 <Description>WiX Toolset .NET extension</Description>
9 <Title>WiX Toolset .NET extension</Title>
10 + <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
@@ -15,12 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
16 </ItemGroup>
17
18 - <ItemGroup>
19 - <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
23 - <PackageReference Include="WixToolset.Data" />
24 - <PackageReference Include="WixToolset.Extensibility" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/PowerShell/ps.cmd
+1 -4
@@ -8,11 +8,8 @@
8
9 @echo PowerShell.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b
src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+5 -6
@@ -7,20 +7,19 @@
7 <RootNamespace>WixToolset.PowerShell</RootNamespace>
8 <Description>WiX Toolset PowerShell Extension</Description>
9 <Title>WiX Toolset PowerShell Extension</Title>
10 - <IsTool>true</IsTool>
11 - <ContentTargetFolders>build</ContentTargetFolders>
10 + <DebugType>embedded</DebugType>
11 + <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
14 <ItemGroup>
15 - <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
16 </ItemGroup>
17
19 - <ItemGroup>
20 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
24 - <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Sql/Sql.wixext.sln
+2
@@ -24,6 +24,7 @@ Global
24 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.ActiveCfg = Debug|Win32
25 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.Build.0 = Debug|Win32
26 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.ActiveCfg = Release|Win32
27 + {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.Build.0 = Release|Win32
28 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.ActiveCfg = Release|Win32
29 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.Build.0 = Release|Win32
30 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -31,6 +32,7 @@ Global
32 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.ActiveCfg = Debug|x86
33 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.Build.0 = Debug|x86
34 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.ActiveCfg = Release|x86
35 + {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.Build.0 = Release|x86
36 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.ActiveCfg = Release|x86
37 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.Build.0 = Release|x86
38 {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
src/ext/Sql/sql.cmd
+1 -4
@@ -8,11 +8,8 @@
8
9 @echo Sql.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b
src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
+3 -3
@@ -15,11 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
16 </ItemGroup>
17
18 - <ItemGroup>
19 - <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
23 - <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/UI/ui.cmd
+3 -7
@@ -6,20 +6,16 @@
6 @if /i "%1"=="release" set _C=Release
7 @if not "%1"=="" shift & goto parse_args
8
9 -@echo Building ext\UI %_C%
10 -
11 -:: Restore
12 -@REM nuget restore || exit /b
13 -msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b
9 +@echo UI.wixext build %_C%
10
11 :: Build
16 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
16
17 :: Pack
22 -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+2 -3
@@ -16,11 +16,10 @@
16 </ItemGroup>
17
18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 - <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" />
19 + <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
23 - <PackageReference Include="WixToolset.Data" />
24 - <PackageReference Include="WixToolset.Extensibility" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/Util/util.cmd
+2 -5
@@ -8,17 +8,14 @@
8
9 @echo Building ext\Util %_C% using %_N%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b
16
17 :: Pack
21 -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b
18 +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
19
20 @popd
21 @endlocal
src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+3 -4
@@ -15,12 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
16 </ItemGroup>
17
18 - <ItemGroup>
19 - <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
23 - <PackageReference Include="WixToolset.Data" />
24 - <PackageReference Include="WixToolset.Extensibility" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>
src/ext/VisualStudio/VisualStudio.wixext.sln
+11
@@ -27,6 +27,7 @@ Global
27 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32
28 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.Build.0 = Debug|Win32
29 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|Any CPU.ActiveCfg = Release|Win32
30 + {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|Any CPU.Build.0 = Release|Win32
31 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x64.ActiveCfg = Release|Win32
32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.ActiveCfg = Release|Win32
33 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.Build.0 = Release|Win32
@@ -51,6 +52,16 @@ Global
52 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x64.Build.0 = Release|Any CPU
53 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU
54 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.Build.0 = Release|Any CPU
55 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.ActiveCfg = Debug|x86
56 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.Build.0 = Debug|x86
57 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x86
58 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.ActiveCfg = Debug|x86
59 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.Build.0 = Debug|x86
60 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.ActiveCfg = Release|x86
61 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.Build.0 = Release|x86
62 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x86
63 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.ActiveCfg = Release|x86
64 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.Build.0 = Release|x86
65 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
src/ext/VisualStudio/vs.cmd
+1 -4
@@ -8,11 +8,8 @@
8
9 @echo VisualStudio.wixext build %_C%
10
11 -:: Restore
12 -msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 -
11 :: Build
15 -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b
12 +msbuild -Restore -p:Configuration=%_C% || exit /b
13
14 :: Test
15 dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b
src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+4 -4
@@ -7,7 +7,7 @@
7 <RootNamespace>WixToolset.VisualStudio</RootNamespace>
8 <Description>WiX Toolset Visual Studio Extension</Description>
9 <Title>WiX Toolset VS Extension</Title>
10 - <IsTool>true</IsTool>
10 + <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
@@ -15,11 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
16 </ItemGroup>
17
18 - <ItemGroup>
19 - <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
18 + <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 + <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup>
21
22 <ItemGroup>
23 - <PackageReference Include="WixToolset.Extensibility" />
23 + <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup>
25 </Project>