Skip to content
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

Create packages v1.0.77 #77

Merged
merged 5 commits into from
Nov 17, 2024
Merged

Create packages v1.0.77 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e5fd36
Fix typo
DenisPav Oct 14, 2024
a950c3d
Bump project version to 1.0.76
Ooze Oct 27, 2024
a193a61
Update package references, update README, update GH workflows
DenisPav Nov 17, 2024
a07007e
Merge branch 'master' of https://github.com/DenisPav/Ooze
DenisPav Nov 17, 2024
d0cccab
Bump project version to 1.0.77
Ooze Nov 17, 2024
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
3 changes: 1 addition & 2 deletions .github/workflows/bump_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
9.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/create_package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
9.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
7 changes: 3 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Ooze.Typed 🌳💧🔧
[![Nuget](https://img.shields.io/nuget/v/Ooze.Typed)](https://www.nuget.org/packages/Ooze.Typed/)
![framework](https://img.shields.io/badge/framework-.net%206.0-green)
![framework](https://img.shields.io/badge/framework-.net%207.0-green)
![framework](https://img.shields.io/badge/framework-.net%208.0-green)
![framework](https://img.shields.io/badge/framework-.net%209.0-green)
![GitHub Repo stars](https://img.shields.io/github/stars/DenisPav/Ooze)
![Nuget](https://img.shields.io/nuget/dt/Ooze.Typed)

Expand All @@ -16,8 +15,8 @@ Except base `Ooze.Typed` package there are few more that add additional filter e
- [Ooze.Typed.EntityFrameworkCore](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore/)
- [Ooze.Typed.EntityFrameworkCore.Sqlite](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.Sqlite/)
- [Ooze.Typed.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.SqlServer/)
- [Ooze.Typed.EntityFrameworkCore.Npgsql](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.Npgsql/)
- [Ooze.Typed.EntityFrameworkCore.MySql](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.MySql/)
- [Ooze.Typed.EntityFrameworkCore.Npgsql](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.Npgsql/) (.net 9 not yet supported)
- [Ooze.Typed.EntityFrameworkCore.MySql](https://www.nuget.org/packages/Ooze.Typed.EntityFrameworkCore.MySql/) (.net 9 not yet supported)

These packages provide additional provider specific `EF` extensions to the filter builder pipeline.

Expand Down
7 changes: 2 additions & 5 deletions src/Ooze.Typed.EntityFrameworkCore.MySql/Ooze.Typed.EntityFrameworkCore.MySql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed.EntityFrameworkCore.MySql</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries. Contains additional extensions for MySql/MariaDB.
Expand Down Expand Up @@ -32,9 +32,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
Expand Down
7 changes: 2 additions & 5 deletions src/Ooze.Typed.EntityFrameworkCore.Npgsql/Ooze.Typed.EntityFrameworkCore.Npgsql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed.EntityFrameworkCore.Npgsql</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries. Contains additional extensions for PostgreSQL.
Expand Down Expand Up @@ -33,9 +33,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
Expand Down
10 changes: 5 additions & 5 deletions src/Ooze.Typed.EntityFrameworkCore.SqlServer/Ooze.Typed.EntityFrameworkCore.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed.EntityFrameworkCore.SqlServer</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries. Contains additional extensions for Sql Server.
Expand All @@ -30,10 +30,10 @@
<ProjectReference Include="..\Ooze.Typed.EntityFrameworkCore\Ooze.Typed.EntityFrameworkCore.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
Expand Down
10 changes: 5 additions & 5 deletions src/Ooze.Typed.EntityFrameworkCore.Sqlite/Ooze.Typed.EntityFrameworkCore.Sqlite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed.EntityFrameworkCore.Sqlite</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries. Contains additional extensions for Sqlite.
Expand All @@ -31,10 +31,10 @@
</Compile>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
Expand Down
15 changes: 6 additions & 9 deletions src/Ooze.Typed.EntityFrameworkCore/Ooze.Typed.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed.EntityFrameworkCore</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries. Contains additional extensions for EF core
Expand All @@ -26,14 +26,11 @@
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\LICENSE.MD" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Ooze.Typed\Expressions\BasicExpressions.cs">
Expand Down
8 changes: 4 additions & 4 deletions src/Ooze.Typed/Ooze.Typed.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>Ooze.Typed</PackageId>
<Version>1.0.75</Version>
<Version>1.0.77</Version>
<RepositoryUrl>https://github.com/DenisPav/Ooze</RepositoryUrl>
<Description>
This package provides simple mechanism for applying filters, sorters, paging to your IQueryable queries.
Expand All @@ -20,8 +20,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\LICENSE.MD" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/Ooze.Typed.Tests.MySql/MySqlFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Ooze.Typed.Tests.MySql;

public class MySqlFixture : IAsyncLifetime
{
private readonly MariaDbContainer _sqlServerContainer = new MariaDbBuilder()
private readonly MariaDbContainer _mariaDbContainer = new MariaDbBuilder()
.WithImage("mariadb:10.9")
.WithCleanUp(true)
.Build();
Expand All @@ -32,7 +32,7 @@ private static IServiceCollection CreateServiceCollection<TProvider>(bool enable

public MySqlContext CreateContext()
{
var correctConnectionString = _sqlServerContainer.GetConnectionString();
var correctConnectionString = _mariaDbContainer.GetConnectionString();
var serverVersion = ServerVersion.Create(new Version("10.9"), ServerType.MariaDb);
var sqlServerOptions = new DbContextOptionsBuilder()
.UseMySql(correctConnectionString, serverVersion);
Expand All @@ -41,7 +41,7 @@ public MySqlContext CreateContext()

public async Task InitializeAsync()
{
await _sqlServerContainer.StartAsync()
await _mariaDbContainer.StartAsync()
.ConfigureAwait(false);
await using var context = CreateContext();
await context.Database.EnsureCreatedAsync();
Expand All @@ -50,7 +50,7 @@ await _sqlServerContainer.StartAsync()

public async Task DisposeAsync()
{
await _sqlServerContainer
await _mariaDbContainer
.DisposeAsync()
.ConfigureAwait(false);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Ooze.Typed.Tests.MySql/Ooze.Typed.Tests.MySql.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>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
8 changes: 4 additions & 4 deletions tests/Ooze.Typed.Tests.Npgsql/NpgsqlFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Ooze.Typed.Tests.Npgsql;

public class NpgsqlFixture : IAsyncLifetime
{
private readonly PostgreSqlContainer _sqlServerContainer = new PostgreSqlBuilder()
private readonly PostgreSqlContainer _postgreContainer = new PostgreSqlBuilder()
.WithImage("postgres:15.1")
.WithPortBinding(5432, true)
.WithCleanUp(true)
Expand All @@ -33,15 +33,15 @@ private static IServiceCollection CreateServiceCollection<TProvider>(bool enable

public NpgsqlContext CreateContext()
{
var correctConnectionString = _sqlServerContainer.GetConnectionString();
var correctConnectionString = _postgreContainer.GetConnectionString();
var sqlServerOptions = new DbContextOptionsBuilder()
.UseNpgsql(correctConnectionString);
return new NpgsqlContext(sqlServerOptions.Options);
}

public async Task InitializeAsync()
{
await _sqlServerContainer.StartAsync()
await _postgreContainer.StartAsync()
.ConfigureAwait(false);
await using var context = CreateContext();
await context.Database.EnsureCreatedAsync();
Expand All @@ -51,7 +51,7 @@ await _sqlServerContainer.StartAsync()

public async Task DisposeAsync()
{
await _sqlServerContainer
await _postgreContainer
.DisposeAsync()
.ConfigureAwait(false);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Ooze.Typed.Tests.Npgsql/Ooze.Typed.Tests.Npgsql.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>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
2 changes: 1 addition & 1 deletion tests/Ooze.Typed.Tests.SqlServer/Ooze.Typed.Tests.SqlServer.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>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
2 changes: 1 addition & 1 deletion tests/Ooze.Typed.Tests/Ooze.Typed.Tests.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>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
8 changes: 4 additions & 4 deletions tests/Ooze.Typed.Web/Ooze.Typed.Web.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.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand All @@ -16,9 +16,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading