aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Iis
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Iis')
-rw-r--r--src/ext/Iis/iis.cmd21
-rw-r--r--src/ext/Iis/iis_t.proj17
-rw-r--r--src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs9
-rw-r--r--src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj7
4 files changed, 26 insertions, 28 deletions
diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd
deleted file mode 100644
index 0ae87a77..00000000
--- a/src/ext/Iis/iis.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
1@setlocal
2@pushd %~dp0
3
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@echo Iis.wixext build %_C%
10
11:: Build
12msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
13
14:: Test
15dotnet test test\WixToolsetTest.Iis -c %_C% --no-build --nologo || exit /b
16
17:: Pack
18dotnet pack wixext\WixToolset.Iis.wixext.csproj -c %_C% --no-build --nologo || exit /b
19
20@popd
21@endlocal
diff --git a/src/ext/Iis/iis_t.proj b/src/ext/Iis/iis_t.proj
new file mode 100644
index 00000000..84473475
--- /dev/null
+++ b/src/ext/Iis/iis_t.proj
@@ -0,0 +1,17 @@
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 Sdk="Microsoft.Build.Traversal">
5 <ItemGroup>
6 <ProjectReference Include="test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj" />
7 <ProjectReference Include="wixext\WixToolset.Iis.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
8 </ItemGroup>
9
10 <Target Name="WixClean" BeforeTargets="Restore" Condition="'$(SuppressWixClean)' != 'true'">
11 <RemoveDir Directories="$(RootBuildFolder)iis.wixext" />
12 <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\wixtoolset.iis.wixext" Condition="'$(NUGET_PACKAGES)' == ''" />
13 <RemoveDir Directories="$(NUGET_PACKAGES)\wixtoolset.iis.wixext" Condition="'$(NUGET_PACKAGES)' != ''" />
14
15 <Delete Files="$(ArtifactsFolder)WixToolset.Iis.wixext.*.nupkg" />
16 </Target>
17</Project>
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
index ab3f35d9..01a89dc0 100644
--- a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
+++ b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
@@ -3,14 +3,15 @@
3namespace WixToolsetTest.Iis 3namespace WixToolsetTest.Iis
4{ 4{
5 using System.Linq; 5 using System.Linq;
6 using WixInternal.TestSupport; 6 using Microsoft.VisualStudio.TestTools.UnitTesting;
7 using WixInternal.Core.TestPackage; 7 using WixInternal.MSTestSupport;
8 using WixInternal.Core.MSTestPackage;
8 using WixToolset.Iis; 9 using WixToolset.Iis;
9 using Xunit;
10 10
11 [TestClass]
11 public class IisExtensionFixture 12 public class IisExtensionFixture
12 { 13 {
13 [Fact] 14 [TestMethod]
14 public void CanBuildUsingIIs() 15 public void CanBuildUsingIIs()
15 { 16 {
16 var folder = TestData.Get(@"TestData\UsingIis"); 17 var folder = TestData.Get(@"TestData\UsingIis");
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
index a39e5b0b..a0a6e043 100644
--- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
+++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
@@ -1,10 +1,10 @@
1<?xml version="1.0" encoding="utf-8"?> 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. --> 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 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="MSTest.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net6.0</TargetFramework> 6 <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject> 7 <IsWixMSTestProject>true</IsWixMSTestProject>
8 </PropertyGroup> 8 </PropertyGroup>
9 9
10 <ItemGroup> 10 <ItemGroup>
@@ -19,6 +19,7 @@
19 </ItemGroup> 19 </ItemGroup>
20 20
21 <ItemGroup> 21 <ItemGroup>
22 <PackageReference Include="WixInternal.Core.TestPackage" /> 22 <PackageReference Include="WixInternal.MSTestSupport" />
23 <PackageReference Include="WixInternal.Core.MSTestPackage" />
23 </ItemGroup> 24 </ItemGroup>
24</Project> 25</Project>