Skip to content

Commit 685a6ba

Browse files
committed
Update SDKs, remove 7.3 (EOL), and test daily on merge
1 parent 5162707 commit 685a6ba

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

.github/workflows/ci-test.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,19 @@ jobs:
4747
sparse-checkout: tools/install-powershell.ps1
4848
sparse-checkout-cone-mode: false
4949

50+
- name: Install daily
51+
if: ${{ github.event_name == 'schedule' || github.event_name == 'merge_group' }}
52+
shell: pwsh
53+
run: ./pwsh/tools/install-powershell.ps1 -Daily
54+
5055
- name: Build and test
5156
shell: pwsh
5257
run: Invoke-Build -Configuration Release ${{ github.event_name == 'merge_group' && 'TestFull' || 'Test' }}
5358

54-
- name: Test with daily
59+
- name: Test daily
5560
if: ${{ github.event_name == 'schedule' }}
5661
shell: pwsh
57-
run: ./pwsh/tools/install-powershell.ps1 -Daily && Invoke-Build -Configuration Release TestE2EDaily
62+
run: Invoke-Build -Configuration Release TestE2EDaily
5863

5964
- name: Upload build artifacts
6065
if: always()

PowerShellEditorServices.build.ps1

+2-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ $script:BuildInfoPath = "src/PowerShellEditorServices.Hosting/BuildInfo.cs"
4141
$script:NetFramework = @{
4242
PS51 = 'net462'
4343
PS72 = 'net6.0'
44-
PS73 = 'net7.0'
4544
PS74 = 'net8.0'
4645
Standard = 'netstandard2.0'
4746
}
@@ -200,11 +199,6 @@ Task TestPS74 Build, SetupHelpForTests, {
200199
Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetFramework.PS74 }
201200
}
202201

203-
Task TestPS73 Build, SetupHelpForTests, {
204-
Set-Location ./test/PowerShellEditorServices.Test/
205-
Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetFramework.PS73 }
206-
}
207-
208202
Task TestPS72 Build, SetupHelpForTests, {
209203
Set-Location ./test/PowerShellEditorServices.Test/
210204
Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetFramework.PS72 }
@@ -303,11 +297,11 @@ Task TestE2EPowerShellCLM -If (-not $script:IsNix) Build, SetupHelpForTests, {
303297
}
304298
}
305299

306-
Task Test TestPS74, TestE2EPwsh, TestPS51, TestE2EPowerShell {
300+
Task Test TestPS72, TestPS74, TestE2EPwsh, TestPS51, TestE2EPowerShell {
307301
Write-Build DarkMagenta "Running concise set of tests" # for pull requests
308302
}
309303

310-
Task TestFull Test, TestPS73, TestPS72, TestE2EPwshCLM, TestE2EPowerShellCLM {
304+
Task TestFull Test, TestE2EDaily, TestE2EPwshCLM, TestE2EPowerShellCLM {
311305
Write-Build DarkMagenta "Running every combination of tests" # for main branch
312306
}
313307

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

+3-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net8.0;net7.0;net6.0;net462</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net6.0;net462</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test</AssemblyName>
77
<TargetPlatform>x64</TargetPlatform>
88
</PropertyGroup>
@@ -18,17 +18,12 @@
1818

1919
<!-- PowerShell 7.4.x -->
2020
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
21-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.3" />
22-
</ItemGroup>
23-
24-
<!-- PowerShell 7.3.x -->
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
26-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.3.11" />
21+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
2722
</ItemGroup>
2823

2924
<!-- PowerShell 7.2.x -->
3025
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
31-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" />
26+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.23" />
3227
</ItemGroup>
3328

3429
<!-- Windows PowerShell 5.1 -->

0 commit comments

Comments
 (0)