-
Notifications
You must be signed in to change notification settings - Fork 292
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add conditional MsiE2E Tests for Domain functionality.
This test currently fails under a Domain workstation. Signed-off-by: Bevan Weiss <[email protected]>
- Loading branch information
1 parent
ce613e2
commit 2851c44
Showing
5 changed files
with
101 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/test/msi/TestData/UtilExtensionUserTests/ProductDomain/ProductDomain.wixproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<!-- 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. --> | ||
<Project Sdk="WixToolset.Sdk"> | ||
<PropertyGroup> | ||
<UpgradeCode>{08806ED8-3CE7-4BC3-A319-3ACCE3AAE7DC}</UpgradeCode> | ||
<ProductComponentsRef>true</ProductComponentsRef> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<PackageReference Include="WixToolset.Util.wixext" /> | ||
</ItemGroup> | ||
</Project> |
33 changes: 33 additions & 0 deletions
33
src/test/msi/TestData/UtilExtensionUserTests/ProductDomain/product.wxs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<!-- 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. --> | ||
|
||
|
||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
<Fragment> | ||
<ComponentGroup Id="ProductComponents"> | ||
<ComponentRef Id="Component1" /> | ||
</ComponentGroup> | ||
|
||
<Property Id="TEMPDOMAIN" Secure="yes" /> | ||
<Property Id="TEMPUSERNAME" Secure="yes" /> | ||
</Fragment> | ||
|
||
<Fragment> | ||
<util:Group Id="ADMIN" Name="Administrators" /> | ||
<util:Group Id="DOMAIN_GUESTS" Name="Domain Guests" Domain="TESTDOMAIN" /> | ||
|
||
<Component Id="Component1" Guid="09624A9A-4BBC-4126-BBF9-0713C5217DB1" Directory="INSTALLFOLDER"> | ||
<File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> | ||
|
||
<util:User Id="TEST_USER1" Name="testName1" Domain="TESTDOMAIN" Comment="testComment1" | ||
Password="test123!@#" | ||
PasswordNeverExpires="no" | ||
PasswordExpired="yes" | ||
Disabled="yes" | ||
CreateUser="yes" | ||
RemoveOnUninstall="yes"> | ||
<util:GroupRef Id="ADMIN" /> | ||
<util:GroupRef Id="DOMAIN_GUESTS" /> | ||
</util:User> | ||
</Component> | ||
</Fragment> | ||
</Wix> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
SET RuntimeTestsEnabled=true | ||
SET RuntimeDomainTestsEnabled=true | ||
dotnet test WixToolsetTest.MsiE2E.dll -v normal --logger trx |