#7 (comment) #7

maikebing · maikebing · commit fa5c22ed1475 · 2023-06-19T11:16:23.000+08:00
diff --git a/Source/Extensions/ServiceCollectionExtensions.cs b/Source/Extensions/ServiceCollectionExtensions.cs
@@ -101,13 +101,12 @@ public static IApplicationBuilder UseAttributeRouting(this IApplicationBuilder a
             var interceptor = app.ApplicationServices.GetService<IRouteInvocationInterceptor>();
             server.InterceptingPublishAsync += async (args) =>
             {
-                if (interceptor != null)
-                {
-                    await interceptor.RouteExecuting(args.ClientId, args.ApplicationMessage);
-                }
                 try
                 {
+                    await interceptor?.RouteExecuting(args.ClientId, args.ApplicationMessage);
                     await router.OnIncomingApplicationMessage(app.ApplicationServices, args, allowUnmatchedRoutes);
+                    await interceptor?.RouteExecuted(args, null);
+
                 }
                 catch (Exception ex)
                 {
diff --git a/Source/MQTTnet.AspNetCore.Routing.csproj b/Source/MQTTnet.AspNetCore.Routing.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Description>
 			This is a support library to integrate AttributeRouting into MQTTnet with AspNetCore.

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,12 @@ public static IApplicationBuilder UseAttributeRouting(this IApplicationBuilder a`
`101`	`101`	`var interceptor = app.ApplicationServices.GetService<IRouteInvocationInterceptor>();`
`102`	`102`	`server.InterceptingPublishAsync += async (args) =>`
`103`	`103`	`{`
`104`		`- if (interceptor != null)`
`105`		`- {`
`106`		`- await interceptor.RouteExecuting(args.ClientId, args.ApplicationMessage);`
`107`		`- }`
`108`	`104`	`try`
`109`	`105`	`{`
	`106`	`+ await interceptor?.RouteExecuting(args.ClientId, args.ApplicationMessage);`
`110`	`107`	`await router.OnIncomingApplicationMessage(app.ApplicationServices, args, allowUnmatchedRoutes);`
	`108`	`+ await interceptor?.RouteExecuted(args, null);`
	`109`	`+`
`111`	`110`	`}`
`112`	`111`	`catch (Exception ex)`
`113`	`112`	`{`