Skip to content

Commit 9b49e7b

Browse files
pksorensenpksorensen
authored
Merge pull request #98 from delegateas/dev
Release Dev to Main
2 parents d389141 + 096d1e2 commit 9b49e7b

6 files changed

Lines changed: 56 additions & 21 deletions

File tree

‎.github/workflows/.releaserc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
branches:
1+
branches:
22
- name: main
33
- name: dev
44
prerelease: dev

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Testing
1414
strategy:
1515
matrix:
16-
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
16+
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ]
1717
steps:
1818
- name: Checkout code base
1919
uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
3030
name: Building
3131
strategy:
3232
matrix:
33-
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
33+
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0', 'net462', 'net48' ]
3434
steps:
3535
- name: Checkout code base
3636
uses: actions/checkout@v2

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
name: Testing
1313
strategy:
1414
matrix:
15-
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
15+
dotnet: ['net6.0', 'net7.0', 'net462', 'net48','net8.0' ]
1616
steps:
1717
- name: Checkout code base
1818
uses: actions/checkout@v2
1919

2020
- uses: actions/setup-dotnet@v3
2121
with:
22-
dotnet-version: '7.0.x'
22+
dotnet-version: '8.0.x'
2323

2424
- name: Run tests
2525
run: dotnet test --verbosity normal -f ${{ matrix.dotnet }}
@@ -36,11 +36,11 @@ jobs:
3636

3737
- uses: actions/setup-dotnet@v3
3838
with:
39-
dotnet-version: '7.0.x'
39+
dotnet-version: '8.0.x'
4040

41-
- uses: actions/setup-node@v2
41+
- uses: actions/setup-node@v3
4242
with:
43-
node-version: '16'
43+
node-version: '20'
4444

4545
- name: Add plugin for conventional commits
4646
run: npm install conventional-changelog-conventionalcommits
@@ -53,7 +53,7 @@ jobs:
5353
- name: Dry Run Semantic to get next Version nummber
5454
working-directory: ./.github/workflows
5555
env:
56-
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
56+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5757
GIT_AUTHOR_NAME: thygesteffensen
5858
GIT_AUTHOR_EMAIL: 31892312+thygesteffensen@users.noreply.github.com
5959
run: |
@@ -79,7 +79,7 @@ jobs:
7979
if: ${{ env.RELEASE_VERSION }}
8080

8181
- name: Generate docs
82-
run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net7.0/ExpressionEngine.xml --output artifacts/Documentation.md
82+
run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net8.0/ExpressionEngine.xml --output artifacts/Documentation.md
8383
if: ${{ env.RELEASE_VERSION }}
8484

8585
- name: Release to GitHub and NuGet

‎ExpressionEngine/ExpressionEngine.csproj‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,46 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;net48;net462</TargetFrameworks>
55

66
<PackageId>Delegate.ExpressionEngine</PackageId>
77
<Authors>Delegate A/S,thygesteffensen</Authors>
88
<PackageDescription>Expression Engine for Power Automate expressions written in C# using Sprache.net!</PackageDescription>
99
<RepositoryUrl>https://github.com/delegateas/ExpressionEngine</RepositoryUrl>
1010

11+
<LangVersion>8</LangVersion>
12+
1113
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1214
</PropertyGroup>
1315

16+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
22+
</ItemGroup>
23+
1424
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
1525
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.31" />
16-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
17-
<PackageReference Include="Sprache" Version="2.3.1" />
26+
1827
</ItemGroup>
1928

2029
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
2130
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
22-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
23-
<PackageReference Include="Sprache" Version="2.3.1" />
31+
2432
</ItemGroup>
2533

26-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
34+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
36+
37+
</ItemGroup>
38+
39+
<ItemGroup>
2840
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2941
<PackageReference Include="Sprache" Version="2.3.1" />
3042
</ItemGroup>
3143

32-
3344
<ItemGroup>
3445
<Folder Include="Functions\Implementations\Miscellaneous" />
3546
</ItemGroup>

‎ExpressionEngine/ValueContainer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections;
33
using System.Collections.Generic;
44
using System.Linq;
@@ -474,7 +474,7 @@ private static async ValueTask<ValueContainer> JsonToValueContainer(JToken json,
474474
JTokenType.String => new ValueContainer(jValue.Value<string>()),
475475
JTokenType.None => new ValueContainer(),
476476
JTokenType.Guid => new ValueContainer(jValue.Value<Guid>()),
477-
JTokenType.Date => new ValueContainer(jValue.Value<DateTimeOffset>()),
477+
JTokenType.Date => new ValueContainer(jValue.ToObject<DateTimeOffset>()),
478478
_ => throw new ExpressionEngineException(
479479
$"{jValue.Type} is not yet supported in ValueContainer conversion")
480480
};

‎Test/Test.csproj‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net48;net462</TargetFrameworks>
55

6+
<LangVersion>8</LangVersion>
67
<IsPackable>false</IsPackable>
78
</PropertyGroup>
89

10+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13+
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
15+
<PackageReference Include="coverlet.collector" Version="3.2.0">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
</ItemGroup>
20+
21+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
24+
<PackageReference Include="NUnit" Version="3.13.3" />
25+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
26+
<PackageReference Include="coverlet.collector" Version="3.2.0">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
31+
32+
933
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
1034
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
1135
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />

0 commit comments

Comments
 (0)