Skip to content
This repository was archived by the owner on Apr 4, 2026. It is now read-only.
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 9.x
dotnet-version: 10.x
source-url: https://nuget.pkg.github.com/bpslogicbuilder/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
permissions:
contents: read
packages: write
id-token: write # enable GitHub OIDC token issuance for this job

jobs:
build:
Expand All @@ -21,19 +22,25 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 9.x
dotnet-version: 10.x
source-url: https://nuget.pkg.github.com/bpslogicbuilder/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: NuGet login
uses: NuGet/login@v1
id: nuget_login
with:
user: ${{ secrets.NUGET_USER }}

- name: Add Telerik Nuget source
run: dotnet nuget add source https://nuget.telerik.com/v3/index.json -n telerik -u ${{ secrets.TELERIK_USERNAME }} -p ${{ secrets.TELERIK_PASSWORD }}

- name: Set Variables
run: |
echo "GITHUB_NUGET_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "NUGET_URL=https://api.nuget.org/v3/index.json" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "NUGET_API_KEY=${{ secrets.NUGET_API_KEY }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "NUGET_API_KEY=${{ steps.nuget_login.outputs.NUGET_API_KEY }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "REPO=${{ github.repository }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
echo "REPO_OWNER=${{ github.repository_owner }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

Expand Down
4 changes: 2 additions & 2 deletions LogicBuilder.Data/LogicBuilder.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Authors>BlaiseD</Authors>
<Description>LogicBuilder.Data includes the base class for all data objects in the applications data stack.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>crud operations</PackageTags>
<Copyright>Copyright © BPS 2017</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions LogicBuilder.Domain/LogicBuilder.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Authors>BlaiseD</Authors>
<Description>LogicBuilder.Domain includes the base class for all DTOs in the data stack;</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>crud operations logic-builder</PackageTags>
<Copyright>Copyright © BPS 2017</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ private void Initialize()
{
if (MapperConfiguration == null)
{
MapperConfiguration = new MapperConfiguration(cfg =>
MapperConfiguration = ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private static void AssertFilterStringIsCorrect(Expression expression, string ex
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void UnionDescriptorWorks()
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();
cfg.AddProfile<ExpressionOperatorsMappingProfile>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7312,7 +7312,7 @@ Expression<Func<T, bool>> CreateFilter<T>()
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();
cfg.AddProfile<ExpressionOperatorsMappingProfile>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.OData.Edm" Version="8.2.2" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.OData.Edm" Version="8.4.3" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ Expression<Func<T, TReturn>> CreateExpression<T, TReturn>()
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();
cfg.AddProfile<ExpressionOperatorsMappingProfile>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<RootNamespace>LogicBuilder.EntityFrameworkCore.SqlServer</RootNamespace>
<PackageId>LogicBuilder.EntityFrameworkCore.SqlServer</PackageId>
<Authors>BlaiseD</Authors>
<Description>Given an EF Core DBContext, LogicBuilder.EntityFrameworkCore.SqlServer uses AutoMapper configurations to support CRUD operations using the DTO objects.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>crud operations efcore</PackageTags>
<Copyright>Copyright © BPS 2017</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -26,23 +26,27 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[7.0.2,8.0.0)" />
<PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[10.0.0,11.0.0)" />
<PackageReference Include="LogicBuilder.Data" Version="7.0.0" />
<PackageReference Include="LogicBuilder.Domain" Version="7.0.0" />
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="7.0.0" />
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.11" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<RootNamespace>LogicBuilder.Expressions.EntityFrameworkCore</RootNamespace>
<PackageId>LogicBuilder.Expressions.EntityFrameworkCore</PackageId>
<Authors>BlaiseD</Authors>
<Description>Augments LogicBuilder.Expressions.Utils with LINQ queries specific to EF Core.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>linq expressions efcore</PackageTags>
<Copyright>Copyright © BPS 2018</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -27,19 +27,24 @@

<ItemGroup>
<PackageReference Include="LogicBuilder.Expressions.Utils" Version="7.0.0" />
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />

</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.OData.Edm" Version="8.2.2" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.OData.Edm" Version="8.4.3" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Authors>BlaiseD</Authors>
<Description>Creates CRUD related LINQ queries from data.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>linq expressions</PackageTags>
<Copyright>Copyright © BPS 2018</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -28,7 +28,7 @@
<ItemGroup>
<PackageReference Include="LogicBuilder.Structures" Version="7.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ public void Get_students_with_filtered_inlude_no_filter_sort_skip_and_take_selec
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();
cfg.AddMaps(typeof(SchoolProfile).GetTypeInfo().Assembly);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void CanUpdateTheSameObjectGraphMoreThanOnce()

private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public RepositoryTests()
static MapperConfiguration MapperConfiguration;
private void Initialize()
{
MapperConfiguration ??= new MapperConfiguration(cfg =>
MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg =>
{
cfg.AddExpressionMapping();
cfg.AddMaps(typeof(SchoolProfile).GetTypeInfo().Assembly);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>LogicBuilder.Kendo.ExpressionExtensions</RootNamespace>
<PackageId>LogicBuilder.Kendo.ExpressionExtensions</PackageId>
<Authors>BlaiseD</Authors>
<Description>Extensions to create IQueryable expressions from Telerik's DataSourceRequest class. The expressions can then be executed against an IQueryable. This package depends on Telerik.UI.for.AspNet.Core but has not been created by Telerik/Progress.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>Supporting .NET 9.0.</PackageReleaseNotes>
<PackageReleaseNotes>Supporting .NET 10.0.</PackageReleaseNotes>
<PackageTags>efcore kendo</PackageTags>
<Copyright>Copyright © BPS 2018</Copyright>
<RepositoryUrl>https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents</RepositoryUrl>
Expand All @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Telerik.UI.for.AspNet.Core" Version="2024.4.1112" />
<PackageReference Include="MinVer" Version="6.0.0">
<PackageReference Include="MinVer" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading
Loading