sxhundred/TxSearchApi
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

net 6 migration

Browse Source
This commit is contained in:
Roland Fieger
2021-10-15 09:14:09 +02:00
parent f8c6316d4e
commit 505487a345
7 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BusinessLogic/LookupLogic/LookupLogic.csproj
View File

@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-rc.2.21480.5" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
BusinessLogic/SearchLogic/SearchLogic.csproj
View File

@@ -5,6 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup> </ItemGroup>

2
Repositories/FwDbContext.cs
View File

@@ -14,7 +14,7 @@ namespace Repositories
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{ {
optionsBuilder.UseMySql(_connectionString); optionsBuilder.UseMySql(_connectionString, ServerVersion.AutoDetect(_connectionString));
} }
public DbSet<LookupCategory> LookupCategories { get; set; } public DbSet<LookupCategory> LookupCategories { get; set; }

3
Repositories/FwMariaLookupRepo.cs
View File

@@ -8,6 +8,7 @@ using Repositories.Interfaces;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using System.Configuration;
namespace Repositories namespace Repositories
{ {
@@ -30,7 +31,7 @@ namespace Repositories
} }
else else
{ {
string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Get<string>(); string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Value;
string connectionString = configuration.GetConnectionString(usedDb); string connectionString = configuration.GetConnectionString(usedDb);
_dbContext._connectionString = connectionString; _dbContext._connectionString = connectionString;
} }

2
Repositories/FwMariaSearchRepo.cs
View File

@@ -33,7 +33,7 @@ namespace Repositories
} }
else else
{ {
string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Get<string>(); string usedDb = configuration.GetSection("GeneralSettings").GetSection("DbToUse").Value;
string connectionString = configuration.GetConnectionString(usedDb); string connectionString = configuration.GetConnectionString(usedDb);
_dbContext._connectionString = connectionString; _dbContext._connectionString = connectionString;
} }

1
Repositories/Repositories.csproj
View File

@@ -8,6 +8,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0-preview.7" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0-preview.7" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-rc.2.21480.5" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />

1
SearchWebApi/SearchWebApi.csproj
View File

@@ -7,6 +7,7 @@
<PackageReference Include="Elastic.Apm.EntityFrameworkCore" Version="1.11.1" /> <PackageReference Include="Elastic.Apm.EntityFrameworkCore" Version="1.11.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.11.1" /> <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.11.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0-rc.2.21480.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-rc.2.21480.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta2" /> <PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta2" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.1.0" /> <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.1.0" />