Skip to content

Commit

Permalink
migration to dotnet 7
Browse files Browse the repository at this point in the history
  • Loading branch information
lkurzyniec committed Nov 14, 2022
1 parent 34251c1 commit 59e942a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<Authors>Łukasz Kurzyniec</Authors>
<Copyright>Copyright © happy+code Łukasz Kurzyniec 2022</Copyright>
<Version>1.2.1</Version>
<Version>1.3.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
15 changes: 5 additions & 10 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<EnablePackageVersionOverride>false</EnablePackageVersionOverride>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AspNetCore.HealthChecks.MySql" Version="6.0.2" />
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
Expand All @@ -14,19 +13,16 @@
<PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="dbup-sqlserver" Version="4.6.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="AutoFixture" Version="4.17.0" />
<PackageVersion Include="AutoFixture.Xunit2" Version="4.17.0" />
Expand All @@ -36,31 +32,30 @@
</PackageVersion>
<PackageVersion Include="FluentAssertions" Version="6.8.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
<PackageVersion Include="MockQueryable.Moq" Version="6.0.1" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq.AutoMock" Version="3.4.0" />
<PackageVersion Include="NBomber.Http" Version="1.1.1" />
<PackageVersion Include="Verify.Http" Version="3.0.0" />
<PackageVersion Include="Verify.Xunit" Version="18.3.0" />
<PackageVersion Include="Verify.Http" Version="4.0.0" />
<PackageVersion Include="Verify.Xunit" Version="19.0.0" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
</ItemGroup>

<ItemGroup>
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</GlobalPackageReference>
</ItemGroup>
<ItemGroup Condition="'$(ProjectName.EndsWith(`Tests`))' == 'False'">
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.3.48">
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</GlobalPackageReference>
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# netcore-boilerplate

Boilerplate of API in ~~`.NET Core 3.1`~~ `.NET 6`
Boilerplate of API in ~~`.NET Core 3.1`~~ `.NET 7`

| GitHub | Codecov |
|:-------------:|:-------------:|
Expand Down
4 changes: 2 additions & 2 deletions dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /work

COPY ./Directory.Build.props ./
Expand All @@ -25,7 +25,7 @@ RUN dotnet publish -c Release -o /app --no-restore

LABEL maintainer="Lukasz Kurzyniec ([email protected])"

FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS final
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
WORKDIR /app
COPY --from=publish /app .

Expand Down

0 comments on commit 59e942a

Please sign in to comment.