Skip to content
This repository was archived by the owner on Mar 8, 2025. It is now read-only.

Commit 27c77c5

Browse files
committed
Merge branch .NET 6.0 support; increment version
2 parents 0d75811 + 85e993f commit 27c77c5

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

.github/workflows/dotnet-core.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
- name: Setup .NET 6.0
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 6.0.100
1620
- name: Setup .NET 5.0
1721
uses: actions/setup-dotnet@v1
1822
with:
19-
dotnet-version: 5.0.401
23+
dotnet-version: 5.0.403
2024
- name: Setup .NET Core 3.1
2125
uses: actions/setup-dotnet@v1
2226
with:
23-
dotnet-version: 3.1.413
27+
dotnet-version: 3.1.415
2428
- name: Install dependencies
2529
run: dotnet restore
2630
- name: Build

AMT.LinqExtensions/AMT.LinqExtensions.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,22 @@
1616
<GenerateNeutralResourcesLanguageAttribute />
1717

1818
<Description>A few LINQ Extensions we find useful.</Description>
19-
<PackageReleaseNotes>Supports .NET Core 3.1 &amp; .NET 5.0</PackageReleaseNotes>
19+
<PackageReleaseNotes>Supports .NET Core 3.1, .NET 5.0, &amp; .NET 6.0</PackageReleaseNotes>
2020
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2121
<PackageProjectUrl>https://github.com/AltaModaTech/LINQExtensions</PackageProjectUrl>
2222
<PackageTags>LINQ</PackageTags>
2323
<Title>LINQ Extensions by AltaModa Technologies</Title>
2424
</PropertyGroup>
2525

2626
<!--
27+
.NET 6.0 (LTS) EOL 11/8/2024
2728
.NET Core 3.1 (LTS) EOL 12/3/2022
29+
.NET 5.0 EOL 5/8/2022
2830
.NET Core 2.1 (LTS) EOL 8/21/2021
2931
.NET Core 1.1 EOL 6/27/2019
3032
-->
3133
<PropertyGroup>
32-
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
34+
<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
3335
</PropertyGroup>
3436

3537
</Project>

common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<!-- Assembly version & attribute controls -->
1212
<PropertyGroup>
13-
<VersionPrefix>3.1.0</VersionPrefix>
13+
<VersionPrefix>3.2.0</VersionPrefix>
1414

1515
<GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
1616
<GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>

test/test.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
</PropertyGroup>
99

1010
<!--
11+
.NET 6.0 (LTS) EOL 11/8/2024
1112
.NET Core 3.1 (LTS) EOL 12/3/2022
13+
.NET 5.0 EOL 5/8/2022
1214
.NET Core 2.1 (LTS) EOL 8/21/2021
1315
.NET Core 1.1 EOL 6/27/2019
1416
-->
1517
<PropertyGroup>
16-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
18+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
1719
</PropertyGroup>
1820

1921
<ItemGroup>

0 commit comments

Comments
 (0)