Created
November 15, 2012 15:12
-
-
Save linquize/4079097 to your computer and use it in GitHub Desktop.
SharpDevelop WixProject
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
.../WixBinding/Project/Src/Project/WixProject.cs | 21 +++++++++++++++------ | |
1 file changed, 15 insertions(+), 6 deletions(-) | |
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs | |
index 64540d3..bad42f9 100644 | |
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs | |
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs | |
@@ -40,12 +40,21 @@ namespace ICSharpCode.WixBinding | |
{ | |
SetProperty("OutputType", "Package"); | |
- string wixToolPath = @"$(SharpDevelopBinPath)\Tools\Wix"; | |
- AddGuardedProperty("WixToolPath", wixToolPath); | |
- AddGuardedProperty("WixTargetsPath", @"$(WixToolPath)\wix.targets"); | |
- AddGuardedProperty("WixTasksPath", @"$(WixToolPath)\WixTasks.dll"); | |
- | |
- this.AddImport(DefaultTargetsFile, null); | |
+ bool useSharpDevelopWix = false; | |
+ if (useSharpDevelopWix) | |
+ { | |
+ string wixToolPath = @"$(SharpDevelopBinPath)\Tools\Wix"; | |
+ AddGuardedProperty("WixToolPath", wixToolPath); | |
+ AddGuardedProperty("WixTargetsPath", @"$(WixToolPath)\wix.targets"); | |
+ AddGuardedProperty("WixTasksPath", @"$(WixToolPath)\WixTasks.dll"); | |
+ | |
+ this.AddImport(DefaultTargetsFile, null); | |
+ } | |
+ else | |
+ { | |
+ AddGuardedProperty("WixTargetsPath", @"$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets"); | |
+ this.AddImport("$(WixTargetsPath)", null); | |
+ } | |
} | |
public override string Language { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment