From 9b53a9aa3a2333563a93132c647edf1060ea03f9 Mon Sep 17 00:00:00 2001 From: Abbas Cyclewala Date: Sat, 13 Jan 2024 15:20:51 +0530 Subject: [PATCH 1/3] Users/abbasc52/dotnet8 (#571) * updated to dotnet 8 * fixed readme formatting * removed unnecessary dependencies --- benchmark/RulesEngineBenchmark/RulesEngineBenchmark.csproj | 4 ++-- demo/DemoApp.EFDataExample/DemoApp.EFDataExample.csproj | 6 +++--- demo/DemoApp/DemoApp.csproj | 2 +- docs/index.md | 1 + global.json | 2 +- src/RulesEngine/RulesEngine.csproj | 13 +++++++------ test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj | 12 ++++++------ 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/benchmark/RulesEngineBenchmark/RulesEngineBenchmark.csproj b/benchmark/RulesEngineBenchmark/RulesEngineBenchmark.csproj index b0ca1c5..f6e806a 100644 --- a/benchmark/RulesEngineBenchmark/RulesEngineBenchmark.csproj +++ b/benchmark/RulesEngineBenchmark/RulesEngineBenchmark.csproj @@ -2,11 +2,11 @@ Exe - net6.0 + net8.0 - + diff --git a/demo/DemoApp.EFDataExample/DemoApp.EFDataExample.csproj b/demo/DemoApp.EFDataExample/DemoApp.EFDataExample.csproj index 0a588c1..210fdad 100644 --- a/demo/DemoApp.EFDataExample/DemoApp.EFDataExample.csproj +++ b/demo/DemoApp.EFDataExample/DemoApp.EFDataExample.csproj @@ -1,14 +1,14 @@ - net6.0 + net8.0 DemoApp.EFDataExample DemoApp.EFDataExample - - + + diff --git a/demo/DemoApp/DemoApp.csproj b/demo/DemoApp/DemoApp.csproj index fb6e5d9..626fa62 100644 --- a/demo/DemoApp/DemoApp.csproj +++ b/demo/DemoApp/DemoApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 DemoApp.Program diff --git a/docs/index.md b/docs/index.md index 4a9d9eb..dca4d16 100644 --- a/docs/index.md +++ b/docs/index.md @@ -579,6 +579,7 @@ Here are the all the options available:- ### NestedRuleExecutionMode + | Value | Description | | --- | --- | | `All` | Executes all nested rules. | diff --git a/global.json b/global.json index fc4a588..da113e4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.0", + "version": "8.0.0", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/RulesEngine/RulesEngine.csproj b/src/RulesEngine/RulesEngine.csproj index 537726e..c69e49b 100644 --- a/src/RulesEngine/RulesEngine.csproj +++ b/src/RulesEngine/RulesEngine.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net8.0;net6.0;netstandard2.0 5.0.3 Copyright (c) Microsoft Corporation. LICENSE @@ -34,13 +34,14 @@ - - + - - - + + + + + diff --git a/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj b/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj index 61be586..7dd4627 100644 --- a/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj +++ b/test/RulesEngine.UnitTest/RulesEngine.UnitTest.csproj @@ -1,17 +1,17 @@ - net6.0 + net8.0 True ..\..\signing\RulesEngine-publicKey.snk True - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From be6faef9f00a46972e2437ae8e9d3feef480ae58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Jan 2024 15:24:34 +0530 Subject: [PATCH 2/3] Bump actions/setup-dotnet from 3 to 4 (#560) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3 to 4. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abbas Cyclewala --- .github/workflows/dotnetcore-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore-build.yml b/.github/workflows/dotnetcore-build.yml index 8088e0e..c3878d6 100644 --- a/.github/workflows/dotnetcore-build.yml +++ b/.github/workflows/dotnetcore-build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup .NET Core - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: 6.0.x From dc5298989583954cd6aac598267747b4ce635f45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 02:27:49 +0530 Subject: [PATCH 3/3] Bump github/codeql-action from 2 to 3 (#572) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ca13df6..bcb7308 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -50,7 +50,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -64,5 +64,5 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3