From 2dff3df0c442a3aea32b80cfa439081ed29bfdad Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Thu, 31 Oct 2019 15:17:20 -0700
Subject: [PATCH 1/2] Remove old files from signing

---
 tools/releaseBuild/signing.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tools/releaseBuild/signing.xml b/tools/releaseBuild/signing.xml
index 80b4c5333..d25fae8f6 100644
--- a/tools/releaseBuild/signing.xml
+++ b/tools/releaseBuild/signing.xml
@@ -42,26 +42,10 @@
     <!-- PowerShellEditorServices Binary -->
     <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.dll" signType="AuthenticodeFormer"
       dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.dll" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.Host.dll" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.Host.dll" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.Protocol.dll" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices\bin\Microsoft.PowerShell.EditorServices.Protocol.dll" />
 
     <!-- PowerShellEditorServices.VSCode Script -->
     <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.psd1" signType="AuthenticodeFormer"
       dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.psd1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.psm1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.psm1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Close-VSCodeHtmlContentView.ps1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Close-VSCodeHtmlContentView.ps1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\New-VSCodeHtmlContentView.ps1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\New-VSCodeHtmlContentView.ps1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Set-VSCodeHtmlContentView.ps1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Set-VSCodeHtmlContentView.ps1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Show-VSCodeHtmlContentView.ps1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Show-VSCodeHtmlContentView.ps1" />
-    <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Write-VSCodeHtmlContentView.ps1" signType="AuthenticodeFormer"
-      dest="__OUTPATHROOT__\PowerShellEditorServices\PowerShellEditorServices.VSCode\Public\HtmlContentView\Write-VSCodeHtmlContentView.ps1" />
 
     <!-- PowerShellEditorServices.VSCode Binary -->
     <file src="__INPATHROOT__\release\out\PowerShellEditorServices\PowerShellEditorServices.VSCode\bin\Microsoft.PowerShell.EditorServices.VSCode.dll" signType="AuthenticodeFormer"

From 7aedf4bedff8b4680333df926918fdae4e82ee0d Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Thu, 31 Oct 2019 15:41:25 -0700
Subject: [PATCH 2/2] Fix help-dependent tests

---
 PowerShellEditorServices.build.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
index 85b0998b7..aeee99828 100644
--- a/PowerShellEditorServices.build.ps1
+++ b/PowerShellEditorServices.build.ps1
@@ -320,6 +320,12 @@ namespace Microsoft.PowerShell.EditorServices.Hosting
     Set-Content -LiteralPath $script:BuildInfoPath -Value $buildInfoContents -Force
 }
 
+task SetupHelpForTests -Before Test {
+    if (-not (Get-Help Write-Host).Examples) {
+        Update-Help -Module Microsoft.PowerShell.Utility -Force -Scope CurrentUser
+    }
+}
+
 task Build {
     exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:TargetPlatform }
     exec { & $script:dotnetExe build -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj $script:TargetFrameworksParam }