Merge pull request #1955 from PowerShell/andschwa/powershell7.3

Add PowerShell 7.3 to test matrix

Author: andyleejordan

.github/workflows/codeql-analysis.yml

@@ -29,6 +29,9 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Install dotnet
+      uses: actions/setup-dotnet@v3
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/emacs-test.yml

@@ -17,6 +17,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Install dotnet
+        uses: actions/setup-dotnet@v3
+
       - name: Build PSES
         shell: pwsh
         run: tools/azurePipelinesBuild.ps1

.github/workflows/vim-test.yml

@@ -17,6 +17,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Install dotnet
+        uses: actions/setup-dotnet@v3
+
       - name: Build PSES
         shell: pwsh
         run: tools/azurePipelinesBuild.ps1

.vsts-ci/templates/ci-general.yml

@@ -12,9 +12,16 @@ steps:
     pwsh: ${{ parameters.pwsh }}
 
 - task: UseDotNet@2
-  displayName: Install .NET 6.0.x SDK
+  displayName: Install .NET 7.0.x SDK
   inputs:
     packageType: sdk
+    version: 7.0.x
+    performMultiLevelLookup: true
+
+- task: UseDotNet@2
+  displayName: Install .NET 6.0.x runtime
+  inputs:
+    packageType: runtime
     version: 6.0.x
     performMultiLevelLookup: true
 

PowerShellEditorServices.build.ps1

@@ -41,6 +41,7 @@ $script:PsesCommonProps = [xml](Get-Content -Raw "$PSScriptRoot/PowerShellEditor
 $script:NetRuntime = @{
     PS7      = 'netcoreapp3.1'
     PS72     = 'net6.0'
+    PS73     = 'net7.0'
     Desktop  = 'net462'
     Standard = 'netstandard2.0'
 }
@@ -73,24 +74,24 @@ Task FindDotNet {
 }
 
 Task BinClean {
-    Remove-Item $PSScriptRoot\.tmp -Recurse -Force -ErrorAction Ignore
-    Remove-Item $PSScriptRoot\module\PowerShellEditorServices\bin -Recurse -Force -ErrorAction Ignore
-    Remove-Item $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin -Recurse -Force -ErrorAction Ignore
+    Remove-BuildItem $PSScriptRoot\.tmp
+    Remove-BuildItem $PSScriptRoot\module\PowerShellEditorServices\bin
+    Remove-BuildItem $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin
 }
 
 Task Clean FindDotNet, BinClean, {
-    Exec { & dotnet clean $VerbosityArgs }
-    Get-ChildItem -Recurse $PSScriptRoot\src\*.nupkg | Remove-Item -Force -ErrorAction Ignore
-    Get-ChildItem $PSScriptRoot\PowerShellEditorServices*.zip | Remove-Item -Force -ErrorAction Ignore
-    Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-Item -Force -ErrorAction Ignore
+    Invoke-BuildExec { & dotnet clean $VerbosityArgs }
+    Get-ChildItem -Recurse $PSScriptRoot\src\*.nupkg | Remove-BuildItem
+    Get-ChildItem $PSScriptRoot\PowerShellEditorServices*.zip | Remove-BuildItem
+    Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-BuildItem
 
     # Remove bundled component modules
     $moduleJsonPath = "$PSScriptRoot\modules.json"
     if (Test-Path $moduleJsonPath) {
         Get-Content -Raw $moduleJsonPath |
             ConvertFrom-Json |
             ForEach-Object { $_.PSObject.Properties.Name } |
-            ForEach-Object { Remove-Item -Path "$PSScriptRoot/module/$_" -Recurse -Force -ErrorAction Ignore }
+            ForEach-Object { Remove-BuildItem -Path "$PSScriptRoot/module/$_" }
     }
 }
 
@@ -161,20 +162,20 @@ Task SetupHelpForTests {
 }
 
 Task Build FindDotNet, CreateBuildInfo, {
-    Exec { & dotnet restore $VerbosityArgs }
-    Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
-    Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
+    Invoke-BuildExec { & dotnet restore $VerbosityArgs }
+    Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
+    Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
     if (-not $script:IsNix) {
-        Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
+        Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
     }
 
     # Build PowerShellEditorServices.VSCode module
-    Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
+    Invoke-BuildExec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
 }
 
 Task Test TestServer, TestE2E
 
-Task TestServer TestServerWinPS, TestServerPS7, TestServerPS72
+Task TestServer TestServerWinPS, TestServerPS7, TestServerPS72, TestServerPS73
 
 # NOTE: While these can run under `pwsh.exe` we only want them to run under
 # `powershell.exe` so that the CI time isn't doubled.
@@ -184,25 +185,29 @@ Task TestServerWinPS -If ($PSVersionTable.PSEdition -eq "Desktop") Build, SetupH
     # that is debuggable! If architecture is added, the assembly path gets an
     # additional folder, necesstiating fixes to find the commands definition
     # file and test files.
-    Exec { & dotnet $script:dotnetTestArgs $script:NetRuntime.Desktop }
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.Desktop }
 }
 
 Task TestServerPS7 -If ($PSVersionTable.PSEdition -eq "Core" -and -not $script:IsAppleM1 -and -not $script:IsArm64) Build, SetupHelpForTests, {
     Set-Location .\test\PowerShellEditorServices.Test\
-    Exec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS7 }
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS7 }
 }
 
 Task TestServerPS72 -If ($PSVersionTable.PSEdition -eq "Core") Build, SetupHelpForTests, {
     Set-Location .\test\PowerShellEditorServices.Test\
-    Exec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
+}
+
+Task TestServerPS73 -If ($PSVersionTable.PSEdition -eq "Core") Build, SetupHelpForTests, {
+    Set-Location .\test\PowerShellEditorServices.Test\
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS73 }
 }
 
 Task TestE2E Build, SetupHelpForTests, {
     Set-Location .\test\PowerShellEditorServices.Test.E2E\
 
     $env:PWSH_EXE_NAME = if ($IsCoreCLR) { "pwsh" } else { "powershell" }
-    $NetRuntime = if ($IsAppleM1 -or $script:IsArm64) { $script:NetRuntime.PS72 } else { $script:NetRuntime.PS7 }
-    Exec { & dotnet $script:dotnetTestArgs $NetRuntime }
+    Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
 
     if (!$script:IsNix) {
         if (-not [Security.Principal.WindowsIdentity]::GetCurrent().Owner.IsWellKnown("BuiltInAdministratorsSid")) {
@@ -213,7 +218,7 @@ Task TestE2E Build, SetupHelpForTests, {
         try {
             Write-Host "Running end-to-end tests in Constrained Language Mode."
             [System.Environment]::SetEnvironmentVariable("__PSLockdownPolicy", "0x80000007", [System.EnvironmentVariableTarget]::Machine);
-            Exec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS7 }
+            Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetRuntime.PS72 }
         } finally {
             [System.Environment]::SetEnvironmentVariable("__PSLockdownPolicy", $null, [System.EnvironmentVariableTarget]::Machine);
         }

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0",
+    "version": "7.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   }

src/PowerShellEditorServices/Utility/FormatUtils.cs

@@ -23,6 +23,8 @@ internal static class FormatUtils
 
         private const string Static = "static ";
 
+        private static HashSet<string>? usingNamespaces;
+
         /// <summary>
         /// Space, new line, carriage return and tab.
         /// </summary>
@@ -164,9 +166,9 @@ private static string GetMethodDocumentation(ReadOnlySpan<char> toolTip, out Mar
         {
             kind = MarkupKind.Markdown;
             StringBuilder text = new();
-            HashSet<string>? usingNamespaces = null;
             while (true)
             {
+                usingNamespaces = null;
                 toolTip = toolTip.TrimStart(s_whiteSpace.Span);
                 toolTip = ProcessMethod(toolTip, text, ref usingNamespaces);
                 if (toolTip.IsEmpty)

test/PowerShellEditorServices.Test.E2E/Processes/LoggingStream.cs

@@ -16,6 +16,15 @@ internal class LoggingStream : Stream
 
         public LoggingStream(Stream underlyingStream) => _underlyingStream = underlyingStream;
 
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                _underlyingStream.Dispose();
+            }
+        }
+
         public override bool CanRead => _underlyingStream.CanRead;
 
         public override bool CanSeek => _underlyingStream.CanSeek;

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netcoreapp3.1;net462</TargetFrameworks>
     <AssemblyName>Microsoft.PowerShell.EditorServices.Test</AssemblyName>
     <TargetPlatform>x64</TargetPlatform>
   </PropertyGroup>
@@ -12,20 +12,30 @@
     <ProjectReference Include="..\PowerShellEditorServices.Test.Shared\PowerShellEditorServices.Test.Shared.csproj" />
   </ItemGroup>
 
-  <!-- This is for testing PowerShell 7.2 LTS -->
+  <!-- Latest PowerShell -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
+      <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.3.0" />
+  </ItemGroup>
+
+  <!-- PowerShell LTS-Current -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.7" />
   </ItemGroup>
 
-  <!-- This is for testing PowerShell 7.0 LTS and so needs to be 7.0.x -->
+  <!-- PowerShell LTS -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.13" />
   </ItemGroup>
 
+  <!-- Windows PowerShell 5.1 -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'net462' ">
+    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
@@ -48,7 +58,4 @@
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'net462' ">
-    <DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
-  </PropertyGroup>
 </Project>