Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Dev to Main #98

Merged
merged 12 commits into from
Aug 25, 2024
Merged

Release Dev to Main #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4d4e562
feat: Add target for Framework 4.8 and 4.6.2
thygesteffensen Mar 22, 2023
fc2bd45
ci: Add net462 and net48 to tests
thygesteffensen Mar 22, 2023
20db6d7
Merge pull request #96 from delegateas/tst/new-targets
thygesteffensen Mar 22, 2023
aeeb1aa
ci: update node action to v3
thygesteffensen Mar 22, 2023
004715f
Merge pull request #97 from delegateas/tst/new-targets
thygesteffensen Mar 22, 2023
ab500a8
fix: updated to .net 8 + changed datetime to use ToObject, as it wont…
pksorensen Aug 25, 2024
350f4ee
fix: removed net3.1
pksorensen Aug 25, 2024
135d485
using node 20
pksorensen Aug 25, 2024
9a4d14b
removed github release
pksorensen Aug 25, 2024
33b5559
try 8
pksorensen Aug 25, 2024
e250515
try again
pksorensen Aug 25, 2024
096d1e2
use github token
pksorensen Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/.releaserc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
branches:
branches:
- name: main
- name: dev
prerelease: dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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: [email protected]
run: |
Expand All @@ -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
Expand Down
27 changes: 19 additions & 8 deletions ExpressionEngine/ExpressionEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ExpressionEngine/ValueContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -316,7 +316,7 @@
return _type == ValueType.Null;
}

public int CompareTo(object? obj)

Check warning on line 319 in ExpressionEngine/ValueContainer.cs

View workflow job for this annotation

GitHub Actions / Building (netcoreapp3.1) 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 319 in ExpressionEngine/ValueContainer.cs

View workflow job for this annotation

GitHub Actions / Releasing 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

Check warning on line 319 in ExpressionEngine/ValueContainer.cs

View workflow job for this annotation

GitHub Actions / Releasing 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
{
if (obj == null || obj.GetType() != GetType())
throw new InvalidOperationException("Cannot compare these two...");
Expand Down Expand Up @@ -474,7 +474,7 @@
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")
};
Expand Down
26 changes: 25 additions & 1 deletion Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
Loading