From d51be45d278c2e3aa285083ba0eb1d7c8451987b Mon Sep 17 00:00:00 2001 From: Andrei Sergeev Date: Wed, 6 Dec 2023 21:00:20 +0400 Subject: [PATCH] v2.0.1-rc.1: add net8.0 target --- .github/workflows/dotnet.yml | 17 ++++++++++------ .gitignore | 20 ++++++++++++++----- LICENSE | 2 +- .../Func.Abstractions.Async.csproj | 6 +++--- .../Func.Abstractions.AsyncValue.csproj | 6 +++--- .../Func.Abstractions.Sync.csproj | 6 +++--- .../Func.Abstractions.csproj | 12 +++++------ ...ensions.Async.Tests.DefCancellation.csproj | 14 ++++++------- ...Func.Extensions.Async.Tests.Primary.csproj | 14 ++++++------- .../Func.Extensions.Async.csproj | 8 ++++---- ...ns.AsyncValue.Tests.DefCancellation.csproj | 14 ++++++------- ...Extensions.AsyncValue.Tests.Primary.csproj | 14 ++++++------- .../Func.Extensions.AsyncValue.csproj | 8 ++++---- .../Func.Extensions.Sync.Tests.csproj | 12 +++++------ .../Func.Extensions.Sync.csproj | 8 ++++---- .../Func.Extensions/Func.Extensions.csproj | 18 ++++++++--------- 16 files changed, 97 insertions(+), 82 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 180ef85..03addbe 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,7 +2,7 @@ name: .NET on: push: - branches: [ main, dev, dev/*, feature/*, fix/*, release/* ] + branches: [ main, dev, feature/*, fix/*, release/* ] pull_request: branches: [ main ] @@ -17,12 +17,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x - include-prerelease: false + dotnet-version: | + 6.0.x + 8.0.x # Create Local NuGet Source @@ -154,4 +155,8 @@ jobs: - name: Push Packages if: ${{ github.event_name == 'release' }} - run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate + run: > + dotnet nuget push "../../../nuget/*.nupkg" + -s https://api.nuget.org/v3/index.json + -k ${{ secrets.NuGetSourcePassword }} + --skip-duplicate diff --git a/.gitignore b/.gitignore index 26ab8f4..8a30d25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -206,9 +206,6 @@ PublishScripts/ *.nuget.props *.nuget.targets -# Nuget personal access tokens and Credentials -# nuget.config - # Microsoft Azure Build Output csx/ *.build.csdef @@ -297,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -353,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -384,5 +395,4 @@ FodyWeavers.xsd *.msp # JetBrains Rider -.idea/ *.sln.iml diff --git a/LICENSE b/LICENSE index 1bf22b8..64bdac4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2021 Andrei Sergeev, Pavel Moskovoy +Copyright (c) 2020-2023 Andrei Sergeev, Pavel Moskovoy Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/core-func-abs-async/Func.Abstractions.Async/Func.Abstractions.Async.csproj b/src/core-func-abs-async/Func.Abstractions.Async/Func.Abstractions.Async.csproj index ebf7016..3d875f9 100644 --- a/src/core-func-abs-async/Func.Abstractions.Async/Func.Abstractions.Async.csproj +++ b/src/core-func-abs-async/Func.Abstractions.Async/Func.Abstractions.Async.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Abstractions.Async is a core library for .NET consisting of IAsyncFunc asynchronous Task based functional interfaces (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Abstractions.Async - 2.0.0 + 2.0.1-rc.1 diff --git a/src/core-func-abs-asyncvalue/Func.Abstractions.AsyncValue/Func.Abstractions.AsyncValue.csproj b/src/core-func-abs-asyncvalue/Func.Abstractions.AsyncValue/Func.Abstractions.AsyncValue.csproj index 388e79d..a244682 100644 --- a/src/core-func-abs-asyncvalue/Func.Abstractions.AsyncValue/Func.Abstractions.AsyncValue.csproj +++ b/src/core-func-abs-asyncvalue/Func.Abstractions.AsyncValue/Func.Abstractions.AsyncValue.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Abstractions.AsyncValue is a core library for .NET consisting of IAsyncValueFunc asynchronous ValueTask based functional interfaces (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Abstractions.AsyncValue - 2.0.0 + 2.0.1-rc.1 diff --git a/src/core-func-abs-sync/Func.Abstractions.Sync/Func.Abstractions.Sync.csproj b/src/core-func-abs-sync/Func.Abstractions.Sync/Func.Abstractions.Sync.csproj index 67b5b89..541eef2 100644 --- a/src/core-func-abs-sync/Func.Abstractions.Sync/Func.Abstractions.Sync.csproj +++ b/src/core-func-abs-sync/Func.Abstractions.Sync/Func.Abstractions.Sync.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Abstractions.Sync is a core library for .NET consisting of IFunc synchronous functional interfaces (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Abstractions.Sync - 2.0.0 + 2.0.1-rc.1 diff --git a/src/core-func-abs/Func.Abstractions/Func.Abstractions.csproj b/src/core-func-abs/Func.Abstractions/Func.Abstractions.csproj index 44bc6a1..b6323b8 100644 --- a/src/core-func-abs/Func.Abstractions/Func.Abstractions.csproj +++ b/src/core-func-abs/Func.Abstractions/Func.Abstractions.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Abstractions is a core library for .NET consisting of functional interfaces (SAM interfaces) targeted for use in functional programming - IAsyncFunc/IAsyncValueFunc and IFunc, both asynchronous (Task and ValueTask based) and synchronous. System PrimeFuncPack.Core.Func.Abstractions - 2.0.0 + 2.0.1-rc.1 @@ -32,9 +32,9 @@ - - - + + + diff --git a/src/core-func-ext-async/Func.Extensions.Async.Tests.DefCancellation/Func.Extensions.Async.Tests.DefCancellation.csproj b/src/core-func-ext-async/Func.Extensions.Async.Tests.DefCancellation/Func.Extensions.Async.Tests.DefCancellation.csproj index 3bf4e49..d2d12e0 100644 --- a/src/core-func-ext-async/Func.Extensions.Async.Tests.DefCancellation/Func.Extensions.Async.Tests.DefCancellation.csproj +++ b/src/core-func-ext-async/Func.Extensions.Async.Tests.DefCancellation/Func.Extensions.Async.Tests.DefCancellation.csproj @@ -1,27 +1,27 @@ - net6.0 + net6.0;net8.0 disable enable true true false Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.Core.Tests PrimeFuncPack.Core.Func.Extensions.Async.Tests.DefCancellation - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/core-func-ext-async/Func.Extensions.Async.Tests.Primary/Func.Extensions.Async.Tests.Primary.csproj b/src/core-func-ext-async/Func.Extensions.Async.Tests.Primary/Func.Extensions.Async.Tests.Primary.csproj index 7e431d6..8c02781 100644 --- a/src/core-func-ext-async/Func.Extensions.Async.Tests.Primary/Func.Extensions.Async.Tests.Primary.csproj +++ b/src/core-func-ext-async/Func.Extensions.Async.Tests.Primary/Func.Extensions.Async.Tests.Primary.csproj @@ -1,27 +1,27 @@ - net6.0 + net6.0;net8.0 disable enable true true false Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.Core.Tests PrimeFuncPack.Core.Func.Extensions.Async.Tests.Primary - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/core-func-ext-async/Func.Extensions.Async/Func.Extensions.Async.csproj b/src/core-func-ext-async/Func.Extensions.Async/Func.Extensions.Async.csproj index 8536af5..6e9edc6 100644 --- a/src/core-func-ext-async/Func.Extensions.Async/Func.Extensions.Async.csproj +++ b/src/core-func-ext-async/Func.Extensions.Async/Func.Extensions.Async.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Extensions.Async is a core library for .NET consisting of extensions for IAsyncFunc asynchronous Task based functional interface (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Extensions.Async - 2.0.0 + 2.0.1-rc.1 @@ -32,7 +32,7 @@ - + diff --git a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.DefCancellation/Func.Extensions.AsyncValue.Tests.DefCancellation.csproj b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.DefCancellation/Func.Extensions.AsyncValue.Tests.DefCancellation.csproj index 674b1d2..61cbc23 100644 --- a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.DefCancellation/Func.Extensions.AsyncValue.Tests.DefCancellation.csproj +++ b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.DefCancellation/Func.Extensions.AsyncValue.Tests.DefCancellation.csproj @@ -1,27 +1,27 @@ - net6.0 + net6.0;net8.0 disable enable true true false Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.Core.Tests PrimeFuncPack.Core.Func.Extensions.AsyncValue.Tests.DefCancellation - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.Primary/Func.Extensions.AsyncValue.Tests.Primary.csproj b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.Primary/Func.Extensions.AsyncValue.Tests.Primary.csproj index c4b6996..4f6ec35 100644 --- a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.Primary/Func.Extensions.AsyncValue.Tests.Primary.csproj +++ b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue.Tests.Primary/Func.Extensions.AsyncValue.Tests.Primary.csproj @@ -1,27 +1,27 @@ - net6.0 + net6.0;net8.0 disable enable true true false Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.Core.Tests PrimeFuncPack.Core.Func.Extensions.AsyncValue.Tests.Primary - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue/Func.Extensions.AsyncValue.csproj b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue/Func.Extensions.AsyncValue.csproj index fb58aca..5726d37 100644 --- a/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue/Func.Extensions.AsyncValue.csproj +++ b/src/core-func-ext-asyncvalue/Func.Extensions.AsyncValue/Func.Extensions.AsyncValue.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Extensions.AsyncValue is a core library for .NET consisting of extensions for IAsyncValueFunc asynchronous ValueTask based functional interface (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Extensions.AsyncValue - 2.0.0 + 2.0.1-rc.1 @@ -32,7 +32,7 @@ - + diff --git a/src/core-func-ext-sync/Func.Extensions.Sync.Tests/Func.Extensions.Sync.Tests.csproj b/src/core-func-ext-sync/Func.Extensions.Sync.Tests/Func.Extensions.Sync.Tests.csproj index bef1fca..3f90a95 100644 --- a/src/core-func-ext-sync/Func.Extensions.Sync.Tests/Func.Extensions.Sync.Tests.csproj +++ b/src/core-func-ext-sync/Func.Extensions.Sync.Tests/Func.Extensions.Sync.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -14,14 +14,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/core-func-ext-sync/Func.Extensions.Sync/Func.Extensions.Sync.csproj b/src/core-func-ext-sync/Func.Extensions.Sync/Func.Extensions.Sync.csproj index b3c73f0..521728a 100644 --- a/src/core-func-ext-sync/Func.Extensions.Sync/Func.Extensions.Sync.csproj +++ b/src/core-func-ext-sync/Func.Extensions.Sync/Func.Extensions.Sync.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Extensions.Sync is a core library for .NET consisting of extensions for IFunc synchronous functional interface (SAM interface) targeted for use in functional programming. System PrimeFuncPack.Core.Func.Extensions.Sync - 2.0.0 + 2.0.1-rc.1 @@ -32,7 +32,7 @@ - + diff --git a/src/core-func-ext/Func.Extensions/Func.Extensions.csproj b/src/core-func-ext/Func.Extensions/Func.Extensions.csproj index a174e0b..c1831f0 100644 --- a/src/core-func-ext/Func.Extensions/Func.Extensions.csproj +++ b/src/core-func-ext/Func.Extensions/Func.Extensions.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net8.0 disable enable true @@ -13,11 +13,11 @@ https://github.com/pfpack/pfpack-core-func pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy + Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.Func.Extensions is a core library for .NET consisting of extensions for functional interfaces (SAM interfaces) targeted for use in functional programming - IAsyncFunc/IAsyncValueFunc and IFunc, both asynchronous (Task and ValueTask based) and synchronous. System PrimeFuncPack.Core.Func.Extensions - 2.0.0 + 2.0.1-rc.1 @@ -32,12 +32,12 @@ - - - - - - + + + + + +