Add *.Activities dlls in Full build

- Add activities as a dependency to ConsoleHost
- This creates a minor ambiguity in the type resolution in ConsoleHost.
  We are specifying a namespace name to workaround it.
This commit is contained in:
Sergei Vorobev 2016-06-22 18:56:52 -07:00
parent b5bea29a72
commit f81b5a5f6e
4 changed files with 11 additions and 4 deletions

View file

@ -238,7 +238,7 @@ namespace Microsoft.PowerShell
result = ReadLineSafe(true, printToken);
}
SecureString secureResult = result as SecureString;
Diagnostics.Assert(secureResult != null, "ReadLineSafe did not return a SecureString");
System.Management.Automation.Diagnostics.Assert(secureResult != null, "ReadLineSafe did not return a SecureString");
return secureResult;
}

View file

@ -400,7 +400,7 @@ namespace Microsoft.PowerShell
{
object userInput = ReadLineSafe(false, null);
string userInputString = userInput as string;
Diagnostics.Assert(userInputString != null, "ReadLineSafe did not return a string");
System.Management.Automation.Diagnostics.Assert(userInputString != null, "ReadLineSafe did not return a string");
rawInputString = userInputString;
}
if (rawInputString == null)

View file

@ -315,7 +315,7 @@ namespace Microsoft.PowerShell
Dictionary<int, bool> defaultChoiceKeys,
bool shouldEmulateForMultipleChoiceSelection)
{
Diagnostics.Assert(defaultChoiceKeys != null, "defaultChoiceKeys cannot be null.");
System.Management.Automation.Diagnostics.Assert(defaultChoiceKeys != null, "defaultChoiceKeys cannot be null.");
ConsoleColor fg = RawUI.ForegroundColor;
ConsoleColor bg = RawUI.BackgroundColor;

View file

@ -53,7 +53,14 @@
"dependencies": {
"Microsoft.PowerShell.ScheduledJob": "1.0.0-*",
"Microsoft.PowerShell.Workflow.ServiceCore": "1.0.0-*",
"Microsoft.PowerShell.GraphicalHost": "1.0.0-*"
"Microsoft.PowerShell.GraphicalHost": "1.0.0-*",
"Microsoft.PowerShell.Activities": "1.0.0-*",
"Microsoft.PowerShell.Core.Activities": "1.0.0-*",
"Microsoft.PowerShell.Diagnostics.Activities": "1.0.0-*",
"Microsoft.PowerShell.Management.Activities": "1.0.0-*",
"Microsoft.PowerShell.Security.Activities": "1.0.0-*",
"Microsoft.PowerShell.Utility.Activities": "1.0.0-*",
"Microsoft.WSMan.Management.Activities": "1.0.0-*"
}
}
}