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

Commit d543280

Browse files
authored
feat: update services to .NET 5 (#233)
* update enrolling service to .NET 5 GA * update WebStatus project * update .NET version in Dockerfile
1 parent d5835ca commit d543280

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/Libraries/OpenTelemetry/OpenTelemetry.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<!-- Asp.net required packages -->
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20451.14" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.1.20451.14" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
1616

1717
<!-- OpenTelemetry -->
1818
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="0.4.0-beta.2" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
2121

2222
<!-- For validating inputs -->
23-
<PackageReference Include="FluentValidation.AspNetCore" Version="9.2.0" />
23+
<PackageReference Include="FluentValidation.AspNetCore" Version="9.3.0" />
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.6.3" />
3636

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0-preview.7.20365.19" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1515
<PackageReference Include="xunit" Version="2.4.1" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
1717
<PackageReference Include="coverlet.collector" Version="1.3.0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.1.20451.13" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1.20451.13" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
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
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1313
<PackageReference Include="xunit" Version="2.4.1" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1515
<PrivateAssets>all</PrivateAssets>

src/Web/WebStatus/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/Web/WebStatus/WebStatus.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>WebStatus</AssemblyName>
66
<RootNamespace>OpenCodeFoundation.ESchool.Web.WebStatus</RootNamespace>
77
</PropertyGroup>

0 commit comments

Comments
 (0)