PowerShell · vors · Jun 28, 2016 · Jun 28, 2016 · Jun 28, 2016 · Jun 28, 2016
@@ -763,7 +763,7 @@ function Copy-MappedFiles {
 
             if (git log --grep="SD:$cl" HEAD^..HEAD)
             {
-                log Green "$pslMonadRoot HEAD matches [SD:$cl]"
+                log "$pslMonadRoot HEAD matches [SD:$cl]"
             }
             else 
             {

diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psd1 b/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psd1
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psm1 b/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psm1
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.types.ps1xml b/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.types.ps1xml
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psd1 b/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psd1
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psm1 b/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psm1
diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/map.json b/src/Microsoft.PowerShell.ConsoleHost/Modules/map.json
@@ -0,0 +1,12 @@
+{
+    "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1":  "Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
+    "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1":  "Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
+    "monad/src/ScheduledJob/PSScheduledJob.Format.ps1xml": "PSScheduledJob/PSScheduledJob.Format.ps1xml",
+    "monad/src/ScheduledJob/PSScheduledJob.psd1": "PSScheduledJob/PSScheduledJob.psd1",
+    "monad/src/ScheduledJob/PSScheduledJob.types.ps1xml": "PSScheduledJob/PSScheduledJob.types.ps1xml",
+    "monad/src/m3p/product/PSWorkflow.psd1" : "PSWorkflow/PSWorkflow.psd1",
+    "monad/src/m3p/product/PSWorkflow.psm1" : "PSWorkflow/PSWorkflow.psm1",
+    "monad/src/m3p/product/PSWorkflow.types.ps1xml" : "PSWorkflow/PSWorkflow.types.ps1xml",
+    "monad/src/m3p/product/PSWorkflowUtility.psd1" : "PSWorkflowUtility/PSWorkflowUtility.psd1",
+    "monad/src/m3p/product/PSWorkflowUtility.psm1" : "PSWorkflowUtility/PSWorkflowUtility.psm1"
+}
diff --git a/src/Microsoft.PowerShell.ConsoleHost/map.json b/src/Microsoft.PowerShell.ConsoleHost/map.json
@@ -6,7 +6,6 @@
     "monad/src/host/msh/Serialization.cs":  "host/msh/Serialization.cs",
     "monad/src/host/msh/ConsoleHostUserInterface.cs":  "host/msh/ConsoleHostUserInterface.cs",
     "monad/src/host/msh/StartTranscriptCmdlet.cs":  "host/msh/StartTranscriptCmdlet.cs",
-    "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1":  "Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
     "monad/src/host/msh/resources/ProgressNodeStrings.resx":  "resources/ProgressNodeStrings.resx",
     "monad/src/host/msh/resources/ConsoleHostRawUserInterfaceStrings.resx":  "resources/ConsoleHostRawUserInterfaceStrings.resx",
     "monad/src/host/msh/PendingProgress.cs":  "host/msh/PendingProgress.cs",
@@ -29,11 +28,7 @@
     "monad/src/singleshell/installer/MshHostMshSnapin.cs":  "singleshell/installer/MshHostMshSnapin.cs",
     "monad/src/host/msh/resources/CommandLineParameterParserStrings.resx":  "resources/CommandLineParameterParserStrings.resx",
     "monad/src/host/msh/resources/ManagedEntranceStrings.resx":  "resources/ManagedEntranceStrings.resx",
-    "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1":  "Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
     "monad/src/singleshell/installer/EngineInstaller.cs":  "singleshell/installer/EngineInstaller.cs",
     "monad/src/host/msh/ConsoleHostRawUserInterface.cs":  "host/msh/ConsoleHostRawUserInterface.cs",
     "monad/src/host/msh/ConsoleHost.cs":  "host/msh/ConsoleHost.cs",
-    "monad/src/ScheduledJob/PSScheduledJob.Format.ps1xml": "Modules/PSScheduledJob/PSScheduledJob.Format.ps1xml",
-    "monad/src/ScheduledJob/PSScheduledJob.psd1": "Modules/PSScheduledJob/PSScheduledJob.psd1",
-    "monad/src/ScheduledJob/PSScheduledJob.types.ps1xml": "Modules/PSScheduledJob/PSScheduledJob.types.ps1xml"
 }
diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/.gitignore b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/.gitignore
@@ -0,0 +1 @@
+CorePsTypeCatalog.cs
diff --git a/src/Modules/CimCmdlets/CimCmdlets.psd1 b/src/Modules/CimCmdlets/CimCmdlets.psd1
diff --git a/src/Modules/map.json b/src/Modules/map.json
@@ -26,5 +26,6 @@
     "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1",
     "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1",
     "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1"
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1",
+    "wmi/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1" : "CimCmdlets/CimCmdlets.psd1"
 }
diff --git a/src/Schemas/PSMaml/ITPro.xsd b/src/Schemas/PSMaml/ITPro.xsd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema targetNamespace="http://schemas.microsoft.com/maml/2004/10"
+    xmlns:doc="http://schemas.microsoft.com/maml/internal"
+    xmlns:maml="http://schemas.microsoft.com/maml/2004/10"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    blockDefault="#all"
+    xml:lang="en">
+  <!-- Schema documentation -->
+  <annotation>
+    <documentation>This schema describes MAML (Microsoft Assistance Markup Language). MAML is intended for software documentation. In particular, MAML is intended to accommodate the needs of Microsoft documentation.</documentation>
+    <documentation>The schema is broken into three main areas: end user, developer and IT Pro. These areas represent the main categories of Microsoft documentation.</documentation>
+    <documentation>The namespace uri for this version of MAML is: http://schemas.microsoft.com/maml/2004/10.</documentation>
+    <documentation>Each backwards-incompatible revision to MAML will require that the date fields be appropriately incremented in uri of the updated version of the MAML schema.</documentation>
+  </annotation>
+</schema>
diff --git a/src/Schemas/PSMaml/Maml.rld b/src/Schemas/PSMaml/Maml.rld
-Original file line number
+Diff line change
@@ Expand Up / @@ -763,7 +763,7 @@ function Copy-MappedFiles { @@
                 if (git log --grep="SD:$cl" HEAD^..HEAD)
                 {
-                    log Green "$pslMonadRoot HEAD matches [SD:$cl]"
+                    log "$pslMonadRoot HEAD matches [SD:$cl]"
                 }
                 else
                 {
@@ Expand Down @@