From 4ea7b4616c33d8c75c841ffce9ffe308207c4ad3 Mon Sep 17 00:00:00 2001 From: pmosk Date: Sat, 25 Apr 2026 12:33:26 +0300 Subject: [PATCH] Use .NET10. Use slnx --- .github/workflows/dotnet.yml | 54 +++++-------------- LICENSE | 2 +- src/Core.FlatCollections.slnx | 15 ++++++ .../FlatArray.Tests/FlatArray.Tests.csproj | 18 +++---- .../TestData/JsonSerializerTestSource.cs | 2 +- .../Tests.FlatArray.T/Cast/CanCastArray.cs | 14 ++--- .../FlatArray/FlatArray.csproj | 8 +-- .../FlatCollections/FlatCollections.csproj | 10 ++-- 8 files changed, 56 insertions(+), 67 deletions(-) create mode 100644 src/Core.FlatCollections.slnx diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d31a698..3d9b2f7 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -4,12 +4,8 @@ on: push: branches: [ main, dev, feature/*, fix/*, release/* ] - pull_request: - branches: [ main ] - release: types: [ published ] - branches: [ main ] jobs: build: @@ -17,51 +13,29 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0.x - 9.0.x - - # Create Local NuGet Source + 10.0.x + # dotnet-quality: 'preview' # When using preview versions + dotnet-quality: 'ga' # General Availability - name: Create Local NuGet Directory run: mkdir ~/nuget - - name: Add Local Nuget Source - run: dotnet nuget add source ~/nuget - - # FlatArray - - - name: Restore FlatArray - run: dotnet restore ./src/*/*/FlatArray.csproj - - - name: Build FlatArray - run: dotnet build ./src/*/*/FlatArray.csproj --no-restore -c Release - - - name: Pack FlatArray - run: dotnet pack ./src/*/*/FlatArray.csproj --no-restore -o ~/nuget -c Release - - - name: Restore FlatArray.Tests - run: dotnet restore ./src/*/*/FlatArray.Tests.csproj - - - name: Test FlatArray.Tests - run: dotnet test ./src/*/*/FlatArray.Tests.csproj --no-restore -c Release - - # FlatCollections - - - name: Restore FlatCollections - run: dotnet restore ./src/*/*/FlatCollections.csproj + - name: Restore solution + run: dotnet restore src/Core.FlatCollections.slnx - - name: Build FlatCollections - run: dotnet build ./src/*/*/FlatCollections.csproj --no-restore -c Release + - name: Build solution + run: dotnet build src/Core.FlatCollections.slnx --no-restore -c Release - - name: Pack FlatCollections - run: dotnet pack ./src/*/*/FlatCollections.csproj --no-restore -o ~/nuget -c Release + - name: Test solution + run: dotnet test src/Core.FlatCollections.slnx --no-restore -c Release - # Push + - name: Pack solution + run: dotnet pack src/Core.FlatCollections.slnx --no-restore -o ~/nuget -c Release - name: Push Packages if: ${{ github.event_name == 'release' }} @@ -69,4 +43,4 @@ jobs: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} - --skip-duplicate + --skip-duplicate \ No newline at end of file diff --git a/LICENSE b/LICENSE index c1eaf46..9d59a44 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022-2025 Andrei Sergeev, Pavel Moskovoy +Copyright (c) 2022-2026 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.FlatCollections.slnx b/src/Core.FlatCollections.slnx new file mode 100644 index 0000000..caf0fcf --- /dev/null +++ b/src/Core.FlatCollections.slnx @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj b/src/flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj index a964822..2b562be 100644 --- a/src/flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj +++ b/src/flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj @@ -1,17 +1,17 @@ - net8.0;net9.0 + net10.0 latest disable enable true true - $(NoWarn);IDE0130 + $(NoWarn);CA1861;IDE0130;xUnit1046 false true Andrei Sergeev, Pavel Moskovoy - Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy + Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack.Core.Tests PrimeFuncPack.Core.FlatArray.Tests @@ -21,17 +21,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + - + \ No newline at end of file diff --git a/src/flatcollections-array/FlatArray.Tests/TestData/JsonSerializerTestSource.cs b/src/flatcollections-array/FlatArray.Tests/TestData/JsonSerializerTestSource.cs index 5dff5f9..2dd5b80 100644 --- a/src/flatcollections-array/FlatArray.Tests/TestData/JsonSerializerTestSource.cs +++ b/src/flatcollections-array/FlatArray.Tests/TestData/JsonSerializerTestSource.cs @@ -11,7 +11,7 @@ public static TheoryData JsonSerializerOptionsTestData new() { { - null + new(null) }, { new JsonSerializerOptions() diff --git a/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Cast/CanCastArray.cs b/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Cast/CanCastArray.cs index 7ce55f7..77e9b61 100644 --- a/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Cast/CanCastArray.cs +++ b/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Cast/CanCastArray.cs @@ -20,7 +20,7 @@ public static TheoryData> CanCastArray_ValueType_TypeTheSame_Exp new() { { - default + new(default) }, { new byte[] { 1 }.InitializeFlatArray() @@ -43,7 +43,7 @@ public static TheoryData> CanCastArray_ValueType_TypeCompatible_ new() { { - default + new(default) }, { new byte[] { 1 }.InitializeFlatArray() @@ -66,7 +66,7 @@ public static TheoryData> CanCastArray_ValueType_TypeIncompatibl new() { { - default + new(default) }, { new byte[] { 1 }.InitializeFlatArray() @@ -91,7 +91,7 @@ public static TheoryData> CanCastArray_RefType_TypeTheSame_Exp new() { { - default + new(default) }, { new[] { "1" }.InitializeFlatArray() @@ -117,7 +117,7 @@ public static TheoryData> CanCastArray_RefType_TypeCompatible_ new() { { - default + new(default) }, { new[] { "1" }.InitializeFlatArray() @@ -143,7 +143,7 @@ public static TheoryData> CanCastArray_RefType_TypeIncompatibl new() { { - default + new(default) }, { new[] { new object() }.InitializeFlatArray() @@ -155,4 +155,4 @@ public static TheoryData> CanCastArray_RefType_TypeIncompatibl new[] { null!, new object(), new object() }.InitializeFlatArray() } }; -} +} \ No newline at end of file diff --git a/src/flatcollections-array/FlatArray/FlatArray.csproj b/src/flatcollections-array/FlatArray/FlatArray.csproj index da4e922..441adaf 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.csproj +++ b/src/flatcollections-array/FlatArray/FlatArray.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 latest disable enable @@ -15,11 +15,11 @@ https://github.com/pfpack/pfpack-core-flatcollections pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy + Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.FlatArray is a core library for .NET consisting of immutable FlatArray targeted for use in functional programming. System PrimeFuncPack.Core.FlatArray - 1.5.1 + 1.5.2-preview.1 @@ -33,4 +33,4 @@ - + \ No newline at end of file diff --git a/src/flatcollections/FlatCollections/FlatCollections.csproj b/src/flatcollections/FlatCollections/FlatCollections.csproj index dc148aa..365ae9c 100644 --- a/src/flatcollections/FlatCollections/FlatCollections.csproj +++ b/src/flatcollections/FlatCollections/FlatCollections.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 latest disable enable @@ -15,11 +15,11 @@ https://github.com/pfpack/pfpack-core-flatcollections pfpack Andrei Sergeev, Pavel Moskovoy - Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy + Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy PrimeFuncPack Core.FlatCollections is a set of immutable Flat collections for .NET designed for developing business applications based on functional programming. System PrimeFuncPack.Core.FlatCollections - 1.5.1 + 1.5.2-preview.1 @@ -34,7 +34,7 @@ - + - + \ No newline at end of file