From d40aaa1022c736c6e43ec1b2bef018510bc895ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 12 Dec 2024 22:18:49 +0100 Subject: [PATCH] Update to net8 and newer dep (#2586) * Update to net8 and newer dep * Fix occurences of net6.0 --- build.ps1 | 4 +- global.json | 2 +- publish/filesToPublish.ps1 | 2 +- src/Pester.Types.ps1 | 6 +- src/csharp/Pester/Pester.csproj | 14 +- src/csharp/Pester/packages.lock.json | 238 +++++------------ src/csharp/PesterTests/PesterTests.csproj | 7 +- src/csharp/PesterTests/packages.lock.json | 312 ++++++++-------------- 8 files changed, 197 insertions(+), 388 deletions(-) diff --git a/build.ps1 b/build.ps1 index 622dfbe47..7587e1a33 100644 --- a/build.ps1 +++ b/build.ps1 @@ -94,7 +94,7 @@ if ($Clean) { if ($Clean) { # Update PesterConfiguration help in about_PesterConfiguration if ($PSVersionTable.PSVersion.Major -ge 6) { - $null = [Reflection.Assembly]::LoadFrom("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net6.0/Pester.dll") + $null = [Reflection.Assembly]::LoadFrom("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net8.0/Pester.dll") } else { $null = [Reflection.Assembly]::LoadFrom("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net462/Pester.dll") @@ -205,7 +205,7 @@ if ($Clean) { , ("$PSScriptRoot/src/schemas/Cobertura/*.dtd", "$PSScriptRoot/bin/schemas/Cobertura/") , ("$PSScriptRoot/src/schemas/JaCoCo/*.dtd", "$PSScriptRoot/bin/schemas/JaCoCo/") , ("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net462/Pester.dll", "$PSScriptRoot/bin/bin/net462/") - , ("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net6.0/Pester.dll", "$PSScriptRoot/bin/bin/net6.0/") + , ("$PSScriptRoot/src/csharp/Pester/bin/$Configuration/net8.0/Pester.dll", "$PSScriptRoot/bin/bin/net8.0/") ) } diff --git a/global.json b/global.json index 2d566bd8c..04fa23b25 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "rollForward": "latestFeature", + "rollForward": "latestMajor", "version": "8.0.100", "allowPrerelease": false } diff --git a/publish/filesToPublish.ps1 b/publish/filesToPublish.ps1 index ec216ff18..ca9f45457 100644 --- a/publish/filesToPublish.ps1 +++ b/publish/filesToPublish.ps1 @@ -5,7 +5,7 @@ 'Pester.Format.ps1xml' 'PesterConfiguration.Format.ps1xml' 'bin/net462/Pester.dll' - 'bin/net6.0/Pester.dll' + 'bin/net8.0/Pester.dll' 'en-US/about_Pester.help.txt' 'en-US/about_PesterConfiguration.help.txt' 'schemas/Cobertura/coverage-loose.dtd' diff --git a/src/Pester.Types.ps1 b/src/Pester.Types.ps1 index d891dddaf..b63d20d43 100644 --- a/src/Pester.Types.ps1 +++ b/src/Pester.Types.ps1 @@ -13,13 +13,13 @@ if ($null -ne $configurationType) { } if ($PSVersionTable.PSVersion.Major -ge 6) { - $path = "$PSScriptRoot/bin/net6.0/Pester.dll" + $path = "$PSScriptRoot/bin/net8.0/Pester.dll" # PESTER_BUILD if ((Get-Variable -Name "PESTER_BUILD" -ValueOnly -ErrorAction Ignore)) { - $path = "$PSScriptRoot/../bin/bin/net6.0/Pester.dll" + $path = "$PSScriptRoot/../bin/bin/net8.0/Pester.dll" } else { - $path = "$PSScriptRoot/../bin/bin/net6.0/Pester.dll" + $path = "$PSScriptRoot/../bin/bin/net8.0/Pester.dll" } # end PESTER_BUILD & $SafeCommands['Add-Type'] -Path $path diff --git a/src/csharp/Pester/Pester.csproj b/src/csharp/Pester/Pester.csproj index 6392dbb9f..bea226a3e 100644 --- a/src/csharp/Pester/Pester.csproj +++ b/src/csharp/Pester/Pester.csproj @@ -1,7 +1,7 @@  - net6.0;net462 + net8.0;net462 latest true embedded @@ -11,14 +11,10 @@ $(DefineConstants);PESTER - - - + + + +