feat: add update versjon to .net 8

loekensgard · loekensgard · commit 710f440e00f5 · 2023-11-16T15:05:30.000+01:00
diff --git a/samples/MinimalApiSample/MinimalApiSample.csproj b/samples/MinimalApiSample/MinimalApiSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/samples/WebSample/RequestValidationMiddleware.cs b/samples/WebSample/RequestValidationMiddleware.cs
@@ -1,6 +1,18 @@
-﻿namespace WebSample
+﻿using Microsoft.AspNetCore.Http;
+using Serilog;
+using System.Threading.Tasks;
+
+namespace WebSample
 {
-    internal class RequestValidationMiddleware
+    internal class RequestValidationMiddleware : IMiddleware
     {
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            var path = context.Request.Path.Value.ToLower();
+
+            Log.Information("Path requested: {path}", path);
+
+            await next(context);
+        }
     }
 }
diff --git a/samples/WebSample/Startup.cs b/samples/WebSample/Startup.cs
@@ -19,6 +19,7 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddSingleton<RequestValidationMiddleware>();
             services.AddControllersWithViews();
         }
 
diff --git a/samples/WebSample/WebSample.csproj b/samples/WebSample/WebSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>    
+    <TargetFramework>net8.0</TargetFramework>    
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/WorkerSample/WorkerSample.csproj b/samples/WorkerSample/WorkerSample.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>dotnet-WorkerSample-E1FD34C8-B239-4D87-8143-0BA5129DDB52</UserSecretsId>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Intility.Extensions.Logging.Dynatrace/Intility.Extensions.Logging.Dynatrace.csproj b/src/Intility.Extensions.Logging.Dynatrace/Intility.Extensions.Logging.Dynatrace.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Intility.Extensions.Logging.Elasticsearch/Intility.Extensions.Logging.Elasticsearch.csproj b/src/Intility.Extensions.Logging.Elasticsearch/Intility.Extensions.Logging.Elasticsearch.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj b/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -19,8 +19,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Sentry.AspNetCore" Version="3.40.1" />
-		<PackageReference Include="Sentry.Serilog" Version="3.40.1" />
+		<PackageReference Include="Sentry.AspNetCore" Version="3.41.0" />
+		<PackageReference Include="Sentry.Serilog" Version="3.41.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj b/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -20,7 +20,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Serilog" Version="3.0.1" />
+		<PackageReference Include="Serilog" Version="3.1.1" />
 	</ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
@@ -31,6 +31,10 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="../../assets/intility-logo.png" Pack="true" Visible="false" PackagePath="\" />
   </ItemGroup>
diff --git a/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj b/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -24,7 +24,7 @@
 		<PackageReference Include="Serilog.Enrichers.AssemblyName" Version="1.0.9" />
 		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
 		<PackageReference Include="Serilog.Enrichers.Memory" Version="1.0.4" />
-    <PackageReference Include="Serilog.Enrichers.AzureClaims" Version="1.0.1" />
+    <PackageReference Include="Serilog.Enrichers.AzureClaims" Version="1.0.2" />
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 	</ItemGroup>
 
@@ -39,6 +39,12 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+  </ItemGroup>
   
 	<ItemGroup>
 		<ProjectReference Include="..\Intility.Extensions.Logging\Intility.Extensions.Logging.csproj" />
diff --git a/src/Intility.Logging.AspNetCore/LoggerBuilderExtensions.cs b/src/Intility.Logging.AspNetCore/LoggerBuilderExtensions.cs
@@ -17,6 +17,8 @@ public static ILoggerBuilder UseDefaultEnrichers(this ILoggerBuilder builder)
                 .Enrich.WithMachineName()
                 .Enrich.WithAssemblyName()
                 .Enrich.WithMemoryUsage()
+                .Enrich.WithObjectId()
+                .Enrich.WithTenantId()
                 .Enrich.WithDisplayName()
                 .Enrich.WithAppId();
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,18 @@`
`1`		`-namespace WebSample`
	`1`	`+using Microsoft.AspNetCore.Http;`
	`2`	`+using Serilog;`
	`3`	`+using System.Threading.Tasks;`
	`4`	`+`
	`5`	`+namespace WebSample`
`2`	`6`	`{`
`3`		`- internal class RequestValidationMiddleware`
	`7`	`+ internal class RequestValidationMiddleware : IMiddleware`
`4`	`8`	`{`
	`9`	`+ public async Task InvokeAsync(HttpContext context, RequestDelegate next)`
	`10`	`+ {`
	`11`	`+ var path = context.Request.Path.Value.ToLower();`
	`12`	`+`
	`13`	`+ Log.Information("Path requested: {path}", path);`
	`14`	`+`
	`15`	`+ await next(context);`
	`16`	`+ }`
`5`	`17`	`}`
`6`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public Startup(IConfiguration configuration)`
`19`	`19`	`// This method gets called by the runtime. Use this method to add services to the container.`
`20`	`20`	`public void ConfigureServices(IServiceCollection services)`
`21`	`21`	`{`
	`22`	`+ services.AddSingleton<RequestValidationMiddleware>();`
`22`	`23`	`services.AddControllersWithViews();`
`23`	`24`	`}`
`24`	`25`