Skip to content

Commit

Permalink
Remove support for .NET 7 (#103)
Browse files Browse the repository at this point in the history
This change removes direct support for `net7.0` and changes the version
number to `2.0`.
  • Loading branch information
craigktreasure authored May 8, 2024
1 parent 0f46be7 commit cd8a66a
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/Treasure.Utils.Argument/Treasure.Utils.Argument.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
<RootNamespace>Treasure.Utils</RootNamespace>

<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
6 changes: 1 addition & 5 deletions test/Treasure.Utils.Argument.Benchmarks/Combine.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[CmdletBinding()]
Param (
[string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows', 'net8.0', 'net8.0-windows'),
[string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net8.0', 'net8.0-windows'),
[string[]] $Columns = @( 'Runtime', 'TFM', 'LibraryTfm', 'Method', 'Mean', 'Error', 'StdDev', 'Code Size'),
[string] $ArtifactInputRoot = (Join-Path $PSScriptRoot '..' '..' '__benchmarks'),
[string] $ResultOutputPath = (Join-Path $PSScriptRoot '..' '..' '__benchmarks' 'results.md'),
Expand Down Expand Up @@ -40,10 +40,6 @@ function GetLibraryTfmName ($tfm) {
return 'net6.0'
}

if ($tfm -eq 'net7.0') {
return 'net7.0'
}

if ($tfm -eq 'net8.0') {
return 'net8.0'
}
Expand Down
2 changes: 1 addition & 1 deletion test/Treasure.Utils.Argument.Benchmarks/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// .\Run.ps1
// or
// dotnet run -c Release -f [net6.0 net7.0 net8.0] --filter "*"
// dotnet run -c Release -f [net6.0 net8.0] --filter "*"

#pragma warning disable CA1050
#pragma warning disable CA1812
Expand Down
2 changes: 1 addition & 1 deletion test/Treasure.Utils.Argument.Benchmarks/Run.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[CmdletBinding()]
Param (
[string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net7.0', 'net7.0-windows', 'net8.0', 'net8.0-windows'),
[string[]] $TFMs = @('net6.0', 'net6.0-windows', 'net8.0', 'net8.0-windows'),
[string] $ArtifactOutputRoot = (Join-Path $PSScriptRoot '..' '..' '__benchmarks'),
[string] $ResultOutputPath = (Join-Path $PSScriptRoot '..' '..' '__benchmarks' 'results.md')
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net8.0$(PlatformTFMSuffix);net7.0$(PlatformTFMSuffix);net6.0$(PlatformTFMSuffix)</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);net8.0$(PlatformTFMSuffix);net6.0$(PlatformTFMSuffix)</TargetFrameworks>
<RootNamespace>Treasure.Utils.Benchmarks</RootNamespace>
<IsTestProject>false</IsTestProject>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(TargetFrameworks);$(DefaultNetStandardTestTFM)</TargetFrameworks>
<RootNamespace>Treasure.Utils.Tests</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.1",
"version": "2.0",
"buildNumberOffset": -1,
"nugetPackageVersion": {
"semVer": 2
Expand Down

0 comments on commit cd8a66a

Please sign in to comment.