Skip to content

Drop target for .NET 6 that's no longer supported #1104

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
May 31, 2025
Merged

Drop target for .NET 6 that's no longer supported #1104

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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "9.0.200",
"dotnetRuntimeVersions": "8.0.14, 6.0.36"
"dotnetRuntimeVersions": "8.0.14"
},
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": false,
Expand Down
2 changes: 1 addition & 1 deletion MoreLinq.Test/MoreLinq.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<AssemblyTitle>MoreLinq.Test</AssemblyTitle>
<TargetFrameworks>net9.0;net8.0;net6.0;net471</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net471</TargetFrameworks>
<DebugType>portable</DebugType>
<AssemblyName>MoreLinq.Test</AssemblyName>
<OutputType Condition="'$(TargetFramework)' == 'net471'">Exe</OutputType>
Expand Down
4 changes: 2 additions & 2 deletions MoreLinq.shfbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
<DocumentationSources>
<DocumentationSource sourceFile="MoreLinq\bin\Release\net6.0\MoreLinq.dll" />
<DocumentationSource sourceFile="MoreLinq\bin\Release\net6.0\MoreLinq.xml" />
<DocumentationSource sourceFile="MoreLinq\bin\Release\net8.0\MoreLinq.dll" />
<DocumentationSource sourceFile="MoreLinq\bin\Release\net8.0\MoreLinq.xml" />
</DocumentationSources>
<HelpFileFormat>Website</HelpFileFormat>
<CopyrightHref>http://www.apache.org/licenses/LICENSE-2.0</CopyrightHref>
Expand Down
73 changes: 61 additions & 12 deletions MoreLinq/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.SequenceException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
Expand Down Expand Up @@ -83,36 +83,85 @@
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/netstandard2.1/MoreLinq.dll</Left>
<Right>lib/net6.0/MoreLinq.dll</Right>
<Right>lib/net8.0/MoreLinq.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:MoreLinq.OrderByDirection</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MaxBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IComparer{``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:MoreLinq.MoreEnumerable.MinBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
<Left>lib/net6.0/MoreLinq.dll</Left>
<Right>lib/netstandard2.1/MoreLinq.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
</Suppressions>
6 changes: 3 additions & 3 deletions MoreLinq/MoreLinq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<NeutralLanguage>en-US</NeutralLanguage>
<VersionPrefix>4.4.1</VersionPrefix>
<Authors>MoreLINQ Developers.</Authors>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
<DebugType>portable</DebugType>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>MoreLinq</AssemblyName>
Expand Down Expand Up @@ -214,15 +214,15 @@
<DefineConstants>$(DefineConstants);MORELINQ</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0' ">
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<DefineConstants>$(DefineConstants);NO_STATIC_ABSTRACTS</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);NO_STATIC_ABSTRACTS;NO_ASYNC_STREAMS;NO_BUFFERS</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0' And '$(TargetFramework)' != 'net6.0'">
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
<DefineConstants>$(DefineConstants);DYNAMIC_CODE_FALLBACK</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 0 additions & 2 deletions test.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ call :clean ^
&& call :test net9.0 Release ^
&& call :test net8.0 Debug ^
&& call :test net8.0 Release ^
&& call :test net6.0 Debug ^
&& call :test net6.0 Release ^
&& call :test net471 Debug ^
&& call :test net471 Release ^
&& call :report-cover ^
Expand Down
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [[ -z "$1" ]]; then
else
configs="$1"
fi
for f in net6.0 net8.0 net9.0; do
for f in net8.0 net9.0; do
for c in $configs; do
dotnet test --no-build -c $c -f $f --settings MoreLinq.Test/coverlet.runsettings MoreLinq.Test
TEST_RESULTS_DIR="$(ls -dc MoreLinq.Test/TestResults/* | head -1)"
Expand Down
Loading