From 57050a8a73922b3fe63b1a6189eef546bd3c3c0f Mon Sep 17 00:00:00 2001 From: jburnett Date: Sun, 13 Sep 2020 22:13:27 -0400 Subject: [PATCH 1/6] Upgrade tasks version; incl MSTest SDK in tests --- .vscode/launch.json | 16 ---------------- .vscode/tasks.json | 34 ++++++++++++++++++++++++++-------- test/test.csproj | 1 + 3 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 1b757b7..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": ".NET Core Launch (MSTest)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - "program": "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\MSTest.exe", - "args": ["/testcontainer:${workspaceRoot}/test/bin/Debug/netcoreapp1.0/AMT.LinqExtensions.Tests.dll /runsettings:${workspaceRoot}/test/AMT.Tests.runsettings"], - "cwd": "${workspaceRoot}/test/bin/Debug/netcoreapp1.0/", - "stopAtEntry": false, - "externalConsole": false - } - ] -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index ed9ee89..f0ea7f1 100644 --- a/.vscode/tasks.json +++ b/.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": [] } ] } \ No newline at end of file diff --git a/test/test.csproj b/test/test.csproj index c64fe5a..7b0e644 100644 --- a/test/test.csproj +++ b/test/test.csproj @@ -24,6 +24,7 @@ + From 8bc09001a8b7af19671517e09fe363d5fad74c01 Mon Sep 17 00:00:00 2001 From: jburnett Date: Mon, 12 Apr 2021 15:26:50 -0400 Subject: [PATCH 2/6] Rm'd NuGet config --- NuGet.config | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 NuGet.config diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 40893d0..0000000 --- a/NuGet.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file From 8d9607e9ef0f79ce5ae7aa3204631b38039b0b73 Mon Sep 17 00:00:00 2001 From: jburnett Date: Mon, 12 Apr 2021 15:27:26 -0400 Subject: [PATCH 3/6] Added publish NuGet pkgs script --- Publish-Release.ps1 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Publish-Release.ps1 diff --git a/Publish-Release.ps1 b/Publish-Release.ps1 new file mode 100644 index 0000000..faabc04 --- /dev/null +++ b/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 +} From 15eaaf5554ad8449e3790cc84f70c091e6ff578d Mon Sep 17 00:00:00 2001 From: jburnett Date: Mon, 12 Apr 2021 15:28:40 -0400 Subject: [PATCH 4/6] Added net5.0 support --- AMT.LinqExtensions/AMT.LinqExtensions.csproj | 11 ++++------- test/test.csproj | 7 ++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/AMT.LinqExtensions/AMT.LinqExtensions.csproj b/AMT.LinqExtensions/AMT.LinqExtensions.csproj index 5042844..8afcf2a 100644 --- a/AMT.LinqExtensions/AMT.LinqExtensions.csproj +++ b/AMT.LinqExtensions/AMT.LinqExtensions.csproj @@ -15,8 +15,8 @@ - A few LINQ Extensions which we find useful, and you may, too. - Supports .NET Core LTS versions 2.1, 3.1 + A few LINQ Extensions we find useful. + Supports .NET 5.0 and .NET Core LTS versions 2.1, 3.1 Apache-2.0 https://github.com/AltaModaTech/LINQExtensions LINQ @@ -28,11 +28,8 @@ .NET Core 2.1 (LTS) EOL 8/21/2021 .NET Core 1.1 EOL 6/27/2019 --> - - netstandard2.0;net461;net462;net47;net471;net472; - - - netstandard2.0 + + netstandard2.0;net5.0 diff --git a/test/test.csproj b/test/test.csproj index 7b0e644..9365474 100644 --- a/test/test.csproj +++ b/test/test.csproj @@ -12,11 +12,8 @@ .NET Core 2.1 (LTS) EOL 8/21/2021 .NET Core 1.1 EOL 6/27/2019 --> - - netcoreapp3.1;netcoreapp2.1;net461;net462;net47;net471;net472; - - - netcoreapp3.1;netcoreapp2.1 + + netcoreapp3.1;netcoreapp2.1;net5.0 From 4fc0b6a39775ec10b65964dca886fdd828d8bccc Mon Sep 17 00:00:00 2001 From: jburnett Date: Mon, 12 Apr 2021 15:29:06 -0400 Subject: [PATCH 5/6] Upgrade version to 3.0 --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 5310f34..198de14 100644 --- a/common.props +++ b/common.props @@ -10,7 +10,7 @@ - 2.3.0 + 3.0.0 true true From 3e67d27ce020146a582e65e819eb014703e782e8 Mon Sep 17 00:00:00 2001 From: jburnett Date: Mon, 12 Apr 2021 15:43:21 -0400 Subject: [PATCH 6/6] Add build GitHub action --- .github/workflows/dotnet-core.yml | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/dotnet-core.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml new file mode 100644 index 0000000..c1ae67c --- /dev/null +++ b/.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