diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e74513..dc35e54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 263b87f..e709337 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: permissions: contents: read packages: write + id-token: write # enable GitHub OIDC token issuance for this job jobs: build: @@ -21,11 +22,17 @@ 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 }} @@ -33,7 +40,7 @@ jobs: 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 diff --git a/LogicBuilder.Data/LogicBuilder.Data.csproj b/LogicBuilder.Data/LogicBuilder.Data.csproj index d0714e0..5ee4575 100644 --- a/LogicBuilder.Data/LogicBuilder.Data.csproj +++ b/LogicBuilder.Data/LogicBuilder.Data.csproj @@ -7,7 +7,7 @@ BlaiseD LogicBuilder.Data includes the base class for all data objects in the applications data stack. false - Supporting .NET 9.0. + Supporting .NET 10.0. crud operations Copyright © BPS 2017 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.Domain/LogicBuilder.Domain.csproj b/LogicBuilder.Domain/LogicBuilder.Domain.csproj index 6c66a8e..c103439 100644 --- a/LogicBuilder.Domain/LogicBuilder.Domain.csproj +++ b/LogicBuilder.Domain/LogicBuilder.Domain.csproj @@ -7,7 +7,7 @@ BlaiseD LogicBuilder.Domain includes the base class for all DTOs in the data stack; false - Supporting .NET 9.0. + Supporting .NET 10.0. crud operations logic-builder Copyright © BPS 2017 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj index f8afc8e..efb933e 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests.csproj @@ -1,20 +1,20 @@  - net9.0 + net10.0 false - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/PersistenceTest.cs b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/PersistenceTest.cs index eb0ae60..a453d56 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/PersistenceTest.cs +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/PersistenceTest.cs @@ -189,7 +189,7 @@ private void Initialize() { if (MapperConfiguration == null) { - MapperConfiguration = new MapperConfiguration(cfg => + MapperConfiguration = ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/QueryableExpressionTests.cs b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/QueryableExpressionTests.cs index 6e49f83..f0b28a4 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/QueryableExpressionTests.cs +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.IntegrationTests/QueryableExpressionTests.cs @@ -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(); diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/CollectionExpressionTests.cs b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/CollectionExpressionTests.cs index 838844d..c36b3e6 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/CollectionExpressionTests.cs +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/CollectionExpressionTests.cs @@ -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(); diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/FilterDescriptorTests.cs b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/FilterDescriptorTests.cs index 5314351..efda0fb 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/FilterDescriptorTests.cs +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/FilterDescriptorTests.cs @@ -7312,7 +7312,7 @@ Expression> CreateFilter() static MapperConfiguration MapperConfiguration; private void Initialize() { - MapperConfiguration ??= new MapperConfiguration(cfg => + MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.AddProfile(); diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj index fd33e44..87a2b86 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/LogicBuilder.EntityFrameworkCore.SqlServer.Tests.csproj @@ -1,16 +1,16 @@  - net9.0 + net10.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/QueryableExpressionTests.cs b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/QueryableExpressionTests.cs index ff91f50..5424a5a 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/QueryableExpressionTests.cs +++ b/LogicBuilder.EntityFrameworkCore.SqlServer.Tests/QueryableExpressionTests.cs @@ -1441,7 +1441,7 @@ Expression> CreateExpression() static MapperConfiguration MapperConfiguration; private void Initialize() { - MapperConfiguration ??= new MapperConfiguration(cfg => + MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); cfg.AddProfile(); diff --git a/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj b/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj index c8cba3b..d2e2306 100644 --- a/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj +++ b/LogicBuilder.EntityFrameworkCore.SqlServer/LogicBuilder.EntityFrameworkCore.SqlServer.csproj @@ -1,13 +1,13 @@  - net8.0;net9.0 + net8.0;net9.0;net10.0 LogicBuilder.EntityFrameworkCore.SqlServer LogicBuilder.EntityFrameworkCore.SqlServer BlaiseD Given an EF Core DBContext, LogicBuilder.EntityFrameworkCore.SqlServer uses AutoMapper configurations to support CRUD operations using the DTO objects. false - Supporting .NET 9.0. + Supporting .NET 10.0. crud operations efcore Copyright © BPS 2017 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -26,11 +26,11 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -38,11 +38,15 @@ - + - + + + + + diff --git a/LogicBuilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj b/LogicBuilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj index 3bb5bdc..d4634b5 100644 --- a/LogicBuilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj +++ b/LogicBuilder.Expressions.EntityFrameworkCore/LogicBuilder.Expressions.EntityFrameworkCore.csproj @@ -1,13 +1,13 @@  - net8.0;net9.0 + net8.0;net9.0;net10.0 LogicBuilder.Expressions.EntityFrameworkCore LogicBuilder.Expressions.EntityFrameworkCore BlaiseD Augments LogicBuilder.Expressions.Utils with LINQ queries specific to EF Core. false - Supporting .NET 9.0. + Supporting .NET 10.0. linq expressions efcore Copyright © BPS 2018 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -35,11 +35,16 @@ - + - + + + + + + diff --git a/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj b/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj index 0b9816c..e2bf187 100644 --- a/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj +++ b/LogicBuilder.Expressions.Utils.Tests/LogicBuilder.Expressions.Utils.Tests.csproj @@ -1,20 +1,20 @@  - net9.0 + net10.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.Expressions.Utils/LogicBuilder.Expressions.Utils.csproj b/LogicBuilder.Expressions.Utils/LogicBuilder.Expressions.Utils.csproj index 53c0413..43a9e58 100644 --- a/LogicBuilder.Expressions.Utils/LogicBuilder.Expressions.Utils.csproj +++ b/LogicBuilder.Expressions.Utils/LogicBuilder.Expressions.Utils.csproj @@ -7,7 +7,7 @@ BlaiseD Creates CRUD related LINQ queries from data. false - Supporting .NET 9.0. + Supporting .NET 10.0. linq expressions Copyright © BPS 2018 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/DataRequestTests.cs b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/DataRequestTests.cs index 09fd47e..3847a3e 100644 --- a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/DataRequestTests.cs +++ b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/DataRequestTests.cs @@ -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); diff --git a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests.csproj b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests.csproj index e4b378a..14b13c4 100644 --- a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests.csproj +++ b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 @@ -9,10 +9,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/PersisteneceTests.cs b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/PersisteneceTests.cs index 083db56..828e542 100644 --- a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/PersisteneceTests.cs +++ b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/PersisteneceTests.cs @@ -106,7 +106,7 @@ public void CanUpdateTheSameObjectGraphMoreThanOnce() private void Initialize() { - MapperConfiguration ??= new MapperConfiguration(cfg => + MapperConfiguration ??= ConfigurationHelper.GetMapperConfiguration(cfg => { cfg.AddExpressionMapping(); diff --git a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/RepositoryTests.cs b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/RepositoryTests.cs index 7248032..3fcbba9 100644 --- a/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/RepositoryTests.cs +++ b/LogicBuilder.Kendo.ExpressionExtensions.IntegrationTests/RepositoryTests.cs @@ -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); diff --git a/LogicBuilder.Kendo.ExpressionExtensions/LogicBuilder.Kendo.ExpressionExtensions.csproj b/LogicBuilder.Kendo.ExpressionExtensions/LogicBuilder.Kendo.ExpressionExtensions.csproj index 84d1110..abe6af0 100644 --- a/LogicBuilder.Kendo.ExpressionExtensions/LogicBuilder.Kendo.ExpressionExtensions.csproj +++ b/LogicBuilder.Kendo.ExpressionExtensions/LogicBuilder.Kendo.ExpressionExtensions.csproj @@ -1,13 +1,13 @@  - net8.0 + net10.0 LogicBuilder.Kendo.ExpressionExtensions LogicBuilder.Kendo.ExpressionExtensions BlaiseD 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. false - Supporting .NET 9.0. + Supporting .NET 10.0. efcore kendo Copyright © BPS 2018 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LogicBuilder.Structures/LogicBuilder.Structures.csproj b/LogicBuilder.Structures/LogicBuilder.Structures.csproj index 13063c9..ee2e578 100644 --- a/LogicBuilder.Structures/LogicBuilder.Structures.csproj +++ b/LogicBuilder.Structures/LogicBuilder.Structures.csproj @@ -7,7 +7,7 @@ BlaiseD LogicBuilder.Structures includes classes used by multiple components in the LogicBuilder data stack. false - Supporting .NET 9.0. + Supporting .NET 10.0. logicbuilder Copyright © BPS 2019 https://github.com/BpsLogicBuilder/LogicBuilder.DataComponents @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive