Skip to content

Commit

Permalink
Release v1.2
Browse files Browse the repository at this point in the history
Issue#1: Compiler.BuildMsi() & async/await
Issue#2: Cannot add environment variables to project object if only merge modules are present.
Implemented burn compiler output to catch WixMbaPrereqVars conflicts and suggest the work around. (Related to CP issue#149)
  • Loading branch information
oleg-shilo committed Dec 9, 2016
1 parent 95553de commit 7dbe6ec
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,29 @@

class Script
{
static public void Main(string[] args)
{
var featureA = new Feature("Feature A", "Feature A description");
var featureB = new Feature("Feature B", "Feature B description");
var complete = new Feature("Complete");
static public void Main(string[] args)
{
var featureA = new Feature("Feature A", "Feature A description");
var featureB = new Feature("Feature B", "Feature B description");
var complete = new Feature("Complete");

complete.Add(featureA)
.Add(featureB);
complete.Add(featureA)
.Add(featureB);

var project =
new Project("MyMergeModuleSetup",
new Dir(@"%ProgramFiles%\My Company",
new File(featureA, @"Files\MainFile.txt"),
new Merge(featureB, @"Files\MyMergeModule.msm"),
new Merge(featureB, @"Files\MyMergeModule1.msm")));
var project =
new Project("MyMergeModuleSetup",
new Dir(@"%ProgramFiles%\My Company",
//new File(featureA, @"Files\MainFile.txt"),
new Merge(featureB, @"Files\MyMergeModule.msm"),
new Merge(featureB, @"Files\MyMergeModule1.msm"))
, new EnvironmentVariable("foo", "bar"));

project.DefaultFeature = complete;
project.UI = WUI.WixUI_FeatureTree;
project.InstallerVersion = 200; //you may want to change it to match MSM module installer version
project.DefaultFeature = complete;
project.UI = WUI.WixUI_FeatureTree;
project.InstallerVersion = 200; //you may want to change it to match MSM module installer version

project.PreserveTempFiles = true;
project.PreserveTempFiles = true;

project.BuildMsi();
}
project.BuildMsi();
}
}
Binary file modified Source/src/WixSharp.Samples/WixSharp.Msi.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.UI.dll
Binary file not shown.
Binary file modified Source/src/WixSharp.Samples/WixSharp.dll
Binary file not shown.

0 comments on commit 7dbe6ec

Please sign in to comment.