Skip to content

Commit 4ea7b46

Browse files
author
pmosk
committed
Use .NET10. Use slnx
1 parent 125bf1d commit 4ea7b46

8 files changed

Lines changed: 56 additions & 67 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,43 @@ on:
44
push:
55
branches: [ main, dev, feature/*, fix/*, release/* ]
66

7-
pull_request:
8-
branches: [ main ]
9-
107
release:
118
types: [ published ]
12-
branches: [ main ]
139

1410
jobs:
1511
build:
1612

1713
runs-on: ubuntu-latest
1814

1915
steps:
20-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
2117
- name: Setup .NET
22-
uses: actions/setup-dotnet@v4
18+
uses: actions/setup-dotnet@v5
2319
with:
2420
dotnet-version: |
25-
8.0.x
26-
9.0.x
27-
28-
# Create Local NuGet Source
21+
10.0.x
22+
# dotnet-quality: 'preview' # When using preview versions
23+
dotnet-quality: 'ga' # General Availability
2924

3025
- name: Create Local NuGet Directory
3126
run: mkdir ~/nuget
3227

33-
- name: Add Local Nuget Source
34-
run: dotnet nuget add source ~/nuget
35-
36-
# FlatArray
37-
38-
- name: Restore FlatArray
39-
run: dotnet restore ./src/*/*/FlatArray.csproj
40-
41-
- name: Build FlatArray
42-
run: dotnet build ./src/*/*/FlatArray.csproj --no-restore -c Release
43-
44-
- name: Pack FlatArray
45-
run: dotnet pack ./src/*/*/FlatArray.csproj --no-restore -o ~/nuget -c Release
46-
47-
- name: Restore FlatArray.Tests
48-
run: dotnet restore ./src/*/*/FlatArray.Tests.csproj
49-
50-
- name: Test FlatArray.Tests
51-
run: dotnet test ./src/*/*/FlatArray.Tests.csproj --no-restore -c Release
52-
53-
# FlatCollections
54-
55-
- name: Restore FlatCollections
56-
run: dotnet restore ./src/*/*/FlatCollections.csproj
28+
- name: Restore solution
29+
run: dotnet restore src/Core.FlatCollections.slnx
5730

58-
- name: Build FlatCollections
59-
run: dotnet build ./src/*/*/FlatCollections.csproj --no-restore -c Release
31+
- name: Build solution
32+
run: dotnet build src/Core.FlatCollections.slnx --no-restore -c Release
6033

61-
- name: Pack FlatCollections
62-
run: dotnet pack ./src/*/*/FlatCollections.csproj --no-restore -o ~/nuget -c Release
34+
- name: Test solution
35+
run: dotnet test src/Core.FlatCollections.slnx --no-restore -c Release
6336

64-
# Push
37+
- name: Pack solution
38+
run: dotnet pack src/Core.FlatCollections.slnx --no-restore -o ~/nuget -c Release
6539

6640
- name: Push Packages
6741
if: ${{ github.event_name == 'release' }}
6842
run: >
6943
dotnet nuget push "../../../nuget/*.nupkg"
7044
-s https://api.nuget.org/v3/index.json
7145
-k ${{ secrets.NuGetSourcePassword }}
72-
--skip-duplicate
46+
--skip-duplicate

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022-2025 Andrei Sergeev, Pavel Moskovoy
3+
Copyright (c) 2022-2026 Andrei Sergeev, Pavel Moskovoy
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎src/Core.FlatCollections.slnx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Solution>
2+
<Folder Name="/.sln/">
3+
<File Path="../.github/workflows/dotnet.yml" />
4+
<File Path="../LICENSE" />
5+
<File Path="../.gitignore" />
6+
<File Path="../README.md" />
7+
</Folder>
8+
<Folder Name="/flatcollections-array/">
9+
<Project Path="flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj" />
10+
<Project Path="flatcollections-array/FlatArray/FlatArray.csproj" />
11+
</Folder>
12+
<Folder Name="/flatcollections/">
13+
<Project Path="flatcollections/FlatCollections/FlatCollections.csproj" />
14+
</Folder>
15+
</Solution>

‎src/flatcollections-array/FlatArray.Tests/FlatArray.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<InvariantGlobalization>true</InvariantGlobalization>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
<NoWarn>$(NoWarn);IDE0130</NoWarn>
10+
<NoWarn>$(NoWarn);CA1861;IDE0130;xUnit1046</NoWarn>
1111
<IsPackable>false</IsPackable>
1212
<IsTestProject>true</IsTestProject>
1313
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
14-
<Copyright>Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy</Copyright>
14+
<Copyright>Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy</Copyright>
1515
<RootNamespace>PrimeFuncPack.Core.Tests</RootNamespace>
1616
<AssemblyName>PrimeFuncPack.Core.FlatArray.Tests</AssemblyName>
1717
</PropertyGroup>
@@ -21,17 +21,17 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="coverlet.collector" Version="6.0.3">
24+
<PackageReference Include="coverlet.collector" Version="10.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
29-
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.1" />
30-
<PackageReference Include="xunit" Version="2.9.3" />
31-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
28+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.0" />
29+
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.2" />
30+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
3231
<PrivateAssets>all</PrivateAssets>
3332
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3433
</PackageReference>
34+
<PackageReference Include="xunit.v3" Version="3.2.2" />
3535
</ItemGroup>
3636

37-
</Project>
37+
</Project>

‎src/flatcollections-array/FlatArray.Tests/TestData/JsonSerializerTestSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static TheoryData<JsonSerializerOptions?> JsonSerializerOptionsTestData
1111
new()
1212
{
1313
{
14-
null
14+
new(null)
1515
},
1616
{
1717
new JsonSerializerOptions()

‎src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Cast/CanCastArray.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static TheoryData<FlatArray<byte>> CanCastArray_ValueType_TypeTheSame_Exp
2020
new()
2121
{
2222
{
23-
default
23+
new(default)
2424
},
2525
{
2626
new byte[] { 1 }.InitializeFlatArray()
@@ -43,7 +43,7 @@ public static TheoryData<FlatArray<byte>> CanCastArray_ValueType_TypeCompatible_
4343
new()
4444
{
4545
{
46-
default
46+
new(default)
4747
},
4848
{
4949
new byte[] { 1 }.InitializeFlatArray()
@@ -66,7 +66,7 @@ public static TheoryData<FlatArray<byte>> CanCastArray_ValueType_TypeIncompatibl
6666
new()
6767
{
6868
{
69-
default
69+
new(default)
7070
},
7171
{
7272
new byte[] { 1 }.InitializeFlatArray()
@@ -91,7 +91,7 @@ public static TheoryData<FlatArray<string>> CanCastArray_RefType_TypeTheSame_Exp
9191
new()
9292
{
9393
{
94-
default
94+
new(default)
9595
},
9696
{
9797
new[] { "1" }.InitializeFlatArray()
@@ -117,7 +117,7 @@ public static TheoryData<FlatArray<string>> CanCastArray_RefType_TypeCompatible_
117117
new()
118118
{
119119
{
120-
default
120+
new(default)
121121
},
122122
{
123123
new[] { "1" }.InitializeFlatArray()
@@ -143,7 +143,7 @@ public static TheoryData<FlatArray<object>> CanCastArray_RefType_TypeIncompatibl
143143
new()
144144
{
145145
{
146-
default
146+
new(default)
147147
},
148148
{
149149
new[] { new object() }.InitializeFlatArray()
@@ -155,4 +155,4 @@ public static TheoryData<FlatArray<object>> CanCastArray_RefType_TypeIncompatibl
155155
new[] { null!, new object(), new object() }.InitializeFlatArray()
156156
}
157157
};
158-
}
158+
}

‎src/flatcollections-array/FlatArray/FlatArray.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>enable</Nullable>
@@ -15,11 +15,11 @@
1515
<RepositoryUrl>https://github.com/pfpack/pfpack-core-flatcollections</RepositoryUrl>
1616
<Company>pfpack</Company>
1717
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
18-
<Copyright>Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy</Copyright>
18+
<Copyright>Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy</Copyright>
1919
<Description>PrimeFuncPack Core.FlatArray is a core library for .NET consisting of immutable FlatArray targeted for use in functional programming.</Description>
2020
<RootNamespace>System</RootNamespace>
2121
<AssemblyName>PrimeFuncPack.Core.FlatArray</AssemblyName>
22-
<Version>1.5.1</Version>
22+
<Version>1.5.2-preview.1</Version>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
@@ -33,4 +33,4 @@
3333
</None>
3434
</ItemGroup>
3535

36-
</Project>
36+
</Project>

‎src/flatcollections/FlatCollections/FlatCollections.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>enable</Nullable>
@@ -15,11 +15,11 @@
1515
<RepositoryUrl>https://github.com/pfpack/pfpack-core-flatcollections</RepositoryUrl>
1616
<Company>pfpack</Company>
1717
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
18-
<Copyright>Copyright © 2022-2025 Andrei Sergeev, Pavel Moskovoy</Copyright>
18+
<Copyright>Copyright © 2022-2026 Andrei Sergeev, Pavel Moskovoy</Copyright>
1919
<Description>PrimeFuncPack Core.FlatCollections is a set of immutable Flat collections for .NET designed for developing business applications based on functional programming.</Description>
2020
<RootNamespace>System</RootNamespace>
2121
<AssemblyName>PrimeFuncPack.Core.FlatCollections</AssemblyName>
22-
<Version>1.5.1</Version>
22+
<Version>1.5.2-preview.1</Version>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.5.1" />
37+
<ProjectReference Include="../../flatcollections-array/FlatArray/FlatArray.csproj" />
3838
</ItemGroup>
3939

40-
</Project>
40+
</Project>

0 commit comments

Comments
 (0)