aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-01-03 20:50:10 -0800
committerRob Mensching <rob@firegiant.com>2022-01-03 21:28:32 -0800
commitd4b81140251e365a3241a15b16efc65a035c152a (patch)
tree9d251d41fbf3ba2172d970b4bbc56b6946fecc2d /src
parente172f757d7fc97e55198b07605b45aa8ab786490 (diff)
downloadwix-d4b81140251e365a3241a15b16efc65a035c152a.tar.gz
wix-d4b81140251e365a3241a15b16efc65a035c152a.tar.bz2
wix-d4b81140251e365a3241a15b16efc65a035c152a.zip
Properly place Iis.wixext in its own segment and simplify its build
Diffstat (limited to 'src')
-rw-r--r--src/ext/Iis/Directory.Build.props10
-rw-r--r--src/ext/Iis/iis.cmd6
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ext/Iis/Directory.Build.props b/src/ext/Iis/Directory.Build.props
new file mode 100644
index 00000000..48e69fe3
--- /dev/null
+++ b/src/ext/Iis/Directory.Build.props
@@ -0,0 +1,10 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4<Project>
5 <PropertyGroup>
6 <SegmentName>Iis.wixext</SegmentName>
7 </PropertyGroup>
8
9 <Import Project="..\..\Directory.Build.props" />
10</Project>
diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd
index 8a3f05c1..49e3e0b7 100644
--- a/src/ext/Iis/iis.cmd
+++ b/src/ext/Iis/iis.cmd
@@ -9,13 +9,13 @@
9@echo Iis.wixext build %_C% 9@echo Iis.wixext build %_C%
10 10
11:: Build 11:: Build
12msbuild -Restore -p:Configuration=%_C% || exit /b 12msbuild -Restore -p:Configuration=%_C% -nologo || exit /b
13 13
14:: Test 14:: Test
15dotnet test -c %_C% --no-build test\WixToolsetTest.Iis || exit /b 15dotnet test test\WixToolsetTest.Iis -c %_C% --no-build --nologo || exit /b
16 16
17:: Pack 17:: Pack
18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Iis.wixext.csproj || exit /b 18dotnet pack wixext\WixToolset.Iis.wixext.csproj -c %_C% --no-build --nologo || exit /b
19 19
20@popd 20@popd
21@endlocal 21@endlocal