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

Migration to net 6 - not working for now

Browse Source
This commit is contained in:
Roland Fieger
2021-10-14 16:53:06 +02:00
parent e9d30aad16
commit f8c6316d4e
13 changed files with 167 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SearchWebApi/Controllers/SearchController.cs
+1 -1
View File
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using System.Threading.Tasks;
using SearchLogic;
using SearchApi.SearchLogic;
using Datamodels.SearchModels;
using System.Collections.Generic;
using Datamodels.DatabaseModels;
SearchWebApi/SearchWebApi.csproj
+35 -40
View File
@@ -1,41 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Apm.EntityFrameworkCore" Version="1.11.1" />
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.11.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.16" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta2" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.1.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.1.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc7" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc7" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc7" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
<PackageReference Include="Serilog.Enrichers.ExceptionStackTraceHash" Version="1.3.0" />
<PackageReference Include="Serilog.Exceptions" Version="7.1.0" />
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="8.4.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Include="serilog.sinks.console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.2" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BusinessLogic\LookupLogic\LookupLogic.csproj" />
<ProjectReference Include="..\BusinessLogic\SearchLogic\SearchLogic.csproj" />
<ProjectReference Include="..\Datamodels\Datamodels.csproj" />
<ProjectReference Include="..\Repositories\Repositories.csproj" />
</ItemGroup>
</Project>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Apm.EntityFrameworkCore" 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="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta2"/>
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.1.0"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.1.0"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc7"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc7"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc7"/>
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0"/>
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0"/>
<PackageReference Include="Serilog.Enrichers.ExceptionStackTraceHash" Version="1.3.0"/>
<PackageReference Include="Serilog.Exceptions" Version="7.1.0"/>
<PackageReference Include="Serilog.Formatting.Elasticsearch" Version="8.4.1"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0"/>
<PackageReference Include="serilog.sinks.console" Version="4.0.0"/>
<PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.4.1"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.2"/>
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.2.2"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.2"/>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.2"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BusinessLogic\LookupLogic\LookupLogic.csproj"/>
<ProjectReference Include="..\BusinessLogic\SearchLogic\SearchLogic.csproj"/>
<ProjectReference Include="..\Datamodels\Datamodels.csproj"/>
<ProjectReference Include="..\Repositories\Repositories.csproj"/>
</ItemGroup>
</Project>
SearchWebApi/Startup.cs
+2 -2
View File
@@ -16,7 +16,7 @@ using OpenTelemetry.Trace;
using Repositories;
using Repositories.Interfaces;
using SearchLogic;
using SearchApi.SearchLogic;
namespace FwSearchApi
{
@@ -43,7 +43,7 @@ namespace FwSearchApi
services.AddTransient<ILookupLogic, FwLookupLogic>();
services.AddTransient<IFwMariaLookupRepo, FwMariaLookupRepo>();
services.AddTransient<IFwMariaSearchRepo, FwMariaSearchRepo>();
services.AddTransient<ISearchLogic, SearchLogic.SearchLogic>();
services.AddTransient<ISearchLogic, SearchLogic>();
services.AddSwaggerGen();
AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true); //needed if no Security is used when calling APM Server
services.AddOpenTelemetryTracing((builder) => builder