aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Iis
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-12-19 12:09:04 -0800
committerRob Mensching <rob@firegiant.com>2021-12-30 12:51:23 -0800
commit0aee408e0b07b92d90ede67800616f7f278a3dc4 (patch)
tree33eba852b65ba11392898bc3f2f4114b12964e01 /src/ext/Iis
parent91259637be1eccd149093eb49c7ff68826d1d331 (diff)
downloadwix-0aee408e0b07b92d90ede67800616f7f278a3dc4.tar.gz
wix-0aee408e0b07b92d90ede67800616f7f278a3dc4.tar.bz2
wix-0aee408e0b07b92d90ede67800616f7f278a3dc4.zip
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.
Diffstat (limited to 'src/ext/Iis')
-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
4 files changed, 13 insertions, 15 deletions
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>