Skip to content

Commit a08a4f4

Browse files
nitin27maynitin27may
authored
Upgrade and Docker setup fix (#9)
* Angular Upgrade * docker setup update and nuget package update
1 parent 909e829 commit a08a4f4

29 files changed

+6272
-6389
lines changed

‎Api/Application/Application.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="AutoMapper" Version="12.0.0" />
8-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
9-
<PackageReference Include="FluentValidation" Version="11.4.0" />
10-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.4.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
12-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
15-
<PackageReference Include="System.Text.Json" Version="7.0.0" />
7+
<PackageReference Include="AutoMapper" Version="12.0.1" />
8+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
9+
<PackageReference Include="FluentValidation" Version="11.8.0" />
10+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
12+
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15+
<PackageReference Include="System.Text.Json" Version="7.0.3" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<ProjectReference Include="..\Domain\Domain.csproj" />

‎Api/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:7 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
44
WORKDIR /app
55
EXPOSE 8000
66
ENV ASPNETCORE_URLS=http://+:8000
@@ -9,7 +9,7 @@ RUN groupadd -g 2000 dotnet \
99
USER dotnet
1010

1111

12-
FROM mcr.microsoft.com/dotnet/sdk:7 AS build
12+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
1313
WORKDIR /src
1414
COPY ["WebApi/WebApi.csproj", "WebApi/"]
1515
COPY ["Application/Application.csproj", "Application/"]

‎Api/Infrastructure.Identity/Infrastructure.Identity.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
<LangVersion>latest</LangVersion>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
8-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
7+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
8+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.13" />
9+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.13" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="microsoft.extensions.dependencyinjection" Version="7.0.0" />
15-
<PackageReference Include="MimeKit" Version="3.4.3" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
15+
<PackageReference Include="MimeKit" Version="4.2.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
1818
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
19-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" />
19+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
2020
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
2121
</ItemGroup>
2222
<ItemGroup>

‎Api/Infrastructure.Identity/ServiceExtensions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public static void AddIdentityInfrastructure(this IServiceCollection services, I
3737
}
3838
services.AddIdentity<ApplicationUser, IdentityRole>().AddEntityFrameworkStores<IdentityContext>().AddDefaultTokenProviders();
3939

40-
4140
#region Services
4241
services.AddTransient<IAccountService, AccountService>();
4342
#endregion
@@ -88,5 +87,7 @@ public static void AddIdentityInfrastructure(this IServiceCollection services, I
8887
},
8988
};
9089
});
90+
91+
9192
}
9293
}

‎Api/Infrastructure.Identity/Services/AccountService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public async Task<Response<string>> RegisterAsync(RegisterRequest request, strin
107107
if (result.Succeeded)
108108
{
109109
await _userManager.AddToRoleAsync(user, Roles.Basic.ToString());
110-
var verificationUri = await SendVerificationEmail(user, origin);
110+
// var verificationUri = await SendVerificationEmail(user, origin);
111111
//TODO: If implementing email verification Attach Email Service here (uncomment it) and configure variables via appsettings
112112
// await _emailService.SendAsync(new Application.DTOs.Email.EmailRequest() { From = "nitin27may@gmail.com", To = user.Email, Body = $"Please confirm your account by visiting this URL {verificationUri}", Subject = "Confirm Registration" });
113113
//return new Response<string>(user.Id, message: $"User Registered. Please confirm your account by visiting this URL {verificationUri}");

‎Api/Infrastructure.Persistence/Infrastructure.Persistence.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.13" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
1313
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
14-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
14+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
1515
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
1616
</ItemGroup>
1717

‎Api/Infrastructure.Shared/Infrastructure.Shared.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<ProjectReference Include="..\Application\Application.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="MailKit" Version="3.4.3" />
13+
<PackageReference Include="MailKit" Version="4.2.0" />
1414
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
15-
<PackageReference Include="MimeKit" Version="3.4.3" />
15+
<PackageReference Include="MimeKit" Version="4.2.0" />
1616
<PackageReference Include="SendGrid" Version="9.28.1" />
1717
</ItemGroup>
1818
</Project>

‎Api/Migration.Dockerfile‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Api/WebApi/Startup.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
using Application;
22
using Application.Interfaces;
33
using Infrastructure.Identity;
4+
using Infrastructure.Identity.Contexts;
45
using Infrastructure.Persistence;
6+
using Infrastructure.Persistence.Contexts;
57
using Infrastructure.Shared;
68
using Microsoft.AspNetCore.Builder;
79
using Microsoft.AspNetCore.Hosting;
10+
using Microsoft.EntityFrameworkCore;
811
using Microsoft.Extensions.Configuration;
912
using Microsoft.Extensions.DependencyInjection;
1013
using Microsoft.Extensions.Hosting;
@@ -57,5 +60,16 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
5760
{
5861
endpoints.MapControllers();
5962
});
63+
using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
64+
{
65+
var context = serviceScope.ServiceProvider.GetService<ApplicationDbContext>();
66+
context.Database.Migrate();
67+
}
68+
69+
using (var serviceScope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope())
70+
{
71+
var context = serviceScope.ServiceProvider.GetService<IdentityContext>();
72+
context.Database.Migrate();
73+
}
6074
}
6175
}

‎Api/WebApi/WebApi.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
1212
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
13-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />
14-
<PackageReference Include="NSwag.Annotations" Version="13.18.0" />
15-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
16-
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
17-
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
18-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
13+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
14+
<PackageReference Include="NSwag.Annotations" Version="13.20.0" />
15+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
16+
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
17+
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
18+
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
1919
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
2020
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
21-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
22-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.0.0" />
23-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
25-
<PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
21+
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
22+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
23+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.13" />
25+
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<ProjectReference Include="..\Application\Application.csproj" />
@@ -31,6 +31,6 @@
3131
<ProjectReference Include="..\Infrastructure.Shared\Infrastructure.Shared.csproj" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
34+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
3535
</ItemGroup>
3636
</Project>

0 commit comments

Comments
 (0)