From 4d4e562045f6b9417060171891695527293c7c88 Mon Sep 17 00:00:00 2001 From: "Thyge S. Steffensen" Date: Wed, 22 Mar 2023 14:18:14 +0100 Subject: [PATCH 01/10] feat: Add target for Framework 4.8 and 4.6.2 This is to cater for the original purpose of this project, namely PowerAutomateMockUp and PAMU_CDS --- ExpressionEngine/ExpressionEngine.csproj | 16 ++++++++++++++- Test/Test.csproj | 26 +++++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ExpressionEngine/ExpressionEngine.csproj b/ExpressionEngine/ExpressionEngine.csproj index f6d623a..3193395 100644 --- a/ExpressionEngine/ExpressionEngine.csproj +++ b/ExpressionEngine/ExpressionEngine.csproj @@ -1,16 +1,30 @@ - netcoreapp3.1;net6.0;net7.0 + netcoreapp3.1;net6.0;net7.0;net48;net462 Delegate.ExpressionEngine Delegate A/S,thygesteffensen Expression Engine for Power Automate expressions written in C# using Sprache.net! https://github.com/delegateas/ExpressionEngine + 8 + true + + + + + + + + + + + + diff --git a/Test/Test.csproj b/Test/Test.csproj index 528b1af..43d50be 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -1,11 +1,35 @@ - netcoreapp3.1;net6.0;net7.0 + netcoreapp3.1;net6.0;net7.0;net48;net462 + 8 false + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + From fc2bd457a25314822cd370c8aff0dd12e4d191c8 Mon Sep 17 00:00:00 2001 From: "Thyge S. Steffensen" Date: Wed, 22 Mar 2023 14:24:17 +0100 Subject: [PATCH 02/10] ci: Add net462 and net48 to tests --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c68dd56..5b06399 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: name: Testing strategy: matrix: - dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ] + dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ] steps: - name: Checkout code base uses: actions/checkout@v2 @@ -30,7 +30,7 @@ jobs: name: Building strategy: matrix: - dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ] + dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ] steps: - name: Checkout code base uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e997180..9833b8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: name: Testing strategy: matrix: - dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ] + dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ] steps: - name: Checkout code base uses: actions/checkout@v2 From aeeb1aa2e375dc182ed795e113615704138d8cfc Mon Sep 17 00:00:00 2001 From: "Thyge S. Steffensen" Date: Wed, 22 Mar 2023 14:55:49 +0100 Subject: [PATCH 03/10] ci: update node action to v3 --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9833b8f..d5d8579 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,9 +38,7 @@ jobs: with: dotnet-version: '7.0.x' - - uses: actions/setup-node@v2 - with: - node-version: '16' + - uses: actions/setup-node@v3 - name: Add plugin for conventional commits run: npm install conventional-changelog-conventionalcommits From ab500a89ef0976158fa74ca5df661357d2bd7737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 13:40:56 +0200 Subject: [PATCH 04/10] fix: updated to .net 8 + changed datetime to use ToObject, as it wont cast exceptions when mixing datetime/datetimeoffset --- ExpressionEngine/ExpressionEngine.csproj | 21 +++++++++------------ ExpressionEngine/ValueContainer.cs | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ExpressionEngine/ExpressionEngine.csproj b/ExpressionEngine/ExpressionEngine.csproj index 3193395..3c1c5b3 100644 --- a/ExpressionEngine/ExpressionEngine.csproj +++ b/ExpressionEngine/ExpressionEngine.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net6.0;net7.0;net48;net462 + netcoreapp3.1;net6.0;net8.0;net48;net462 Delegate.ExpressionEngine Delegate A/S,thygesteffensen @@ -15,35 +15,32 @@ - - - - - - + - - + - - + + + + + + - diff --git a/ExpressionEngine/ValueContainer.cs b/ExpressionEngine/ValueContainer.cs index bf151f2..b4417b1 100644 --- a/ExpressionEngine/ValueContainer.cs +++ b/ExpressionEngine/ValueContainer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -474,7 +474,7 @@ private static async ValueTask JsonToValueContainer(JToken json, JTokenType.String => new ValueContainer(jValue.Value()), JTokenType.None => new ValueContainer(), JTokenType.Guid => new ValueContainer(jValue.Value()), - JTokenType.Date => new ValueContainer(jValue.Value()), + JTokenType.Date => new ValueContainer(jValue.ToObject()), _ => throw new ExpressionEngineException( $"{jValue.Type} is not yet supported in ValueContainer conversion") }; From 350f4ee2aa5133e4a53b6d1d49b4f115f8078b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 13:48:31 +0200 Subject: [PATCH 05/10] fix: removed net3.1 --- .github/workflows/release.yml | 6 +++--- ExpressionEngine/ExpressionEngine.csproj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5d8579..67b1a78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,14 +12,14 @@ jobs: name: Testing strategy: matrix: - dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ] + dotnet: ['net6.0', 'net7.0', 'net462', 'net48','net8.0' ] steps: - name: Checkout code base uses: actions/checkout@v2 - uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' + dotnet-version: '8.0.x' - name: Run tests run: dotnet test --verbosity normal -f ${{ matrix.dotnet }} @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' + dotnet-version: '8.0.x' - uses: actions/setup-node@v3 diff --git a/ExpressionEngine/ExpressionEngine.csproj b/ExpressionEngine/ExpressionEngine.csproj index 3c1c5b3..4a0344d 100644 --- a/ExpressionEngine/ExpressionEngine.csproj +++ b/ExpressionEngine/ExpressionEngine.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net6.0;net8.0;net48;net462 + net6.0;net8.0;net48;net462 Delegate.ExpressionEngine Delegate A/S,thygesteffensen @@ -32,7 +32,7 @@ - + From 135d485aac9d6b2c4e2b91308b12b4dd8ff20592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 13:54:34 +0200 Subject: [PATCH 06/10] using node 20 --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67b1a78..84767aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,8 @@ jobs: dotnet-version: '8.0.x' - uses: actions/setup-node@v3 + with: + node-version: '20' - name: Add plugin for conventional commits run: npm install conventional-changelog-conventionalcommits From 9a4d14bea663e2f207f3dc2f18a0e1c5b68e97e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 14:01:53 +0200 Subject: [PATCH 07/10] removed github release --- .github/workflows/.releaserc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/.releaserc b/.github/workflows/.releaserc index 7931a8b..7ba34fc 100644 --- a/.github/workflows/.releaserc +++ b/.github/workflows/.releaserc @@ -1,4 +1,4 @@ -branches: +branches: - name: main - name: dev prerelease: dev @@ -10,12 +10,6 @@ plugins: - - "@semantic-release/release-notes-generator" - preset: conventionalcommits - - - "@semantic-release/github" - - assets: - - path: ../../artifacts/ExpressionEngine.*.nupkg - label: Parser DLL - - path: ../../artifacts/Documentation.md - label: Documentation - - "@semantic-release/exec" - publishCmd: "dotnet nuget push ..\\..\\artifacts\\Delegate.ExpressionEngine.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${process.env.CI_NUGET_API_KEY}" \ No newline at end of file From 33b5559ee85d2dbd3dbb7b566262884f613a9cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 14:11:33 +0200 Subject: [PATCH 08/10] try 8 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84767aa..e16f541 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: if: ${{ env.RELEASE_VERSION }} - name: Generate docs - run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net7.0/ExpressionEngine.xml --output artifacts/Documentation.md + run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net8.0/ExpressionEngine.xml --output artifacts/Documentation.md if: ${{ env.RELEASE_VERSION }} - name: Release to GitHub and NuGet From e2505151eea1a75d3f738f26b9627cb4d9bb88d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 14:46:55 +0200 Subject: [PATCH 09/10] try again --- .github/workflows/.releaserc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/.releaserc b/.github/workflows/.releaserc index 7ba34fc..32fe711 100644 --- a/.github/workflows/.releaserc +++ b/.github/workflows/.releaserc @@ -10,6 +10,12 @@ plugins: - - "@semantic-release/release-notes-generator" - preset: conventionalcommits + - - "@semantic-release/github" + - assets: + - path: ../../artifacts/ExpressionEngine.*.nupkg + label: Parser DLL + - path: ../../artifacts/Documentation.md + label: Documentation - - "@semantic-release/exec" - publishCmd: "dotnet nuget push ..\\..\\artifacts\\Delegate.ExpressionEngine.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${process.env.CI_NUGET_API_KEY}" \ No newline at end of file From 096d1e20ae4b855b27abe65016302cf05bd53edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Poul=20Kjeldager=20S=C3=B8rensen?= Date: Sun, 25 Aug 2024 14:54:55 +0200 Subject: [PATCH 10/10] use github token --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e16f541..a4e6756 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: - name: Dry Run Semantic to get next Version nummber working-directory: ./.github/workflows env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GIT_AUTHOR_NAME: thygesteffensen GIT_AUTHOR_EMAIL: 31892312+thygesteffensen@users.noreply.github.com run: |