From 505487a34583d3c785fb695461aa63391756d03f Mon Sep 17 00:00:00 2001 From: Roland Fieger Date: Fri, 15 Oct 2021 09:14:09 +0200 Subject: [PATCH] net 6 migration --- BusinessLogic/LookupLogic/LookupLogic.csproj | 9 ++-- BusinessLogic/SearchLogic/SearchLogic.csproj | 1 + Repositories/FwDbContext.cs | 2 +- Repositories/FwMariaLookupRepo.cs | 3 +- Repositories/FwMariaSearchRepo.cs | 2 +- Repositories/Repositories.csproj | 11 ++-- SearchWebApi/SearchWebApi.csproj | 53 ++++++++++---------- 7 files changed, 43 insertions(+), 38 deletions(-) diff --git a/BusinessLogic/LookupLogic/LookupLogic.csproj b/BusinessLogic/LookupLogic/LookupLogic.csproj index 843e53b..bedfc12 100644 --- a/BusinessLogic/LookupLogic/LookupLogic.csproj +++ b/BusinessLogic/LookupLogic/LookupLogic.csproj @@ -1,11 +1,12 @@ - - + + + - - + + net6.0 diff --git a/BusinessLogic/SearchLogic/SearchLogic.csproj b/BusinessLogic/SearchLogic/SearchLogic.csproj index 2e26a0e..1ce784d 100644 --- a/BusinessLogic/SearchLogic/SearchLogic.csproj +++ b/BusinessLogic/SearchLogic/SearchLogic.csproj @@ -5,6 +5,7 @@ + diff --git a/Repositories/FwDbContext.cs b/Repositories/FwDbContext.cs index 2850486..4d9e9cc 100644 --- a/Repositories/FwDbContext.cs +++ b/Repositories/FwDbContext.cs @@ -14,7 +14,7 @@ namespace Repositories protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseMySql(_connectionString); + optionsBuilder.UseMySql(_connectionString, ServerVersion.AutoDetect(_connectionString)); } public DbSet LookupCategories { get; set; } diff --git a/Repositories/FwMariaLookupRepo.cs b/Repositories/FwMariaLookupRepo.cs index 17b683e..12916e0 100644 --- a/Repositories/FwMariaLookupRepo.cs +++ b/Repositories/FwMariaLookupRepo.cs @@ -8,6 +8,7 @@ using Repositories.Interfaces; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Configuration; +using System.Configuration; namespace Repositories { @@ -30,7 +31,7 @@ namespace Repositories } else { - string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Get(); + string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Value; string connectionString = configuration.GetConnectionString(usedDb); _dbContext._connectionString = connectionString; } diff --git a/Repositories/FwMariaSearchRepo.cs b/Repositories/FwMariaSearchRepo.cs index 38cd248..36eda7d 100644 --- a/Repositories/FwMariaSearchRepo.cs +++ b/Repositories/FwMariaSearchRepo.cs @@ -33,7 +33,7 @@ namespace Repositories } else { - string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Get(); + string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Value; string connectionString = configuration.GetConnectionString(usedDb); _dbContext._connectionString = connectionString; } diff --git a/Repositories/Repositories.csproj b/Repositories/Repositories.csproj index 7f103af..2d40817 100644 --- a/Repositories/Repositories.csproj +++ b/Repositories/Repositories.csproj @@ -1,16 +1,17 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + + net6.0 diff --git a/SearchWebApi/SearchWebApi.csproj b/SearchWebApi/SearchWebApi.csproj index 3bfe3bb..bf04899 100644 --- a/SearchWebApi/SearchWebApi.csproj +++ b/SearchWebApi/SearchWebApi.csproj @@ -4,33 +4,34 @@ 10 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + \ No newline at end of file