| Index: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs
|
| diff --git a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs
|
| index 0fe8cf1e28b93eb94c089b4777e195ea189f9860..61cd7f679497cf734bb4dcb19749511671cc03c9 100644
|
| --- a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs
|
| +++ b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClLink.cs
|
| @@ -49,9 +49,6 @@ namespace NaCl.Build.CPPTasks
|
| public string CreateNMFPath { get; set; }
|
|
|
| [Required]
|
| - public string PropertiesFile { get; set; }
|
| -
|
| - [Required]
|
| public string ConfigurationType { get; set; }
|
|
|
| public NaClLink()
|
| @@ -114,18 +111,15 @@ namespace NaCl.Build.CPPTasks
|
|
|
| public override bool Execute()
|
| {
|
| - xamlParser = new XamlParser(PropertiesFile);
|
| - if (!Setup())
|
| - return false;
|
| -
|
| if (!OutputCommandLine)
|
| Log.LogMessage("Linking: {0}", Path.GetFileName(OutputFile));
|
|
|
| if (!base.Execute())
|
| return false;
|
|
|
| - if (!PostLink())
|
| - return false;
|
| + if (!SkippedExecution)
|
| + if (!PostLink())
|
| + return false;
|
|
|
| return true;
|
| }
|
|
|