Skip to content
This repository has been archived by the owner on Nov 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #74 from TheEadie/net6
Browse files Browse the repository at this point in the history
.NET 6
  • Loading branch information
TheEadie authored Nov 26, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 88f5566 + 3cbf92a commit 350bf4b
Showing 5 changed files with 12 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup .NET Core
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Build
run: ./.build/build.sh
- name: Upload build
@@ -30,10 +30,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup .NET Core
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Download build
uses: actions/download-artifact@v1
with:
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
next-version: 0.9
next-version: 0.10
mode: ContinuousDelivery
tag-prefix: 'release/'
branches: {}
2 changes: 1 addition & 1 deletion src/LazyStorage.Tests/LazyStorage.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<LangVersion>Latest</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
5 changes: 5 additions & 0 deletions src/LazyStorage/Json/JsonRepository.cs
Original file line number Diff line number Diff line change
@@ -57,6 +57,11 @@ public void Load()
var jsonContent = File.ReadAllText(_uri);
var convertedItems = JsonConvert.DeserializeObject<List<StorableObject>>(jsonContent);

if (convertedItems is null)
{
throw new FileLoadException($"The JSON file {_uri} could not be deserialized");
}

_repository = convertedItems.Select(x => _converter.GetOriginalObject(x)).ToList();
}
else
2 changes: 1 addition & 1 deletion src/LazyStorage/LazyStorage.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<Version>0.0.1.0</Version>

<PackageVersion>0.0.1-local</PackageVersion>

0 comments on commit 350bf4b

Please sign in to comment.