Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<PropertyGroup>

<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>

<!-- For .NET 9 -->
<LangVersion>13.0</LangVersion>
<!-- For .NET 10 -->
<LangVersion>14.0</LangVersion>

<!-- NuGet -->
<Version>4.6.1</Version>
<Version>4.6.2</Version>
<AssemblyVersion>4.6.0</AssemblyVersion>
<FileVersion>4.6.0</FileVersion>
<Authors>Jon Sagara</Authors>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.305",
"version": "10.0.100-rc.1.25451.107",
"rollForward": "latestPatch"
}
}
2 changes: 1 addition & 1 deletion src/Sagara.Core.Benchmarks/Sagara.Core.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AnalysisMode>None</AnalysisMode>
Expand Down
5 changes: 5 additions & 0 deletions src/Sagara.Core.Caching/Sagara.Core.Caching.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.9.25" />
</ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/Sagara.Core.Data/Sagara.Core.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Sagara.Core\Sagara.Core.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="4.3.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Sagara.Core.Tests/Sagara.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AnalysisMode>None</AnalysisMode>
Expand Down
18 changes: 18 additions & 0 deletions src/Sagara.Core/Extensions/StringComparerExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System.Globalization;

namespace Sagara.Core.Extensions;

public static class StringComparerExtensions
{
#if NET10_0_OR_GREATER
extension(StringComparer)

Check warning on line 8 in src/Sagara.Core/Extensions/StringComparerExtensions.cs

View workflow job for this annotation

GitHub Actions / run_test

Do not nest type . Alternatively, change its accessibility so that it is not externally visible. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1034)

Check warning on line 8 in src/Sagara.Core/Extensions/StringComparerExtensions.cs

View workflow job for this annotation

GitHub Actions / pack_nuget

Do not nest type . Alternatively, change its accessibility so that it is not externally visible. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1034)
{

public static StringComparer Numeric
=> StringComparer.Create(CultureInfo.CurrentCulture, CompareOptions.NumericOrdering);

public static StringComparer NumericIgnoreCase
=> StringComparer.Create(CultureInfo.CurrentCulture, CompareOptions.NumericOrdering | CompareOptions.IgnoreCase);
}
#endif
}
7 changes: 7 additions & 0 deletions src/Sagara.Core/Sagara.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
<PackageReference Include="System.Text.Json" Version="9.0.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Text.Json" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
<Compile Update="Resources\Strings.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down
Loading