From 6b13f929807740a48865acc336b343fc2ddb22a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:04:03 +0000 Subject: [PATCH] [deps]: Update dotnet monorepo to v9 (major) (#768) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jonas Hendrickx --- Directory.Build.props | 2 +- global.json | 2 +- src/AdminConsole/AdminConsole.csproj | 18 +++++++++--------- src/AdminConsole/appsettings.Development.json | 11 ++++++++--- src/Api/Api.csproj | 6 +++--- src/Api/OpenApi/OpenApiBootstrap.cs | 4 ++-- src/Api/Program.cs | 2 +- src/Api/appsettings.Development.json | 5 ----- src/Common/Common.csproj | 6 +++--- src/Service/Service.csproj | 16 ++++++++-------- .../AdminConsole.Tests.csproj | 2 +- .../Api.IntegrationTests.csproj | 4 ++-- tests/Service.Tests/Service.Tests.csproj | 2 +- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 451e3478f..229398ac3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 Passwordless.$(MSBuildProjectName) Passwordless.$(MSBuildProjectName) diff --git a/global.json b/global.json index 282c5a85d..a24b7440e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.203", + "version": "9.0.0", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/AdminConsole/AdminConsole.csproj b/src/AdminConsole/AdminConsole.csproj index a9cb402ae..8da188682 100644 --- a/src/AdminConsole/AdminConsole.csproj +++ b/src/AdminConsole/AdminConsole.csproj @@ -9,19 +9,19 @@ - + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + diff --git a/src/AdminConsole/appsettings.Development.json b/src/AdminConsole/appsettings.Development.json index bd5d7aee1..4e84fc543 100644 --- a/src/AdminConsole/appsettings.Development.json +++ b/src/AdminConsole/appsettings.Development.json @@ -10,9 +10,14 @@ "sqlite:admin": "Data Source=adminconsole_dev.db" }, "Mail": { - "File": { - "Path": "../mail.md" - } + "From": "hello@maila.passwordless.dev", + "FromName": "Bitwarden Passwordless.dev", + "Providers": [ + { + "Name": "file", + "Path": "../mail.md" + } + ] }, "Passwordless": { "ApiUrl": "http://localhost:7001", diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index 2f42242f1..5c630763b 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -13,12 +13,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Api/OpenApi/OpenApiBootstrap.cs b/src/Api/OpenApi/OpenApiBootstrap.cs index 0abc5f5f1..003dd08fc 100644 --- a/src/Api/OpenApi/OpenApiBootstrap.cs +++ b/src/Api/OpenApi/OpenApiBootstrap.cs @@ -7,7 +7,7 @@ namespace Passwordless.Api.OpenApi; public static class OpenApiBootstrap { - public static void AddOpenApi(this IServiceCollection services) + public static void AddPasswordlessOpenApi(this IServiceCollection services) { services.AddSwaggerGen(swagger => { @@ -60,7 +60,7 @@ public static void AddOpenApi(this IServiceCollection services) }); } - public static void UseOpenApi(this IApplicationBuilder app) + public static void UsePasswordlessOpenApi(this IApplicationBuilder app) { app.UseSwagger(c => c.PreSerializeFilters.Add((swaggerDoc, httpReq) => { diff --git a/src/Api/Program.cs b/src/Api/Program.cs index 45c6daf0a..8574db00f 100644 --- a/src/Api/Program.cs +++ b/src/Api/Program.cs @@ -123,7 +123,7 @@ "Hey, this place is for computers. Check out our human documentation instead: https://docs.passwordless.dev"); } -app.UseOpenApi(); +app.UsePasswordlessOpenApi(); if (builder.Configuration.IsSelfHosted()) { diff --git a/src/Api/appsettings.Development.json b/src/Api/appsettings.Development.json index 9e545ba9c..113d795b5 100644 --- a/src/Api/appsettings.Development.json +++ b/src/Api/appsettings.Development.json @@ -2,11 +2,6 @@ "ConnectionStrings": { "sqlite:api": "Data Source=passwordless_dev.db" }, - "Mail": { - "File": { - "Path": "../mail.md" - } - }, "PasswordlessManagement": { "ManagementKey": "shared_dev_key" }, diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj index 1db393ddf..f2ca25904 100644 --- a/src/Common/Common.csproj +++ b/src/Common/Common.csproj @@ -9,15 +9,15 @@ - - + + - + diff --git a/src/Service/Service.csproj b/src/Service/Service.csproj index a10c20bb2..38083a651 100644 --- a/src/Service/Service.csproj +++ b/src/Service/Service.csproj @@ -10,18 +10,18 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + diff --git a/tests/AdminConsole.Tests/AdminConsole.Tests.csproj b/tests/AdminConsole.Tests/AdminConsole.Tests.csproj index 70de7179a..f52477df4 100644 --- a/tests/AdminConsole.Tests/AdminConsole.Tests.csproj +++ b/tests/AdminConsole.Tests/AdminConsole.Tests.csproj @@ -3,7 +3,7 @@ - + diff --git a/tests/Api.IntegrationTests/Api.IntegrationTests.csproj b/tests/Api.IntegrationTests/Api.IntegrationTests.csproj index aca1a6a84..2770ea55f 100644 --- a/tests/Api.IntegrationTests/Api.IntegrationTests.csproj +++ b/tests/Api.IntegrationTests/Api.IntegrationTests.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/tests/Service.Tests/Service.Tests.csproj b/tests/Service.Tests/Service.Tests.csproj index 375492912..4f531d0a4 100644 --- a/tests/Service.Tests/Service.Tests.csproj +++ b/tests/Service.Tests/Service.Tests.csproj @@ -3,7 +3,7 @@ - +