From 921773ecb54355599a98126c848df786436ab495 Mon Sep 17 00:00:00 2001 From: Tudor Stanciu Date: Sun, 5 Dec 2021 23:22:08 +0200 Subject: [PATCH] Upgrade services to net5.0 --- dependencies.props | 14 +++++++------- .../NetworkResurrector.Api.Application.csproj | 2 +- .../NetworkResurrector.Api.Domain.Data.csproj | 2 +- .../NetworkResurrector.Api.Domain.csproj | 2 +- .../NetworkResurrector.Api.csproj | 6 +++--- src/api/NetworkResurrector.Api/Startup.cs | 3 ++- .../NetworkResurrector.Server.csproj | 6 +++--- .../PublishProfiles/FolderProfile.pubxml | 4 ++-- src/server/NetworkResurrector.Server/Startup.cs | 6 +++--- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dependencies.props b/dependencies.props index 6f93ade..1614ffa 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,17 +1,17 @@ - 3.1.8 + 5.0.0 + 5.0.1 4.1.0 3.1.0 4.0.0 5.6.1 - 9.0.0 - 7.0.0 + 10.1.1 + 8.1.1 6.0.0 - 5.3.1 - 3.1.3 - 1.0.0 + 5.0.12 + 1.0.2 1.0.0 - 1.0.6 + 1.0.7 \ No newline at end of file diff --git a/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj b/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj index 2407059..9e6acdd 100644 --- a/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj +++ b/src/api/NetworkResurrector.Api.Application/NetworkResurrector.Api.Application.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.1 diff --git a/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj b/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj index 95c5f5c..55f2fad 100644 --- a/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj +++ b/src/api/NetworkResurrector.Api.Domain.Data/NetworkResurrector.Api.Domain.Data.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj b/src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj index 9f5c4f4..d4c395e 100644 --- a/src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj +++ b/src/api/NetworkResurrector.Api.Domain/NetworkResurrector.Api.Domain.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj b/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj index eadafe9..01aa293 100644 --- a/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj +++ b/src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 Linux @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/api/NetworkResurrector.Api/Startup.cs b/src/api/NetworkResurrector.Api/Startup.cs index afee68b..198419d 100644 --- a/src/api/NetworkResurrector.Api/Startup.cs +++ b/src/api/NetworkResurrector.Api/Startup.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NDB.Extensions.Swagger; +using NDB.Extensions.Swagger.Constants; using NDB.Security.Authentication.Identity; using NetworkResurrector.Api.Application; using NetworkResurrector.Api.Domain.Data; @@ -43,7 +44,7 @@ namespace NetworkResurrector.Api typeof(Application.Mappings.MappingProfile).Assembly); // Swagger - services.AddSwagger("NetworkResurrector API"); + services.AddSwagger("NetworkResurrector API", AuthorizationType.InhouseIdentity); // Data access services.AddDataAccess(); diff --git a/src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj b/src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj index a8a0442..84a0b53 100644 --- a/src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj +++ b/src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml b/src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml index 7512149..15c1758 100644 --- a/src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml +++ b/src/server/NetworkResurrector.Server/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,10 +10,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - bin\Release\netcoreapp3.1\publish\ + bin\Release\net5.0\publish\ FileSystem - netcoreapp3.1 + net5.0 win-x64 f6600491-5d79-4548-8745-59d9d337d3db true diff --git a/src/server/NetworkResurrector.Server/Startup.cs b/src/server/NetworkResurrector.Server/Startup.cs index f8eb0fe..a8c5e24 100644 --- a/src/server/NetworkResurrector.Server/Startup.cs +++ b/src/server/NetworkResurrector.Server/Startup.cs @@ -1,4 +1,3 @@ -using AutoMapper; using MediatR; using MediatR.Pipeline; using Microsoft.AspNetCore.Builder; @@ -7,9 +6,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NDB.Extensions.Swagger; +using NDB.Extensions.Swagger.Constants; using NDB.Security.Authentication.Identity; -using NetworkResurrector.Server.Extensions; using NetworkResurrector.Server.Application; +using NetworkResurrector.Server.Extensions; using Newtonsoft.Json; using System.Reflection; @@ -43,7 +43,7 @@ namespace NetworkResurrector.Server typeof(Application.Mappings.MappingProfile).Assembly); // Swagger - services.AddSwagger("NetworkResurrector API"); + services.AddSwagger("NetworkResurrector API", AuthorizationType.InhouseIdentity); // Application services.AddApplicationServices();