Skip to content

upgrade to net8 #2

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

Open
LewisPercival wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgrade to net8 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.7
with:
versionSpec: "5.6.x"
versionSpec: "5.8.x"
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v2
with:
dotnet-version: "5.0.x"
dotnet-version: "8.0.x"
- name: Install dependencies
run: dotnet restore src
- name: Use GitVersion
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.7
with:
versionSpec: "5.6.x"
versionSpec: "5.8.x"
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v2
with:
dotnet-version: "5.0.x"
dotnet-version: "8.0.x"
- name: Install dependencies
run: dotnet restore src
- name: Use GitVersion
Expand Down
2 changes: 1 addition & 1 deletion GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
next-version: 1.0.0
next-version: 2.0.0
mode: Mainline
major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
Expand Down
4 changes: 2 additions & 2 deletions src/content/api/src/LittleBlocks.Template.Client/LittleBlocks.Template.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<LangVersion>default</LangVersion>
<TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LittleBlocks.RestEase" Version="1.0.2" />
<PackageReference Include="LittleBlocks.RestEase" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/content/api/src/LittleBlocks.Template.Common/LittleBlocks.Template.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<LangVersion>default</LangVersion>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions .../api/src/LittleBlocks.Template.Core.UnitTests/LittleBlocks.Template.Core.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LittleBlocks.Ef.Testing" Version="1.0.0" />
<PackageReference Include="LittleBlocks.Testing" Version="1.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="LittleBlocks.Ef.Testing" Version="2.0.0" />
<PackageReference Include="LittleBlocks.Testing" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions src/content/api/src/LittleBlocks.Template.Core/LittleBlocks.Template.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand All @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="11.1.0" />
<PackageReference Include="LittleBlocks" Version="1.0.2" />
<PackageReference Include="LittleBlocks.Ef" Version="1.0.0" />
<PackageReference Include="LittleBlocks.RestEase.Client" Version="1.0.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="LittleBlocks" Version="2.0.0" />
<PackageReference Include="LittleBlocks.Ef" Version="2.0.0" />
<PackageReference Include="LittleBlocks.RestEase.Client" Version="2.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions ...cks.Template.WebApi.IntegrationTests/LittleBlocks.Template.WebApi.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LittleBlocks.Ef.Testing" Version="1.0.0" />
<PackageReference Include="LittleBlocks.Testing.Integration" Version="1.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="LittleBlocks.Ef.Testing" Version="2.0.0" />
<PackageReference Include="LittleBlocks.Testing.Integration" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
7 changes: 3 additions & 4 deletions src/content/api/src/LittleBlocks.Template.WebApi/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using System.Reflection;
using System;
using LittleBlocks.Ef;
using MediatR;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using LittleBlocks.Template.Core.Data;
using LittleBlocks.Template.Core.Shared;

namespace LittleBlocks.Template.WebApi.Extensions
{
public static class ServiceCollectionExtensions
{
public static IServiceCollection AddCoreServices(this IServiceCollection services)
{
services.AddMediatR(typeof(HandlerBase).GetTypeInfo().Assembly);
services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(AppDomain.CurrentDomain.GetAssemblies()));

return services;
}

Expand Down
12 changes: 6 additions & 6 deletions src/content/api/src/LittleBlocks.Template.WebApi/LittleBlocks.Template.WebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand All @@ -15,11 +15,11 @@

<ItemGroup>
<PackageReference Include="Flache.CacheManager" Version="1.0.10" />
<PackageReference Include="LittleBlocks.RestEase" Version="1.0.2" />
<PackageReference Include="LittleBlocks.AspNetCore.Bootstrap" Version="1.0.2" />
<PackageReference Include="LittleBlocks.Logging.SeriLog.Loggly" Version="1.0.2" />
<PackageReference Include="LittleBlocks.Logging.SeriLog.Seq" Version="1.0.2" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="LittleBlocks.RestEase" Version="2.0.0" />
<PackageReference Include="LittleBlocks.AspNetCore.Bootstrap" Version="2.0.0" />
<PackageReference Include="LittleBlocks.Logging.SeriLog.Loggly" Version="2.0.0" />
<PackageReference Include="LittleBlocks.Logging.SeriLog.Seq" Version="2.0.0" />
<PackageReference Include="MediatR" Version="12.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/templatepack.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>1.0.0</PackageVersion>
<PackageVersion>2.0.0</PackageVersion>
<PackageId>LittleBlocks.API</PackageId>
<Title>LittleBlocks Solution Template</Title>
<Authors>Mohammad Moattar</Authors>
<Description>Template generator for LittleBlocks framework</Description>
<PackageTags>dotnet-new;templates;LittleBlocks</PackageTags>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RepositoryUrl>https://github.com/LittleBlocks/LittleBlocks.Templates</RepositoryUrl>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down