Skip to content

Upgrade to .NET 8 since .NET 6 is past EOL #2073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Upgrade to .NET 8 since .NET 6 is past EOL #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .pipelines/PSScriptAnalyzer-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ extends:
inputs:
packageType: sdk
useGlobalJson: true
- pwsh: |
Register-PSRepository -Name CFS -SourceLocation "https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v2" -InstallationPolicy Trusted
Install-Module -Repository CFS -Name Microsoft.PowerShell.PSResourceGet
./tools/installPSResources.ps1 -PSRepository CFS
- pwsh: ./tools/installPSResources.ps1 -PSRepository CFS
displayName: Install PSResources
- pwsh: ./build.ps1 -Configuration Release -All
displayName: Build
Expand Down
10 changes: 5 additions & 5 deletions Engine/Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<VersionPrefix>$(ModuleVersion)</VersionPrefix>
<TargetFrameworks>net6;net462</TargetFrameworks>
<TargetFrameworks>net8;net462</TargetFrameworks>
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer</AssemblyName>
<AssemblyVersion>$(ModuleVersion)</AssemblyVersion>
<PackageId>Engine</PackageId>
Expand All @@ -18,11 +18,11 @@
<DebugType>portable</DebugType>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net6' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8' ">
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net8' ">
<Compile Remove="SafeDirectoryCatalog.cs" />
</ItemGroup>

Expand Down Expand Up @@ -69,10 +69,10 @@
</PropertyGroup>


<ItemGroup Condition="'$(TargetFramework)' == 'net6'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8'">
<PackageReference Include="System.Management.Automation" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net6'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8'">
<DefineConstants>$(DefineConstants);PSV7;CORECLR</DefineConstants>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Rules/Rules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<VersionPrefix>$(ModuleVersion)</VersionPrefix>
<TargetFrameworks>net6;net462</TargetFrameworks>
<TargetFrameworks>net8;net462</TargetFrameworks>
<AssemblyName>Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules</AssemblyName>
<AssemblyVersion>$(ModuleVersion)</AssemblyVersion>
<PackageId>Rules</PackageId>
Expand All @@ -16,7 +16,7 @@

</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net8' ">
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Reflection.TypeExtensions" />
<PackageReference Include="Microsoft.Management.Infrastructure" />
Expand Down Expand Up @@ -61,7 +61,7 @@
<DefineConstants>$(DefineConstants);PSV3;PSV4</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8'">
<DefineConstants>$(DefineConstants);PSV7;CORECLR</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function Start-ScriptAnalyzerBuild

$framework = 'net462'
if ($PSVersion -eq 7) {
$framework = 'net6'
$framework = 'net8'
}

# build the appropriate assembly
Expand Down
3 changes: 2 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"sdk": {
"version": "6.0.427"
"version": "8.0.406",
"rollForward": "latestFeature"
}
}
Loading