Update Help Offline for completion tests

PowerShell · Dec 6, 2024 · 7f0083c · 7f0083c
1 parent a1ae8ae
commit 7f0083c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
@@ -1038,7 +1038,7 @@ await PsesLanguageClient
                 "evaluate",
                 new EvaluateRequestArguments
                 {
-                    Expression = "Update-Help Microsoft.Powershell.Utility;"
+                    Expression = $"Update-Help Microsoft.Powershell.Utility -SourcePath {s_binDir};"
                 })
             .ReturningVoid(CancellationToken.None);
 
@@ -1072,7 +1072,7 @@ await PsesLanguageClient
                     "evaluate",
                     new EvaluateRequestArguments
                     {
-                        Expression = "Update-Help Microsoft.Powershell.Utility;Import-Module Microsoft.PowerShell.Utility -Prefix Test -Force"
+                        Expression = $"Update-Help Microsoft.Powershell.Utility -SourcePath {s_binDir};Import-Module Microsoft.PowerShell.Utility -Prefix Test -Force"
                     })
                 .ReturningVoid(CancellationToken.None);
 

diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
+  <Import
+    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
@@ -18,8 +19,10 @@
   <Choose>
     <When Condition=" '$(LocalOmniSharp)' == 'true' ">
       <ItemGroup>
-        <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Client\Client.csproj" />
-        <ProjectReference Include="..\..\..\csharp-language-server-protocol\src\Dap.Client\Dap.client.csproj" />
+        <ProjectReference
+          Include="..\..\..\csharp-language-server-protocol\src\Client\Client.csproj" />
+        <ProjectReference
+          Include="..\..\..\csharp-language-server-protocol\src\Dap.Client\Dap.client.csproj" />
       </ItemGroup>
     </When>
     <Otherwise>
@@ -37,4 +40,11 @@
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
+
+  <ItemGroup>
+    <!-- Used for Update-Help for some test fixtures -->
+    <Content Include="..\PowerShellEditorServices.Test.Shared\PSHelp\**\*"
+      CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
 </Project>
diff --git a/...red/PSHelp/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml b/...red/PSHelp/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_HelpInfo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HelpInfo xmlns="http://schemas.microsoft.com/powershell/help/2010/05">
+  <HelpContentURI>https://aka.ms/powershell51-help</HelpContentURI>
+  <SupportedUICultures>
+    <UICulture>
+      <UICultureName>en-US</UICultureName>
+      <UICultureVersion>5.2.0.0</UICultureVersion>
+    </UICulture>
+  </SupportedUICultures>
+</HelpInfo>
diff --git a/...p/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_HelpContent.cab b/...p/Microsoft.PowerShell.Utility_1da87e53-152b-403e-98dc-74d7b4d63d59_en-US_HelpContent.cab
diff --git a/test/PowerShellEditorServices.Test.Shared/PSHelp/README b/test/PowerShellEditorServices.Test.Shared/PSHelp/README
@@ -0,0 +1 @@
+Windows PowerShell does not have updated help in CI by default and we utilize a private Azure Devops repo for builds that has no internet access. The completion tests validate the Windows Help so we update it offline from here so these tests can work.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Windows PowerShell does not have updated help in CI by default and we utilize a private Azure Devops repo for builds that has no internet access. The completion tests validate the Windows Help so we update it offline from here so these tests can work.