Skip to content

Commit

Permalink
Merge pull request #9 from CommunityHiQ/ISSUE-8
Browse files Browse the repository at this point in the history
ISSUE-8: Updated JUST.Net dependency for JsonMapper
  • Loading branch information
RikuVirtanen authored Oct 26, 2022
2 parents 7ed9737 + 85e7202 commit 2045307
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Frends.Community.JSON/Frends.Community.JSON.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<IncludeSource>true</IncludeSource>
<PackageTags>Frends</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>1.0.3</Version>
<Version>1.0.4</Version>
</PropertyGroup>

<ItemGroup>
Expand All @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JUST.net" Version="3.0.6" />
<PackageReference Include="JUST.net" Version="4.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
Expand Down
3 changes: 2 additions & 1 deletion Frends.Community.JSON/JsonTasks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public static JsonMapperResult JsonMapper(JsonMapperInput input, CancellationTok
}
try
{
result = JsonTransformer.Transform(input.JsonMap, input.InputJson.ToString());
var transformer = new JsonTransformer();
result = transformer.Transform(input.JsonMap, input.InputJson.ToString());
}
catch (Exception ex)
{
Expand Down
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Frends.Community.JSON

FRENDS Community Tasks to process Json data.
Frends Community Tasks to process Json data.

[![Actions Status](https://github.com/CommunityHiQ/Frends.Community.JSON/workflows/PackAndPushAfterMerge/badge.svg)](https://github.com/CommunityHiQ/Frends.Community.JSON/actions) ![MyGet](https://img.shields.io/myget/frends-community/v/Frends.Community.JSON) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

Expand All @@ -14,7 +14,7 @@ FRENDS Community Tasks to process Json data.

## Installing

You can install the task via FRENDS UI Task View or you can find the NuGet package from the following NuGet feed
You can install the Task via Frends UI Task View or you can find the NuGet package from the following NuGet feed
https://www.myget.org/F/frends-community/api/v3/index.json and in Gallery view in MyGet https://www.myget.org/feed/frends-community/package/nuget/Frends.Community.JSON

## Building
Expand All @@ -23,7 +23,7 @@ Clone a copy of the repo

`git clone https://github.com/CommunityHiQ/Frends.Community.JSON.git`

Rebuild the project
Build the project

`dotnet build`

Expand Down Expand Up @@ -162,9 +162,10 @@ throws exception in transformation. **This can be avoided by wrapping Input Json

## Change Log

| Version | Changes |
| ------- | ------- |
| 1.0.0 | Initial implementation. Two different tasks combined to one repo. |
| 1.0.1 | Updated version number to fix release CI |
| 1.0.2 | Fixed issue where null values are forced as array of null values. |
| 1.0.3 | Downgraded Newtonsoft.Json to make make task work in Frends 5.3. |
| Version | Changes |
|---------|----------------------------------------------------------------------------------|
| 1.0.0 | Initial implementation. Two different tasks combined to one repo. |
| 1.0.1 | Updated version number to fix release CI |
| 1.0.2 | Fixed issue where null values are forced as array of null values. |
| 1.0.3 | Downgraded Newtonsoft.Json to make make task work in Frends 5.3. |
| 1.0.4 | JsonMapper: Updated JUST.Net to fix issue with concurrect execution of the Task. |

0 comments on commit 2045307

Please sign in to comment.