aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj10
-rw-r--r--src/ext/ComPlus/complus.cmd17
-rw-r--r--src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj8
-rw-r--r--src/ext/Dependency/dependency.cmd5
-rw-r--r--src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj10
-rw-r--r--src/ext/DifxApp/difxapp.cmd9
-rw-r--r--src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj9
-rw-r--r--src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj12
-rw-r--r--src/ext/Firewall/Firewall.wixext.sln2
-rw-r--r--src/ext/Firewall/firewall.cmd7
-rw-r--r--src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj12
-rw-r--r--src/ext/Http/http.cmd7
-rw-r--r--src/ext/Http/wixext/WixToolset.Http.wixext.csproj12
-rw-r--r--src/ext/Iis/Iis.wixext.sln3
-rw-r--r--src/ext/Iis/iis.cmd7
-rw-r--r--src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj12
-rw-r--r--src/ext/Iis/wixlib/iis.wixproj6
-rw-r--r--src/ext/Msmq/msmq.cmd7
-rw-r--r--src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj11
-rw-r--r--src/ext/NetFx/netfx.cmd7
-rw-r--r--src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj9
-rw-r--r--src/ext/PowerShell/ps.cmd5
-rw-r--r--src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj11
-rw-r--r--src/ext/Sql/Sql.wixext.sln2
-rw-r--r--src/ext/Sql/sql.cmd5
-rw-r--r--src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj6
-rw-r--r--src/ext/UI/ui.cmd10
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.csproj5
-rw-r--r--src/ext/Util/util.cmd7
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.csproj7
-rw-r--r--src/ext/VisualStudio/VisualStudio.wixext.sln11
-rw-r--r--src/ext/VisualStudio/vs.cmd5
-rw-r--r--src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj8
33 files changed, 112 insertions, 152 deletions
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 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup Condition=" '$(NCrunch)'=='' "> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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 @@
1@setlocal 1@setlocal
2@pushd %~dp0 2@pushd %~dp0
3@set _C=Release
4@if /i "%1"=="debug" set _C=Debug
5 3
6:: Restore 4@set _C=Debug
7msbuild -p:Configuration=%_C% -t:Restore || exit /b 5:parse_args
6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args
8 8
9:: Build 9@echo ComPlus.wixext build %_C%
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
12 10
13msbuild -p:Configuration=%_C% test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b 11:: Build
12msbuild -Restore -p:Configuration=%_C% || exit /b
14 13
15:: Test 14:: Test
16dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b
17 16
18:: Pack 17:: Pack
19msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.ComPlus.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
20 19
21@popd 20@popd
22@endlocal \ No newline at end of file 21@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 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netstandard2.0</TargetFramework>
7 <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.ComPlus</RootNamespace> 7 <RootNamespace>WixToolset.ComPlus</RootNamespace>
9 <Description>WiX Toolset ComPlus Extension</Description> 8 <Description>WiX Toolset ComPlus Extension</Description>
10 <Title>WiX Toolset ComPlus Extension</Title> 9 <Title>WiX Toolset ComPlus Extension</Title>
11 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
12 <IncludeSymbols>true</IncludeSymbols> 11 <IncludeSymbols>true</IncludeSymbols>
13 </PropertyGroup> 12 </PropertyGroup>
14 13
@@ -16,12 +15,11 @@
16 <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 </ItemGroup> 20 </ItemGroup>
22 21
23 <ItemGroup> 22 <ItemGroup>
24 <PackageReference Include="WixToolset.Data" PrivateAssets="all" />
25 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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 @@
8 8
9@echo Dependency.wixext build %_C% 9@echo Dependency.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Dependency || exit /b 15dotnet 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 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netstandard2.0</TargetFramework>
7 <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.Dependency</RootNamespace> 7 <RootNamespace>WixToolset.Dependency</RootNamespace>
9 <Description>WiX Toolset Dependency Extension</Description> 8 <Description>WiX Toolset Dependency Extension</Description>
10 <Title>WiX Toolset Dependency Extension</Title> 9 <Title>WiX Toolset Dependency Extension</Title>
11 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
12 <IncludeSymbols>true</IncludeSymbols> 11 <IncludeSymbols>true</IncludeSymbols>
13 </PropertyGroup> 12 </PropertyGroup>
14 13
@@ -16,12 +15,11 @@
16 <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 </ItemGroup> 20 </ItemGroup>
22 21
23 <ItemGroup> 22 <ItemGroup>
24 <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
25 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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 @@
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args 7@if not "%1"=="" shift & goto parse_args
8 8
9@echo Dependency.wixext build %_C% 9@echo DifxApp.wixext build %_C%
10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 10
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.DifxApp.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.DifxApp.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
7 <RootNamespace>WixToolset.DifxApp</RootNamespace> 7 <RootNamespace>WixToolset.DifxApp</RootNamespace>
8 <Description>WiX Toolset DIFxApp Extension</Description> 8 <Description>WiX Toolset DIFxApp Extension</Description>
9 <Title>WiX Toolset DIFxApp Extension</Title> 9 <Title>WiX Toolset DIFxApp Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 </ItemGroup> 20 </ItemGroup>
22 21
23 <ItemGroup> 22 <ItemGroup>
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 @@
7 <RootNamespace>WixToolset.DirectX</RootNamespace> 7 <RootNamespace>WixToolset.DirectX</RootNamespace>
8 <Description>WiX Toolset DirectX Extension</Description> 8 <Description>WiX Toolset DirectX Extension</Description>
9 <Title>WiX Toolset DirectX Extension</Title> 9 <Title>WiX Toolset DirectX Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> 19 <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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
27 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32 27 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.ActiveCfg = Debug|Win32
28 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Debug|x86.Build.0 = 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 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
30 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32 31 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x64.ActiveCfg = Release|Win32
31 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32 32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.ActiveCfg = Release|Win32
32 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32 33 {F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}.Release|x86.Build.0 = Release|Win32
@@ -36,6 +37,7 @@ Global
36 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86 37 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86
37 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86 38 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86
38 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|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
39 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86 41 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86
40 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86 42 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86
41 {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86 43 {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 @@
8 8
9@echo Firewall.wixext build %_C% 9@echo Firewall.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.Firewall || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Firewall.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Firewall.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
7 <RootNamespace>WixToolset.Firewall</RootNamespace> 7 <RootNamespace>WixToolset.Firewall</RootNamespace>
8 <Description>WiX Toolset Firewallity Extension</Description> 8 <Description>WiX Toolset Firewallity Extension</Description>
9 <Title>WiX Toolset Firewall Extension</Title> 9 <Title>WiX Toolset Firewall Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="All" /> 19 <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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 @@
8 8
9@echo Http.wixext build %_C% 9@echo Http.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Http\WixToolsetTest.Http.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.Http || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Http.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Http.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
7 <RootNamespace>WixToolset.Http</RootNamespace> 7 <RootNamespace>WixToolset.Http</RootNamespace>
8 <Description>WiX Toolset Http Extension</Description> 8 <Description>WiX Toolset Http Extension</Description>
9 <Title>WiX Toolset Http Extension</Title> 9 <Title>WiX Toolset Http Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\http.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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
24 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.ActiveCfg = Debug|Win32 24 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.ActiveCfg = Debug|Win32
25 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Debug|x86.Build.0 = 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 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
27 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.ActiveCfg = Release|Win32 28 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.ActiveCfg = Release|Win32
28 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.Build.0 = Release|Win32 29 {CB3FB8C4-14BF-4EA6-9F01-7FB258E5AEF3}.Release|x86.Build.0 = Release|Win32
29 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|Any CPU.ActiveCfg = Debug|x86 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
30 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.ActiveCfg = Debug|x86 32 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.ActiveCfg = Debug|x86
31 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.Build.0 = Debug|x86 33 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Debug|x86.Build.0 = Debug|x86
32 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|Any CPU.ActiveCfg = Release|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
33 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.ActiveCfg = Release|x86 36 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.ActiveCfg = Release|x86
34 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.Build.0 = Release|x86 37 {92FE99D2-355D-4F52-A7C1-10EECB4A5BB1}.Release|x86.Build.0 = Release|x86
35 {612029FB-B5D4-4D7E-B794-A0E202BFE493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 38 {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 @@
8 8
9@echo Iis.wixext build %_C% 9@echo Iis.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Iis.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Iis.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
7 <RootNamespace>WixToolset.Iis</RootNamespace> 7 <RootNamespace>WixToolset.Iis</RootNamespace>
8 <Description>WiX Toolset Iis Extension</Description> 8 <Description>WiX Toolset Iis Extension</Description>
9 <Title>WiX Toolset Iis Extension</Title> 9 <Title>WiX Toolset Iis Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Data" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
22 </ItemGroup> 20 </ItemGroup>
23 21
24 <ItemGroup> 22 <ItemGroup>
25 <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
26 </ItemGroup> 24 </ItemGroup>
27</Project> 25</Project>
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 @@
14 </ItemGroup> 14 </ItemGroup>
15 15
16 <ItemGroup> 16 <ItemGroup>
17 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> 17 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=ARM64" />
18 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> 18 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x86" />
19 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> 19 <ProjectReference Include="..\ca\iisca.vcxproj" Properties="Platform=x64" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
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 @@
8 8
9@echo Msmq.wixext build %_C% 9@echo Msmq.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.Msmq || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.Msmq.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Msmq.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
7 <RootNamespace>WixToolset.Msmq</RootNamespace> 7 <RootNamespace>WixToolset.Msmq</RootNamespace>
8 <Description>WiX Toolset MSMQ Extension</Description> 8 <Description>WiX Toolset MSMQ Extension</Description>
9 <Title>WiX Toolset MSMQ Extension</Title> 9 <Title>WiX Toolset MSMQ Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 </ItemGroup> 20 </ItemGroup>
22 21
23 <ItemGroup> 22 <ItemGroup>
24 <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
25 </ItemGroup> 24 </ItemGroup>
26</Project> 25</Project>
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 @@
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args 7@if not "%1"=="" shift & goto parse_args
8 8
9@echo Building ext\NetFx %_C% 9@echo NetFx.wixext build %_C%
10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13 10
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b 15dotnet 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 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netstandard2.0</TargetFramework>
7 <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.Netfx</RootNamespace> 7 <RootNamespace>WixToolset.Netfx</RootNamespace>
9 <Description>WiX Toolset .NET extension</Description> 8 <Description>WiX Toolset .NET extension</Description>
10 <Title>WiX Toolset .NET extension</Title> 9 <Title>WiX Toolset .NET extension</Title>
10 <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
@@ -15,12 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Data" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 <PackageReference Include="WixToolset.Extensibility" />
25 </ItemGroup> 24 </ItemGroup>
26</Project> 25</Project>
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 @@
8 8
9@echo PowerShell.wixext build %_C% 9@echo PowerShell.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.PowerShell\WixToolsetTest.PowerShell.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b 15dotnet 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 @@
7 <RootNamespace>WixToolset.PowerShell</RootNamespace> 7 <RootNamespace>WixToolset.PowerShell</RootNamespace>
8 <Description>WiX Toolset PowerShell Extension</Description> 8 <Description>WiX Toolset PowerShell Extension</Description>
9 <Title>WiX Toolset PowerShell Extension</Title> 9 <Title>WiX Toolset PowerShell Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" />
16 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 17
19 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
20 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21 </ItemGroup> 20 </ItemGroup>
22 21
23 <ItemGroup> 22 <ItemGroup>
24 <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
25 </ItemGroup> 24 </ItemGroup>
26</Project> 25</Project>
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
24 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.ActiveCfg = Debug|Win32 24 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.ActiveCfg = Debug|Win32
25 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Debug|x86.Build.0 = 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 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
27 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.ActiveCfg = Release|Win32 28 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.ActiveCfg = Release|Win32
28 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.Build.0 = Release|Win32 29 {4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}.Release|x86.Build.0 = Release|Win32
29 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.ActiveCfg = Debug|x86 30 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -31,6 +32,7 @@ Global
31 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.ActiveCfg = Debug|x86 32 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.ActiveCfg = Debug|x86
32 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.Build.0 = Debug|x86 33 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Debug|x86.Build.0 = Debug|x86
33 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|Any CPU.ActiveCfg = Release|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
34 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.ActiveCfg = Release|x86 36 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.ActiveCfg = Release|x86
35 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.Build.0 = Release|x86 37 {9ACF1A20-D801-45CC-A463-F9D13E506AA3}.Release|x86.Build.0 = Release|x86
36 {0E05519A-0045-4AEC-BD0C-D9205FF1468F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 38 {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 @@
8 8
9@echo Sql.wixext build %_C% 9@echo Sql.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Sql || exit /b 15dotnet 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 @@
15 <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="All" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup> 24 </ItemGroup>
25</Project> 25</Project>
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 @@
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args 7@if not "%1"=="" shift & goto parse_args
8 8
9@echo Building ext\UI %_C% 9@echo UI.wixext build %_C%
10
11:: Restore
12@REM nuget restore || exit /b
13msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b
14 10
15:: Build 11:: Build
16msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
17 13
18:: Test 14:: Test
19dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
20 16
21:: Pack 17:: Pack
22msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
23 19
24@popd 20@popd
25@endlocal 21@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 @@
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup Condition=" '$(NCrunch)'=='' "> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" /> 19 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Data" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 <PackageReference Include="WixToolset.Extensibility" />
25 </ItemGroup> 24 </ItemGroup>
26</Project> 25</Project>
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 @@
8 8
9@echo Building ext\Util %_C% using %_N% 9@echo Building ext\Util %_C% using %_N%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b 15dotnet test -c %_C% --no-build test\WixToolsetTest.Util || exit /b
19 16
20:: Pack 17:: Pack
21msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack wixext\WixToolset.Util.wixext.csproj || exit /b 18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
22 19
23@popd 20@popd
24@endlocal 21@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 @@
15 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Data" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 <PackageReference Include="WixToolset.Extensibility" />
25 </ItemGroup> 24 </ItemGroup>
26</Project> 25</Project>
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
27 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32 27 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32
28 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.Build.0 = 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 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
30 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x64.ActiveCfg = Release|Win32 31 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x64.ActiveCfg = Release|Win32
31 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.ActiveCfg = Release|Win32 32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.ActiveCfg = Release|Win32
32 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.Build.0 = Release|Win32 33 {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Release|x86.Build.0 = Release|Win32
@@ -51,6 +52,16 @@ Global
51 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x64.Build.0 = Release|Any CPU 52 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x64.Build.0 = Release|Any CPU
52 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU 53 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU
53 {61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.Build.0 = 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
54 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
56 {DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|x64.ActiveCfg = Debug|Any CPU 67 {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 @@
8 8
9@echo VisualStudio.wixext build %_C% 9@echo VisualStudio.wixext build %_C%
10 10
11:: Restore
12msbuild -t:Restore -p:Configuration=%_C% || exit /b
13
14:: Build 11:: Build
15msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b 12msbuild -Restore -p:Configuration=%_C% || exit /b
16 13
17:: Test 14:: Test
18dotnet test -c %_C% --no-build test\WixToolsetTest.VisualStudio || exit /b 15dotnet 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 @@
7 <RootNamespace>WixToolset.VisualStudio</RootNamespace> 7 <RootNamespace>WixToolset.VisualStudio</RootNamespace>
8 <Description>WiX Toolset Visual Studio Extension</Description> 8 <Description>WiX Toolset Visual Studio Extension</Description>
9 <Title>WiX Toolset VS Extension</Title> 9 <Title>WiX Toolset VS Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
@@ -15,11 +15,11 @@
15 <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="WixToolset.Extensibility" /> 23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
24 </ItemGroup> 24 </ItemGroup>
25</Project> 25</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 13:34:47 +0000