Skip to content

Commit 32b14d4

Browse files
committed
update auth service dependencies
1 parent 239f12b commit 32b14d4

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

HwProj.AuthService/HwProj.AuthService.API/Controllers/AccountController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
namespace HwProj.AuthService.API.Controllers;
1414

15-
[Route("api/account")]
15+
[Route("api/[controller]")]
1616
[ApiController]
17-
public class AccountController : ControllerBase
17+
public class AccountController : Controller
1818
{
1919
private readonly IAccountService _accountService;
2020
private readonly IUserManager _userManager;

HwProj.AuthService/HwProj.AuthService.API/HwProj.AuthService.API.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
66
<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
77
<DockerfileContext>..\..</DockerfileContext>
8-
<LangVersion>$(CSharpLanguageVersion)</LangVersion>
8+
<LangVersion>10</LangVersion>
99
<UserSecretsId>603911e4-ace8-4439-96f8-1705a0dae761</UserSecretsId>
1010
<Nullable>$(NullableReferenceTypes)</Nullable>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Google.Apis.Auth" Version="1.54.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.2.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
17-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
20-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.14" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.14" />
16+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.14" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
18+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.12" />
19+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.14" />
21+
<PackageReference Include="Google.Apis.Auth" Version="1.60.0" />
2122
</ItemGroup>
2223

2324
<ItemGroup>

HwProj.AuthService/HwProj.AuthService.API/Models/IdentityContext.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using HwProj.Models.AuthService.ViewModels;
22
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
33
using Microsoft.EntityFrameworkCore;
4-
54
namespace HwProj.AuthService.API.Models;
65

76
public sealed class IdentityContext : IdentityDbContext<User>

HwProj.AuthService/HwProj.AuthService.Client/AuthServiceClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using HwProj.HttpUtils;
66
using HwProj.Models.AuthService.ViewModels;
77
using HwProj.Models.AuthService.DTO;
8-
using Newtonsoft.Json;
98
using HwProj.Models.Result;
109
using Microsoft.Extensions.Configuration;
10+
using Newtonsoft.Json;
1111

1212
namespace HwProj.AuthService.Client;
1313

HwProj.SolutionsService/HwProj.SolutionsService.API/HwProj.SolutionsService.API.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
55
<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
66
<DockerfileContext>..\..</DockerfileContext>
7-
<LangVersion>$(CSharpLanguageVersion)</LangVersion>
7+
<LangVersion>10</LangVersion>
88
<Nullable>$(NullableReferenceTypes)</Nullable>
99
<UserSecretsId>467aaa56-ee17-4f11-b2da-7d9a74c68753</UserSecretsId>
1010
</PropertyGroup>
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="AutoMapper" Version="12.0.0" />
2222
<PackageReference Include="Docker.DotNet" Version="3.125.5" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.14" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<ProjectReference Include="..\..\HwProj.AuthService\HwProj.AuthService.Client\HwProj.AuthService.Client.csproj" />

global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "6.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": true
6+
}
7+
}

0 commit comments

Comments
 (0)