Skip to content

Commit 8bd4633

Browse files
committed
Drop support for PowerShell 7.2 (net6.0) per its end-of-life
Also allows us to bump Microsoft.Extensions.Logging to 9.0.0.
1 parent f0fde11 commit 8bd4633

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ItemGroup>
33
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
44
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
5-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
6-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
5+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
6+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
77
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
88
<PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
99
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />

PowerShellEditorServices.build.ps1

+3-9
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@ $script:BuildInfoPath = "src/PowerShellEditorServices.Hosting/BuildInfo.cs"
4040

4141
$script:NetFramework = @{
4242
PS51 = 'net462'
43-
PS72 = 'net6.0'
4443
PS74 = 'net8.0'
4544
Standard = 'netstandard2.0'
4645
}
4746

48-
$script:HostCoreOutput = "src/PowerShellEditorServices.Hosting/bin/$Configuration/$($script:NetFramework.PS72)/publish"
47+
$script:HostCoreOutput = "src/PowerShellEditorServices.Hosting/bin/$Configuration/$($script:NetFramework.PS74)/publish"
4948
$script:HostDeskOutput = "src/PowerShellEditorServices.Hosting/bin/$Configuration/$($script:NetFramework.PS51)/publish"
5049
$script:PsesOutput = "src/PowerShellEditorServices/bin/$Configuration/$($script:NetFramework.Standard)/publish"
5150

@@ -128,7 +127,7 @@ task RestorePsesModules -If (-not (Test-Path "module/PSReadLine") -or -not (Test
128127
Task Build FindDotNet, CreateBuildInfo, RestorePsesModules, {
129128
Write-Build DarkGreen "Building PowerShellEditorServices"
130129
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs ./src/PowerShellEditorServices/PowerShellEditorServices.csproj -f $script:NetFramework.Standard }
131-
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs ./src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj -f $script:NetFramework.PS72 }
130+
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs ./src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj -f $script:NetFramework.PS74 }
132131

133132
if (-not $script:IsNix) {
134133
Invoke-BuildExec { & dotnet publish $script:dotnetBuildArgs ./src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj -f $script:NetFramework.PS51 }
@@ -201,11 +200,6 @@ Task TestPS74 Build, SetupHelpForTests, {
201200
Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetFramework.PS74 }
202201
}
203202

204-
Task TestPS72 Build, SetupHelpForTests, {
205-
Set-Location ./test/PowerShellEditorServices.Test/
206-
Invoke-BuildExec { & dotnet $script:dotnetTestArgs $script:NetFramework.PS72 }
207-
}
208-
209203
Task TestPS51 -If (-not $script:IsNix) Build, SetupHelpForTests, {
210204
Set-Location ./test/PowerShellEditorServices.Test/
211205
# TODO: See https://github.com/dotnet/sdk/issues/18353 for x64 test host
@@ -299,7 +293,7 @@ Task TestE2EPowerShellCLM -If (-not $script:IsNix) Build, SetupHelpForTests, {
299293
}
300294
}
301295

302-
Task Test TestPS72, TestPS74, TestE2EPwsh, TestPS51, TestE2EPowerShell
296+
Task Test TestPS74, TestE2EPwsh, TestPS51, TestE2EPowerShell
303297

304298
Task TestFull Test, TestE2EDaily, TestE2EPwshCLM, TestE2EPowerShellCLM
305299

src/PowerShellEditorServices.Hosting/PowerShellEditorServices.Hosting.csproj

+1-1
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>net6.0;net462</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Hosting</AssemblyName>
77
</PropertyGroup>
88

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

+1-6
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;net6.0;net462</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net462</TargetFrameworks>
66
<AssemblyName>Microsoft.PowerShell.EditorServices.Test</AssemblyName>
77
<TargetPlatform>x64</TargetPlatform>
88
</PropertyGroup>
@@ -21,11 +21,6 @@
2121
<PackageReference Include="Microsoft.PowerShell.SDK" VersionOverride="7.4.6" />
2222
</ItemGroup>
2323

24-
<!-- PowerShell 7.2.x -->
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
26-
<PackageReference Include="Microsoft.PowerShell.SDK" VersionOverride="7.2.24" />
27-
</ItemGroup>
28-
2924
<!-- Windows PowerShell 5.1 -->
3025
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
3126
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" />

0 commit comments

Comments
 (0)