From 0aee408e0b07b92d90ede67800616f7f278a3dc4 Mon Sep 17 00:00:00 2001 From: Rob Mensching 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/clean.cmd | 1 + src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj | 10 ++++------ src/ext/ComPlus/complus.cmd | 17 ++++++++--------- src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj | 8 +++----- src/ext/Dependency/dependency.cmd | 5 +---- .../wixext/WixToolset.Dependency.wixext.csproj | 10 ++++------ src/ext/DifxApp/difxapp.cmd | 9 +++------ src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj | 9 ++++----- src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj | 12 +++++------- src/ext/Firewall/Firewall.wixext.sln | 2 ++ src/ext/Firewall/firewall.cmd | 7 ++----- .../Firewall/wixext/WixToolset.Firewall.wixext.csproj | 12 +++++------- src/ext/Http/http.cmd | 7 ++----- src/ext/Http/wixext/WixToolset.Http.wixext.csproj | 12 +++++------- src/ext/Iis/Iis.wixext.sln | 3 +++ src/ext/Iis/iis.cmd | 7 ++----- src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj | 12 +++++------- src/ext/Iis/wixlib/iis.wixproj | 6 +++--- src/ext/Msmq/msmq.cmd | 7 ++----- src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj | 11 +++++------ src/ext/NetFx/netfx.cmd | 7 ++----- src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | 9 ++++----- src/ext/PowerShell/ps.cmd | 5 +---- .../wixext/WixToolset.PowerShell.wixext.csproj | 11 +++++------ src/ext/Sql/Sql.wixext.sln | 2 ++ src/ext/Sql/sql.cmd | 5 +---- src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj | 6 +++--- src/ext/UI/ui.cmd | 10 +++------- src/ext/UI/wixext/WixToolset.UI.wixext.csproj | 5 ++--- src/ext/Util/util.cmd | 7 ++----- src/ext/Util/wixext/WixToolset.Util.wixext.csproj | 7 +++---- src/ext/VisualStudio/VisualStudio.wixext.sln | 11 +++++++++++ src/ext/VisualStudio/vs.cmd | 5 +---- .../wixext/WixToolset.VisualStudio.wixext.csproj | 8 ++++---- 34 files changed, 113 insertions(+), 152 deletions(-) diff --git a/src/clean.cmd b/src/clean.cmd index 8e1271a7..0bef6cc2 100644 --- a/src/clean.cmd +++ b/src/clean.cmd @@ -34,6 +34,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext" if exist "%_NUGET_CACHE%\wixtoolset.sdk" rd /s/q "%_NUGET_CACHE%\wixtoolset.sdk" if exist "%_NUGET_CACHE%\wixtoolset.util.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.util.wixext" +if exist "%_NUGET_CACHE%\wixtoolset.ui.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.ui.wixext" if exist "%_NUGET_CACHE%\wixtoolset.wcautil" rd /s/q "%_NUGET_CACHE%\wixtoolset.wcautil" popd diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj index c0f17975..633fc3a8 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj @@ -12,16 +12,14 @@ - - - - + + - - + + 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 @@ netstandard2.0 - embedded WixToolset.ComPlus WiX Toolset ComPlus Extension WiX Toolset ComPlus Extension - true + embedded true @@ -16,12 +15,11 @@ - - + + - diff --git a/src/ext/Dependency/dependency.cmd b/src/ext/Dependency/dependency.cmd index e367ab1b..f219fd57 100644 --- a/src/ext/Dependency/dependency.cmd +++ b/src/ext/Dependency/dependency.cmd @@ -8,11 +8,8 @@ @echo Dependency.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj index 58375065..76ecf6bf 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj @@ -4,11 +4,10 @@ netstandard2.0 - embedded WixToolset.Dependency WiX Toolset Dependency Extension WiX Toolset Dependency Extension - true + embedded true @@ -16,12 +15,11 @@ - - + + - - + 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 @@ WixToolset.DifxApp WiX Toolset DIFxApp Extension WiX Toolset DIFxApp Extension - true - build + embedded + true - - - + + diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj index 4a5a398e..94a3f400 100644 --- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj +++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj @@ -7,21 +7,19 @@ WixToolset.DirectX WiX Toolset DirectX Extension WiX Toolset DirectX Extension - true - build + embedded + true - - - - + + - + diff --git a/src/ext/Firewall/Firewall.wixext.sln b/src/ext/Firewall/Firewall.wixext.sln index 4061bea9..c6494e4f 100644 --- a/src/ext/Firewall/Firewall.wixext.sln +++ b/src/ext/Firewall/Firewall.wixext.sln @@ -27,6 +27,7 @@ Global {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = Debug|Win32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.ActiveCfg = Release|Win32 + {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|Any CPU.Build.0 = Release|Win32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32 @@ -36,6 +37,7 @@ Global {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86 + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.Build.0 = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd index 47a5edc5..8e838bcf 100644 --- a/src/ext/Firewall/firewall.cmd +++ b/src/ext/Firewall/firewall.cmd @@ -8,17 +8,14 @@ @echo Firewall.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Firewall.wixext.csproj || exit /b @popd @endlocal diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj index 43164950..95655043 100644 --- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj +++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj @@ -7,21 +7,19 @@ WixToolset.Firewall WiX Toolset Firewallity Extension WiX Toolset Firewall Extension - true - build + embedded + true - - - - + + - + diff --git a/src/ext/Http/http.cmd b/src/ext/Http/http.cmd index 0115db8b..12919b6b 100644 --- a/src/ext/Http/http.cmd +++ b/src/ext/Http/http.cmd @@ -8,17 +8,14 @@ @echo Http.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Http.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Http.wixext.csproj || exit /b @popd @endlocal diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj index cfa874a0..52273c3a 100644 --- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj +++ b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj @@ -7,21 +7,19 @@ WixToolset.Http WiX Toolset Http Extension WiX Toolset Http Extension - true - build + embedded + true - - - - + + - + diff --git a/src/ext/Iis/Iis.wixext.sln b/src/ext/Iis/Iis.wixext.sln index d1ab149e..f0abdcd3 100644 --- a/src/ext/Iis/Iis.wixext.sln +++ b/src/ext/Iis/Iis.wixext.sln @@ -24,12 +24,15 @@ Global {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.ActiveCfg = Debug|Win32 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.Build.0 = Debug|Win32 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|Any CPU.ActiveCfg = Release|Win32 + {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|Any CPU.Build.0 = Release|Win32 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.ActiveCfg = Release|Win32 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.Build.0 = Release|Win32 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|Any CPU.ActiveCfg = Debug|x86 + {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|Any CPU.Build.0 = Debug|x86 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.ActiveCfg = Debug|x86 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.Build.0 = Debug|x86 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|Any CPU.ActiveCfg = Release|x86 + {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|Any CPU.Build.0 = Release|x86 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.ActiveCfg = Release|x86 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.Build.0 = Release|x86 {612029FB-B5D4-4D7E-B794-A0E202BFE493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd index b5db37ac..8a3f05c1 100644 --- a/src/ext/Iis/iis.cmd +++ b/src/ext/Iis/iis.cmd @@ -8,17 +8,14 @@ @echo Iis.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Iis.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Iis.wixext.csproj || exit /b @popd @endlocal diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj index a8b94783..056a027c 100644 --- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj +++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj @@ -7,21 +7,19 @@ WixToolset.Iis WiX Toolset Iis Extension WiX Toolset Iis Extension - true - build + embedded + true - - - - + + - + diff --git a/src/ext/Iis/wixlib/iis.wixproj b/src/ext/Iis/wixlib/iis.wixproj index 6ac4aea1..989d2bc5 100644 --- a/src/ext/Iis/wixlib/iis.wixproj +++ b/src/ext/Iis/wixlib/iis.wixproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/ext/Msmq/msmq.cmd b/src/ext/Msmq/msmq.cmd index dc85e8e9..8b6865fe 100644 --- a/src/ext/Msmq/msmq.cmd +++ b/src/ext/Msmq/msmq.cmd @@ -8,17 +8,14 @@ @echo Msmq.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Msmq.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Msmq.wixext.csproj || exit /b @popd @endlocal diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj index 7467aaf2..3e2b0fae 100644 --- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj +++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj @@ -7,20 +7,19 @@ WixToolset.Msmq WiX Toolset MSMQ Extension WiX Toolset MSMQ Extension - true - build + embedded + true - - - + + - + diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index f5e3984e..182630b3 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd @@ -6,13 +6,10 @@ @if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args -@echo Building ext\NetFx %_C% - -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b +@echo NetFx.wixext build %_C% :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 0749e688..667576c1 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj @@ -4,10 +4,10 @@ netstandard2.0 - embedded WixToolset.Netfx WiX Toolset .NET extension WiX Toolset .NET extension + embedded true @@ -15,12 +15,11 @@ - - + + - - + 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 @@ WixToolset.PowerShell WiX Toolset PowerShell Extension WiX Toolset PowerShell Extension - true - build + embedded + true - - - + + - + diff --git a/src/ext/Sql/Sql.wixext.sln b/src/ext/Sql/Sql.wixext.sln index bb280d36..6a2a132a 100644 --- a/src/ext/Sql/Sql.wixext.sln +++ b/src/ext/Sql/Sql.wixext.sln @@ -24,6 +24,7 @@ Global {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.ActiveCfg = Debug|Win32 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.Build.0 = Debug|Win32 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.ActiveCfg = Release|Win32 + {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|Any CPU.Build.0 = Release|Win32 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.ActiveCfg = Release|Win32 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.Build.0 = Release|Win32 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.ActiveCfg = Debug|x86 @@ -31,6 +32,7 @@ Global {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.ActiveCfg = Debug|x86 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.Build.0 = Debug|x86 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.ActiveCfg = Release|x86 + {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.Build.0 = Release|x86 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.ActiveCfg = Release|x86 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.Build.0 = Release|x86 {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd index a18d4648..97ed8448 100644 --- a/src/ext/Sql/sql.cmd +++ b/src/ext/Sql/sql.cmd @@ -8,11 +8,8 @@ @echo Sql.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj index 15cc2820..c72a5248 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj @@ -15,11 +15,11 @@ - - + + - + diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd index b0380adc..d62870d4 100644 --- a/src/ext/UI/ui.cmd +++ b/src/ext/UI/ui.cmd @@ -6,20 +6,16 @@ @if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args -@echo Building ext\UI %_C% - -:: Restore -@REM nuget restore || exit /b -msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b +@echo UI.wixext build %_C% :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b @popd @endlocal diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj index 043cb259..635b685c 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj @@ -16,11 +16,10 @@ - + - - + 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 @@ - - + + - - + diff --git a/src/ext/VisualStudio/VisualStudio.wixext.sln b/src/ext/VisualStudio/VisualStudio.wixext.sln index 9bdd6228..f5f0ad3a 100644 --- a/src/ext/VisualStudio/VisualStudio.wixext.sln +++ b/src/ext/VisualStudio/VisualStudio.wixext.sln @@ -27,6 +27,7 @@ Global {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.Build.0 = Debug|Win32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|Any CPU.ActiveCfg = Release|Win32 + {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|Any CPU.Build.0 = Release|Win32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x64.ActiveCfg = Release|Win32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.ActiveCfg = Release|Win32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.Build.0 = Release|Win32 @@ -51,6 +52,16 @@ Global {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x64.Build.0 = Release|Any CPU {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.Build.0 = Release|Any CPU + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.ActiveCfg = Debug|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.Build.0 = Debug|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.ActiveCfg = Debug|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.Build.0 = Debug|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.ActiveCfg = Release|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.Build.0 = Release|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.ActiveCfg = Release|x86 + {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.Build.0 = Release|x86 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/src/ext/VisualStudio/vs.cmd b/src/ext/VisualStudio/vs.cmd index 12caed8c..3d5cf015 100644 --- a/src/ext/VisualStudio/vs.cmd +++ b/src/ext/VisualStudio/vs.cmd @@ -8,11 +8,8 @@ @echo VisualStudio.wixext build %_C% -:: Restore -msbuild -t:Restore -p:Configuration=%_C% || exit /b - :: Build -msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b +msbuild -Restore -p:Configuration=%_C% || exit /b :: Test dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj index 8a3a8e6f..a5b7ea54 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj @@ -7,7 +7,7 @@ WixToolset.VisualStudio WiX Toolset Visual Studio Extension WiX Toolset VS Extension - true + embedded true @@ -15,11 +15,11 @@ - - + + - + -- cgit v1.2.3-55-g6feb