Skip to content

Commit

Permalink
Merge pull request #17 from brenordv/feature/dotnet8-migration
Browse files Browse the repository at this point in the history
Forcing use of NewtonJson.
  • Loading branch information
brenordv committed Feb 11, 2024
2 parents 80f00d5 + 508747a commit e82695e
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
3 changes: 2 additions & 1 deletion Raccoon.Ninja.AzFn.DataApi/DataApiFunc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Raccoon.Ninja.Domain.Core.Entities;
using Raccoon.Ninja.Domain.Core.Models;
using Microsoft.Azure.Functions.Worker;
using Newtonsoft.Json;

namespace Raccoon.Ninja.AzFn.DataApi;

Expand Down Expand Up @@ -49,7 +50,7 @@ public async Task<IActionResult> RunAsync(

return latestReading is null
? new NoContentResult()
: new OkObjectResult(response);
: new OkObjectResult(JsonConvert.SerializeObject(response));
}
catch (Exception e)
{
Expand Down
5 changes: 3 additions & 2 deletions Raccoon.Ninja.AzFn.DataApi/DataLatestHbA1cFunc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Raccoon.Ninja.Domain.Core.Entities;
using Raccoon.Ninja.Domain.Core.Models;
using Microsoft.Azure.Functions.Worker;
using Newtonsoft.Json;

namespace Raccoon.Ninja.AzFn.DataApi;

Expand Down Expand Up @@ -58,11 +59,11 @@ public async Task<IActionResult> RunAsync(
if (latestSuccessful is null && latestPartialSuccessful is null)
return new NoContentResult();

return new OkObjectResult(new DataLatestHbA1CFuncResponse
return new OkObjectResult(JsonConvert.SerializeObject(new DataLatestHbA1CFuncResponse
{
LatestSuccessful = latestSuccessful,
LatestPartialSuccessful = latestPartialSuccessful
});
}));
}
catch (Exception e)
{
Expand Down
3 changes: 2 additions & 1 deletion Raccoon.Ninja.AzFn.DataApi/DataSeriesApiFunc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Raccoon.Ninja.Domain.Core.Entities;
using Raccoon.Ninja.Domain.Core.Models;
using Microsoft.Azure.Functions.Worker;
using Newtonsoft.Json;

namespace Raccoon.Ninja.AzFn.DataApi;

Expand Down Expand Up @@ -72,7 +73,7 @@ public async Task<IActionResult> RunAsync(

return response.Count == 0
? new NoContentResult()
: new OkObjectResult(response);
: new OkObjectResult(JsonConvert.SerializeObject(response));
}

private static int GetDataSeriesMaxRecords()
Expand Down
4 changes: 2 additions & 2 deletions Raccoon.Ninja.AzFn.DataApi/Raccoon.Ninja.AzFn.DataApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<AssemblyVersion>2.0.0</AssemblyVersion>
<FileVersion>2.0.0</FileVersion>
<AssemblyVersion>2.0.1</AssemblyVersion>
<FileVersion>2.0.1</FileVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<OutputType>Exe</OutputType>
<ImplicitUsings>enabled</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<AssemblyVersion>2.0.0</AssemblyVersion>
<FileVersion>2.0.0</FileVersion>
<AssemblyVersion>2.0.1</AssemblyVersion>
<FileVersion>2.0.1</FileVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<OutputType>Exe</OutputType>
<ImplicitUsings>enabled</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<AssemblyVersion>2.0.0</AssemblyVersion>
<FileVersion>2.0.0</FileVersion>
<AssemblyVersion>2.0.1</AssemblyVersion>
<FileVersion>2.0.1</FileVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<AssemblyName>CGMDataDisplay.Launcher</AssemblyName>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Nullable>disable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyVersion>2.0.0</AssemblyVersion>
<FileVersion>2.0.0</FileVersion>
<AssemblyVersion>2.0.1</AssemblyVersion>
<FileVersion>2.0.1</FileVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<AssemblyName>CGMDataDisplay</AssemblyName>
</PropertyGroup>
Expand Down

0 comments on commit e82695e

Please sign in to comment.