Merge pull request #98 from delegateas/dev

Release Dev to Main
delegateas · Aug 25, 2024 · 9b49e7b · 9b49e7b
2 parents d389141 + 096d1e2
commit 9b49e7b
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 21 deletions.
diff --git a/.github/workflows/.releaserc b/.github/workflows/.releaserc
@@ -1,4 +1,4 @@
-branches:
+branches:
   - name: main
   - name: dev
     prerelease: dev

diff --git 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
@@ -12,14 +12,14 @@ jobs:
     name: Testing
     strategy:
       matrix:
-        dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
+        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,11 +36,11 @@ jobs:
 
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '20'
 
       - name: Add plugin for conventional commits
         run: npm install conventional-changelog-conventionalcommits
@@ -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: |
@@ -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

diff --git a/ExpressionEngine/ExpressionEngine.csproj b/ExpressionEngine/ExpressionEngine.csproj
@@ -1,35 +1,46 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;net48;net462</TargetFrameworks>
 
         <PackageId>Delegate.ExpressionEngine</PackageId>
         <Authors>Delegate A/S,thygesteffensen</Authors>
         <PackageDescription>Expression Engine for Power Automate expressions written in C# using Sprache.net!</PackageDescription>
         <RepositoryUrl>https://github.com/delegateas/ExpressionEngine</RepositoryUrl>
 
+        <LangVersion>8</LangVersion>
+
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.31" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Sprache" Version="2.3.1" />
+
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Sprache" Version="2.3.1" />
+
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+
+    </ItemGroup>
+
+    <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Sprache" Version="2.3.1" />
     </ItemGroup>
 
-
     <ItemGroup>
       <Folder Include="Functions\Implementations\Miscellaneous" />
     </ItemGroup>

diff --git 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<ValueContainer> JsonToValueContainer(JToken json,
                         JTokenType.String => new ValueContainer(jValue.Value<string>()),
                         JTokenType.None => new ValueContainer(),
                         JTokenType.Guid => new ValueContainer(jValue.Value<Guid>()),
-                        JTokenType.Date => new ValueContainer(jValue.Value<DateTimeOffset>()),
+                        JTokenType.Date => new ValueContainer(jValue.ToObject<DateTimeOffset>()),
                         _ => throw new ExpressionEngineException(
                             $"{jValue.Type} is not yet supported in ValueContainer conversion")
                     };

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -1,11 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net48;net462</TargetFrameworks>
 
+        <LangVersion>8</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+
     <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />