From a78692fb384ae9870b77ee9744ab350aef1e970f Mon Sep 17 00:00:00 2001 From: Christiaan Rakowski Date: Mon, 22 Jul 2024 20:44:40 +0200 Subject: [PATCH 1/4] Updated TargetFrameworks to remove old unsupported ones --- Directory.Build.props | 4 ++-- LICENSE | 2 +- README.md | 3 +++ src/CSRakowski.Parallel/CSRakowski.Parallel.csproj | 8 ++++---- .../CSRakowski.Parallel.Benchmarks.csproj | 2 +- .../CSRakowski.Parallel.Tests.csproj | 9 +-------- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3c6752f..04e87ac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ Christiaan Rakowski - Christiaan Rakowski - 2017-2023 - 1.7.2 + Christiaan Rakowski - 2017-2024 + 1.8.0 latest diff --git a/LICENSE b/LICENSE index 673c21c..23a73b0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2023 Christiaan Rakowski +Copyright (c) 2017-2024 Christiaan Rakowski 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/README.md b/README.md index 4982968..89769c7 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,9 @@ await foreach (var result in resultStream) # Release notes +### 1.8.0 +* Updated TargetFrameworks to remove old unsupported ones. + ### 1.7.2 * First attempt at enabling SourceLink. diff --git a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj index 3c9bb8d..b214817 100644 --- a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj +++ b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj @@ -1,7 +1,7 @@  - net472;net452;net60;net50;netstandard2.1;netstandard2.0;netstandard1.1 + net472;net60;netstandard2.1;netstandard2.0;netstandard1.1 true CSRakowski.ParallelAsync @@ -15,7 +15,7 @@ Parallel, Async, Batching true CSRakowski.Parallel.snk - * First attempt at enabling SourceLink. + * Updated TargetFrameworks to remove old unsupported ones. CSRakowski.Parallel CSRakowski.Parallel @@ -26,10 +26,10 @@ - + - + diff --git a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj index 9403d4b..1fdf436 100644 --- a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj +++ b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj @@ -1,7 +1,7 @@ - net48;net472;net80;net60;net50;netcoreapp3.1; + net48;net472;net80;net60; Exe false diff --git a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj index 2c9203f..9b9243b 100644 --- a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj +++ b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj @@ -1,7 +1,7 @@ - net48;net472;net452;net80;net60;net50;netcoreapp3.1; + net48;net472;net80;net60; false true @@ -20,13 +20,6 @@ - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive From a147db3514847130d83bfc0475045c07ac87fb55 Mon Sep 17 00:00:00 2001 From: Christiaan Rakowski Date: Fri, 30 May 2025 20:22:36 +0200 Subject: [PATCH 2/4] Updated TargetFrameworks --- src/CSRakowski.Parallel/CSRakowski.Parallel.csproj | 2 +- .../CSRakowski.Parallel.Benchmarks.csproj | 2 +- .../CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj index b214817..56c8659 100644 --- a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj +++ b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj @@ -1,7 +1,7 @@  - net472;net60;netstandard2.1;netstandard2.0;netstandard1.1 + net472;net80;net60;netstandard2.1;netstandard2.0;netstandard1.1 true CSRakowski.ParallelAsync diff --git a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj index 1fdf436..a300aae 100644 --- a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj +++ b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj @@ -1,7 +1,7 @@ - net48;net472;net80;net60; + net48;net472;net90;net80;net60; Exe false diff --git a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj index 9b9243b..c72580a 100644 --- a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj +++ b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj @@ -1,7 +1,7 @@ - net48;net472;net80;net60; + net48;net472;net90;net80;net60; false true From 121a925e35bac4a997a5fe30ced8ae0f99696c99 Mon Sep 17 00:00:00 2001 From: Christiaan Rakowski Date: Fri, 30 May 2025 20:33:22 +0200 Subject: [PATCH 3/4] Updated dependencies --- .../CSRakowski.Parallel.Benchmarks.csproj | 4 ++-- .../CSRakowski.Parallel.Tests.csproj | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj index a300aae..f45333b 100644 --- a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj +++ b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj @@ -10,12 +10,12 @@ - + - + diff --git a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj index c72580a..53056e4 100644 --- a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj +++ b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj @@ -1,7 +1,7 @@ - net48;net472;net90;net80;net60; + net48;net472;net90;net80;net60 false true @@ -11,20 +11,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all + From 679ee77771f9a194f69de326a61223cd1ea03e4a Mon Sep 17 00:00:00 2001 From: Christiaan Rakowski Date: Sun, 1 Jun 2025 21:41:57 +0200 Subject: [PATCH 4/4] Updated against latest version of CSRakowski.AsyncStreamsPreparations --- .github/workflows/dotnetcore.yml | 31 ++++++++----------- CSRakowski.ParallelAsync.sln | 1 + Directory.Build.props | 2 +- LICENSE | 2 +- global.json | 6 ++++ .../CSRakowski.Parallel.csproj | 4 +-- .../CSRakowski.Parallel.Benchmarks.csproj | 2 +- .../CSRakowski.Parallel.Tests.csproj | 4 +-- 8 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index c007085..8d43762 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -11,32 +11,27 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: ['netcoreapp3.1', 'net50', 'net60', 'net80'] + framework: ['net60', 'net80', 'net90'] steps: - name: Check out code onto host uses: actions/checkout@v4 - - name: Setup .Net 3.1 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '3.1.x' # SDK Version to use. - - - name: Setup .Net 5.0 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '5.0.x' # SDK Version to use. - - name: Setup .Net 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' # SDK Version to use. - name: Setup .Net 8.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' # SDK Version to use. + - name: Setup .Net 9.0 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.x' # SDK Version to use. + - name: Dotnet info run: | dotnet --version @@ -63,7 +58,7 @@ jobs: if: matrix.framework == 'net80' - name: Upload dotnet test results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dotnet-results-${{ matrix.os }}-${{ matrix.framework }} path: TestResults-${{ matrix.os }}-${{ matrix.framework }} @@ -71,7 +66,7 @@ jobs: if: ${{ always() }} - name: Upload BenchmarkDotNet results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: BenchmarkDotNet-${{ matrix.os }}-${{ matrix.framework }} path: BenchmarkDotNet.Artifacts @@ -85,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - framework: ['net45', 'net472', 'net48'] + framework: ['net472', 'net48'] steps: - name: Check out code onto host @@ -95,7 +90,7 @@ jobs: uses: microsoft/setup-msbuild@v1.3.1 - name: Setup .Net 8.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' # SDK Version to use. @@ -119,7 +114,7 @@ jobs: dotnet test --no-restore --configuration Release --verbosity normal --framework=${{ matrix.framework }} --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.framework }}" - name: Upload dotnet test results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dotnet-results-windows-latest-${{ matrix.framework }} path: TestResults-windows-latest-${{ matrix.framework }} diff --git a/CSRakowski.ParallelAsync.sln b/CSRakowski.ParallelAsync.sln index b216b8b..afa2e83 100644 --- a/CSRakowski.ParallelAsync.sln +++ b/CSRakowski.ParallelAsync.sln @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt ProjectSection(SolutionItems) = preProject .gitignore = .gitignore Directory.Build.props = Directory.Build.props + global.json = global.json LICENSE = LICENSE README.md = README.md EndProjectSection diff --git a/Directory.Build.props b/Directory.Build.props index 04e87ac..2da10ef 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ Christiaan Rakowski - Christiaan Rakowski - 2017-2024 + Christiaan Rakowski - 2017-2025 1.8.0 latest diff --git a/LICENSE b/LICENSE index 23a73b0..b89b8de 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2024 Christiaan Rakowski +Copyright (c) 2017-2025 Christiaan Rakowski 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/global.json b/global.json new file mode 100644 index 0000000..3a93eb1 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + //"version": "9.0.300", + "rollForward": "latestFeature" + } +} \ No newline at end of file diff --git a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj index 56c8659..7ac3cac 100644 --- a/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj +++ b/src/CSRakowski.Parallel/CSRakowski.Parallel.csproj @@ -28,9 +28,9 @@ - + - + diff --git a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj index f45333b..7fae4b4 100644 --- a/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj +++ b/tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj @@ -11,7 +11,7 @@ - + diff --git a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj index 53056e4..2404353 100644 --- a/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj +++ b/tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj @@ -13,7 +13,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -21,7 +21,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - +