Skip to content

try to support .net 10 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DrLeh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

try to support .net 10 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/Nemo/Collections/EagerLoadEnumerableAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Nemo.Collections
{

internal class EagerLoadEnumerableAsync<T> : IAsyncEnumerable<T>
where T : class
{
Expand Down
4 changes: 2 additions & 2 deletions src/Nemo/Linq/NemoQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace Nemo.Linq
{
public class NemoQueryProvider : IAsyncQueryProvider, IQueryProvider
public class NemoQueryProvider : IQueryProvider
{
private readonly DbConnection _connection;
private readonly INemoConfiguration _config;
Expand Down Expand Up @@ -59,7 +59,7 @@ public object Execute(Expression expression)
return NemoQueryContext.Execute(expression, _connection, config: _config);
}

IAsyncQueryable<TElement> IAsyncQueryProvider.CreateQuery<TElement>(Expression expression)
public IAsyncEnumerable<TElement> CreateQuery<TElement>(Expression expression)
{
return new NemoQueryableAsync<TElement>(this, expression);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Nemo/Linq/NemoQueryableAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Nemo.Linq
{
public class NemoQueryableAsync<T> : IOrderedAsyncQueryable<T>
public class NemoQueryableAsync<T> : IAsyncEnumerable<T>
{
private readonly NemoQueryProvider _provider;
private readonly Expression _expression;
Expand Down
23 changes: 15 additions & 8 deletions src/Nemo/Nemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0;net10.0</TargetFrameworks>
<RestorePackages>true</RestorePackages>
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -11,9 +11,9 @@
<NeutralLanguage>en-US</NeutralLanguage>
<AssemblyName>Nemo</AssemblyName>
<AssemblyTitle>Nemo</AssemblyTitle>
<AssemblyVersion>2.9.1</AssemblyVersion>
<FileVersion>2.9.1</FileVersion>
<PackageVersion>2.9.1</PackageVersion>
<AssemblyVersion>2.10.0</AssemblyVersion>
<FileVersion>2.10.0</FileVersion>
<PackageVersion>2.10.0</PackageVersion>
<RootNamespace>Nemo</RootNamespace>

<PackageId>Nemo</PackageId>
Expand Down Expand Up @@ -46,19 +46,26 @@
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Interactive" Version="6.0.3" />
<PackageReference Include="System.Interactive.Async.Providers" Version="6.0.3" />
</ItemGroup>


<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net8.0'">
<!-- dotnet standard+ -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
</ItemGroup>

<!-- dotnet standard+, except .net 10 -->
<ItemGroup Condition="'$(TargetFramework)' != 'net10.0'">
<PackageReference Include="System.Interactive" Version="6.0.3" />
<PackageReference Include="System.Interactive.Async.Providers" Version="6.0.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
Expand Down
2 changes: 1 addition & 1 deletion tests/Nemo.Benchmark/Nemo.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Nemo.Test.Core/Nemo.Test.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>NemoTestCore</RootNamespace>
<AssemblyName>NemoTestCore</AssemblyName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Nemo.UnitTests/Nemo.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand Down