Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
include-prerelease: true
dotnet-version: '8.0'
# include-prerelease: true

- name: Restore dependencies
run: dotnet restore *.sln

- name: Build
run: dotnet build --no-restore *.sln

- name: Test
run: dotnet test --no-build --verbosity normal *.sln
2 changes: 1 addition & 1 deletion .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: '8.0'

# Publish
- name: Build, Pack & Publish ${{ matrix.project.name }} to ${{ matrix.nuget.name }}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AnalysisLevel>latest</AnalysisLevel>

<VersionPrefix>3.1</VersionPrefix>
<VersionSuffix>rc4</VersionSuffix>
<VersionSuffix>rc5</VersionSuffix>

<Authors>Sakura Akeno Isayeki</Authors>
<Company>Nodsoft Systems</Company>
Expand Down
6 changes: 3 additions & 3 deletions SocialGuard.Api.DbMigrator/SocialGuard.Api.DbMigrator.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-SocialGuard.Api.DbMigrator-3AA5545F-89A5-43BD-81AE-EEB10C452C57</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mapster.Async" Version="2.0.0" />
<PackageReference Include="Mapster.EFCore" Version="5.1.0" />
<PackageReference Include="Mapster.Async" Version="2.0.1" />
<PackageReference Include="Mapster.EFCore" Version="5.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SocialGuard.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
webBuilder.UseStartup<Startup>())
.UseSerilog();
.UseSerilog((hostingCtx, config) => config.ReadFrom.Configuration(hostingCtx.Configuration));
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity;
using Microsoft.IdentityModel.Tokens;
using SocialGuard.Common.Data.Models.Authentication;
using System.IdentityModel.Tokens.Jwt;
Expand Down Expand Up @@ -141,4 +141,4 @@ public record AuthServiceResponse<T>
public Response<T> Response { get; init; }
}

public record AuthServiceResponse : AuthServiceResponse<object>;
public sealed record AuthServiceResponse : AuthServiceResponse<object>;
37 changes: 17 additions & 20 deletions SocialGuard.Api/SocialGuard.Api.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<UserSecretsId>328b09f5-4635-4228-b9af-a4f5bab47844</UserSecretsId>
<ImplicitUsings>true</ImplicitUsings>
</PropertyGroup>
Expand All @@ -16,28 +16,25 @@

<ItemGroup>
<PackageReference Include="AspNetCore.Identity.Mongo" Version="8.3.3"/>
<PackageReference Include="EFCore.NamingConventions" Version="6.0.0"/>
<PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="6.0.1"/>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.20.0"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.3"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0"/>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.3"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.3">
<PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
<PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.1.2" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.3"/>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0"/>
<PackageReference Include="MongoDB.Driver" Version="2.15.0"/>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3"/>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0"/>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0"/>
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0"/>
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.15" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
</ItemGroup>

Expand Down
Loading
Loading