Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit a03d284

Browse files
authored
feat(enrolling): update enrolling service to .NET 5.0 (#186)
.NET 5.0 is next version of framework which merge .NET framework and dotnet core to single version .NET 5. It is now in preview. But as an early adapter, I am updating the enrolling service first. Closes #167
1 parent 5344488 commit a03d284

7 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
# a pull request then we can checkout the head.
2020
fetch-depth: 2
2121

22+
- uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: '5.0.100-preview.6.20318.15'
25+
2226
# If this run was triggered by a pull request event, then checkout
2327
# the head of the pull request instead of the merge commit.
2428
- run: git checkout HEAD^2

src/Services/Enrolling/Enrolling.API/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
66
WORKDIR /src
77

88
COPY "eSchool.sln" "eSchool.sln"

src/Services/Enrolling/Enrolling.API/Enrolling.API.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<AssemblyName>Enrolling.API</AssemblyName>
77
<RootNamespace>OpenCodeFoundation.ESchool.Services.Enrolling.API</RootNamespace>
@@ -16,11 +16,11 @@
1616
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.1" />
1717

1818
<!-- In-memory commandbus -->
19-
<PackageReference Include="MediatR" Version="8.0.1" />
19+
<PackageReference Include="MediatR" Version="8.0.2" />
2020
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
2121

2222
<!-- For validating inputs -->
23-
<PackageReference Include="FluentValidation.AspNetCore" Version="8.6.2" />
23+
<PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
2424

2525
<!-- Polly is a .NET resilience and transient-fault-handling library that
2626
allows developers to express policies such as Retry, Circuit Breaker, Timeout,
@@ -35,7 +35,7 @@
3535
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
3636

3737
<!-- Need this package for generating migration files -->
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5">
38+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-preview.6.20312.4">
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4141
</PackageReference>

src/Services/Enrolling/Enrolling.Domain/Enrolling.Domain.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<AssemblyName>Enrolling.Domain</AssemblyName>
77
<RootNamespace>OpenCodeFoundation.ESchool.Services.Enrolling.Domain</RootNamespace>

src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<RootNamespace>OpenCodeFoundation.ESchool.Services.Enrolling.FunctionalTests</RootNamespace>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0-preview.6.20312.15" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
1515
<PackageReference Include="xunit" Version="2.4.1" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />

src/Services/Enrolling/Enrolling.Infrastructure/Enrolling.Infrastructure.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<AssemblyName>Enrolling.Infrastructure</AssemblyName>
77
<RootNamespace>OpenCodeFoundation.ESchool.Services.Enrolling.Infrastructure</RootNamespace>
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.6.20312.4" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.6.20312.4" />
2020

2121
<!-- Analyzers -->
2222
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />

src/Services/Enrolling/Enrolling.UnitTests/Enrolling.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77

0 commit comments

Comments
 (0)