From 6ec164bccf681bf90d7fe856b09b48adcec321a3 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 11 Feb 2016 21:36:05 -0800
Subject: [PATCH] Add WebCmdlets to Microsoft.PowerShell.Commands.Utility

---
 KNOWNISSUES.md                                |  6 -----
 .../project.json                              | 27 ++++++++++++++++++-
 src/monad                                     |  2 +-
 src/windows-build                             |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/KNOWNISSUES.md b/KNOWNISSUES.md
index 8867df7979..d6a71edba9 100644
--- a/KNOWNISSUES.md
+++ b/KNOWNISSUES.md
@@ -15,12 +15,6 @@ does not build on Core PowerShell, and cannot be guarded with preprocessor
 directives due to the use of here-strings that contain lines starting with `#`,
 which breaks the preprocessor.
 
-## `WebCmdlet`
-
-All files in `monad\src\commands\utility\WebCmdlet` have been removed from
-`Microsoft.PowerShell.Commands.Utility` because we cannot resolve `mshtml.dll`
-as a framework assembly.
-
 ## `Microsoft.Management.Infrastructure.Native`
 
 Windows builds currently use the native stub; this should be replaced with
diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json
index 296a82140b..e5a3aa0593 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/project.json
+++ b/src/Microsoft.PowerShell.Commands.Utility/project.json
@@ -29,14 +29,19 @@
             },
             "imports": "portable-net45+win8",
             "dependencies": {
-                "Microsoft.CodeAnalysis.CSharp": "1.1.1"
+                "Microsoft.CodeAnalysis.CSharp": "1.1.1",
+                "Newtonsoft.Json": "8.0.2"
             }
         },
         "dnx451": {
             "frameworkAssemblies": {
                 "System.Drawing": "",
+                "System.Web": "",
                 "System.Web.Extensions": "",
                 "Microsoft.JScript": ""
+            },
+            "dependencies": {
+                "Microsoft.mshtml": "1.0.0"
             }
         }
     },
@@ -329,6 +334,26 @@
         "../monad/monad/src/commands/utility/StringManipulation/Synthesis/Strategies/TopDownSynthesis.cs",
         "../monad/monad/src/commands/utility/StringManipulation/Synthesis/StrategyConfig.cs",
         "../monad/monad/src/commands/utility/StringManipulation/Synthesis/SynthesisEngine.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/ConvertToJsonCommand.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/JsonObject.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/BasicHtmlWebResponseObject.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/ContentHelper.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/FormObject.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/FormObjectCollection.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/HtmlWebResponseObject.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/InvokeRestMethodCommand.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/InvokeWebRequestCommand.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/JsonObjectTypeResolver.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/PSUserAgent.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/StreamHelper.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebCmdletElementCollection.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebRequestMethod.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebRequestPSCmdlet.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebRequestSession.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebResponseHelper.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebResponseObject.cs",
+        "../monad/monad/src/commands/utility/WebCmdlet/WebResponseObjectFactory.cs",
         "../monad/monad/src/commands/utility/tee-object.cs",
         "../monad/monad/src/commands/utility/TimeExpressionCommand.cs",
         "../monad/monad/src/commands/utility/trace/GetTracerCommand.cs",
diff --git a/src/monad b/src/monad
index 0d3799de7e..bbd1d96e95 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 0d3799de7eae99a44887f14c96ee71057419b8b7
+Subproject commit bbd1d96e95c9ab66dee55758a2566746c62fb568
diff --git a/src/windows-build b/src/windows-build
index 50c60704b4..0262919b23 160000
--- a/src/windows-build
+++ b/src/windows-build
@@ -1 +1 @@
-Subproject commit 50c60704b483d82f9eb37bc28be0099d29dce1ce
+Subproject commit 0262919b23759176be8b301c23044252fa5d1a82