Merged

Add PowerShell 7.3 to test matrix #1955

Show file tree
Hide file tree
Changes from all commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ef2c21
Update build script to use `Invoke-BuildItem` instead of `Exec`
andyleejordanNov 9, 2022
7c8494a
Add PowerShell 7.3 with `net7.0` to test matrix
andyleejordanNov 10, 2022
79264e1
Fix error CS8347, usage of `usingNamespaces` exceeds its lifetime
andyleejordanNov 10, 2022
a3b1423
Fix error CA2213, field `_underlyingStream` was not being disposed
andyleejordanNov 10, 2022
8f31af3
Add `setup-dotnet` action to workflows
andyleejordanNov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Failed to load files.
Original file line numberDiff line numberDiff line change
Expand Up@@ -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: /codeql-action/init@v2
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand DownExpand Up@@ -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)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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" />
Expand All@@ -48,7 +58,4 @@
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' != 'net462' ">
<DefineConstants>$(DefineConstants);CoreCLR</DefineConstants>
</PropertyGroup>
</Project>