diff options
Diffstat (limited to 'src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs')
| -rw-r--r-- | src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 78166e00..408bab2f 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | |||
| @@ -14,7 +14,6 @@ namespace WixToolsetTest.Sdk | |||
| 14 | using WixInternal.MSTestSupport; | 14 | using WixInternal.MSTestSupport; |
| 15 | using WixToolset.Data; | 15 | using WixToolset.Data; |
| 16 | using WixToolset.Data.Symbols; | 16 | using WixToolset.Data.Symbols; |
| 17 | using WixToolset.Data.WindowsInstaller.Rows; | ||
| 18 | 17 | ||
| 19 | [TestClass] | 18 | [TestClass] |
| 20 | public class MsbuildFixture | 19 | public class MsbuildFixture |
| @@ -818,6 +817,36 @@ namespace WixToolsetTest.Sdk | |||
| 818 | [DataRow(BuildSystem.DotNetCoreSdk)] | 817 | [DataRow(BuildSystem.DotNetCoreSdk)] |
| 819 | [DataRow(BuildSystem.MSBuild)] | 818 | [DataRow(BuildSystem.MSBuild)] |
| 820 | [DataRow(BuildSystem.MSBuild64)] | 819 | [DataRow(BuildSystem.MSBuild64)] |
| 820 | public void CanBuildUsingExplicitProperties(BuildSystem buildSystem) | ||
| 821 | { | ||
| 822 | var sourceFolder = TestData.Get(@"TestData", "MultiTargetingWixlib"); | ||
| 823 | |||
| 824 | using (var fs = new TestDataFolderFileSystem()) | ||
| 825 | { | ||
| 826 | fs.Initialize(sourceFolder); | ||
| 827 | var baseFolder = Path.Combine(fs.BaseFolder, "PackageUsingExplicitProperties"); | ||
| 828 | var binFolder = Path.Combine(baseFolder, @"bin\"); | ||
| 829 | var filesFolder = Path.Combine(binFolder, "Release", @"PFiles\"); | ||
| 830 | var projectPath = Path.Combine(baseFolder, "PackageUsingExplicitProperties.wixproj"); | ||
| 831 | |||
| 832 | var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, [ | ||
| 833 | "-Restore", | ||
| 834 | MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath) | ||
| 835 | ]); | ||
| 836 | result.AssertSuccess(); | ||
| 837 | |||
| 838 | var warnings = result.Output.Where(line => line.Contains(": warning")).Select(line => ExtractWarningFromMessage(line, baseFolder)).Distinct().ToArray(); | ||
| 839 | WixAssert.CompareLineByLine( | ||
| 840 | [ | ||
| 841 | @": ProjectReference '..\TestExe\TestExe.csproj' specifies 'Properties' metadata. That overrides ProjectReference expansion so the 'Configurations', 'Platforms', 'TargetFrameworks', and 'RuntimeIdentifiers' metadata was ignored. Instead, use the 'AdditionalProperties' metadata to pass properties to the referenced project without disabling ProjectReference expansion.", | ||
| 842 | ], warnings); | ||
| 843 | } | ||
| 844 | } | ||
| 845 | |||
| 846 | [TestMethod] | ||
| 847 | [DataRow(BuildSystem.DotNetCoreSdk)] | ||
| 848 | [DataRow(BuildSystem.MSBuild)] | ||
| 849 | [DataRow(BuildSystem.MSBuild64)] | ||
| 821 | public void CanBuildMultiTargetingWixlibUsingRidsWithReleaseAndDebug(BuildSystem buildSystem) | 850 | public void CanBuildMultiTargetingWixlibUsingRidsWithReleaseAndDebug(BuildSystem buildSystem) |
| 822 | { | 851 | { |
| 823 | var sourceFolder = TestData.Get(@"TestData", "MultiTargetingWixlib"); | 852 | var sourceFolder = TestData.Get(@"TestData", "MultiTargetingWixlib"); |
