Merge version 3.0 with .NET5.0 support

.github/workflows/dotnet-core.yml

@@ -0,0 +1,33 @@
+name: .NET Core Builds
+
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET 5.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.202
+    - name: Setup .NET Core 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.407
+    - name: Setup .NET Core 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 2.1.814
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+    - name: Test.Mutant
+      run: dotnet test --no-restore --verbosity normal ./test/test.csproj

.vscode/tasks.json

@@ -1,17 +1,35 @@
 {
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
-    "version": "0.1.0",
-    "command": "dotnet",
-    "isShellCommand": true,
-    "args": [],
+    "version": "2.0.0",
     "tasks": [
         {
-            "taskName": "build",
-            "args": [ "AMT.LinqExtensions" ],
-            "isBuildCommand": true,
-            "showOutput": "silent",
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "test",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "test"
+            ],
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "problemMatcher": []
         }
     ]
 }

AMT.LinqExtensions/AMT.LinqExtensions.csproj

@@ -15,8 +15,8 @@
     <GenerateAssemblyVersionAttribute />
     <GenerateNeutralResourcesLanguageAttribute />
 
-    <Description>A few LINQ Extensions which we find useful, and you may, too.</Description>
-    <PackageReleaseNotes>Supports .NET Core LTS versions 2.1, 3.1</PackageReleaseNotes>
+    <Description>A few LINQ Extensions we find useful.</Description>
+    <PackageReleaseNotes>Supports .NET 5.0 and .NET Core LTS versions 2.1, 3.1</PackageReleaseNotes>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/AltaModaTech/LINQExtensions</PackageProjectUrl>
     <PackageTags>LINQ</PackageTags>
@@ -28,11 +28,8 @@
   .NET Core 2.1 (LTS) EOL 8/21/2021
   .NET Core 1.1 EOL 6/27/2019
 -->
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0;net461;net462;net47;net471;net472;</TargetFrameworks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>

Publish-Release.ps1

@@ -0,0 +1,29 @@
+param (
+    [Parameter(Mandatory=$true)][string]$apiKey
+)
+
+$branch = invoke-expression "git branch --show-current"
+
+if ($branch -ne 'master') {
+    Write-Error "Publishing only allowed from master branch"
+    exit
+}
+
+$projPaths = @(
+    "."
+)
+
+# Ensure everything is built
+Write-Verbose "Pack projects"
+$projPaths | %{
+    write-host ""   # separator
+    dotnet pack -c Release $_
+}
+
+# Publish to NuGet
+Write-Verbose "Publish projects"
+$projPaths | %{
+    write-host ""   # separator
+    $pkg = gci $_/bin/Release *.nupkg
+    dotnet nuget push -k $apiKey $pkg.FullName -s https://api.nuget.org/v3/index.json
+}

common.props

@@ -10,7 +10,7 @@
 
     <!-- Assembly version & attribute controls -->
     <PropertyGroup>
-        <VersionPrefix>2.3.0</VersionPrefix>
+        <VersionPrefix>3.0.0</VersionPrefix>
 
         <GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>

test/test.csproj

@@ -12,18 +12,16 @@
   .NET Core 2.1 (LTS) EOL 8/21/2021
   .NET Core 1.1 EOL 6/27/2019
 -->
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net461;net462;net47;net471;net472;</TargetFrameworks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-      <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+  <PropertyGroup>
+      <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AMT.LinqExtensions\AMT.LinqExtensions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.SDK" Version="16.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="*" />
     <PackageReference Include="xunit" Version="*" />
     <PackageReference Include="FluentAssertions" Version="*" />