refs

SimonCropp · SimonCropp · commit 9b37822cfd23 · 2025-02-12T23:18:05.000+11:00
diff --git a/readme.md b/readme.md
@@ -96,7 +96,7 @@ public class MessageHandler1 :
     IWantToRunAfter<MessageHandler3>
 {
 ```
-<sup><a href='/src/Tests/Snippets/MessageHandler1.cs#L3-L8' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order1-1' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Snippets/MessageHandler1.cs#L1-L6' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order1-1' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -118,7 +118,7 @@ public class MessageHandler2 :
     IWantToRunAfter<MessageHandler1>
 {
 ```
-<sup><a href='/src/Tests/Snippets/MessageHandler2.cs#L3-L8' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order2-1' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Snippets/MessageHandler2.cs#L1-L6' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order2-1' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -166,7 +166,7 @@ public class MessageHandler1 :
     IWantToRunAfter<MessageHandler3>
 {
 ```
-<sup><a href='/src/Tests/Snippets/MessageHandler1.cs#L3-L8' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order1-1' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Snippets/MessageHandler1.cs#L1-L6' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order1-1' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -188,7 +188,7 @@ public class MessageHandler2 :
     IWantToRunAfter<MessageHandler1>
 {
 ```
-<sup><a href='/src/Tests/Snippets/MessageHandler2.cs#L3-L8' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order2-1' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Snippets/MessageHandler2.cs#L1-L6' title='Snippet source file'>snippet source</a> | <a href='#snippet-express-order2-1' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
diff --git a/src/HandlerOrdering.sln b/src/HandlerOrdering.sln
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		Directory.Build.props = Directory.Build.props
+		global.json = global.json
 	EndProjectSection
 EndProject
 Global
diff --git a/src/HandlerOrdering/NServiceBus.HandlerOrdering.csproj b/src/HandlerOrdering/NServiceBus.HandlerOrdering.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="8.2.4" />
+    <PackageReference Include="NServiceBus" Version="9.2.5" />
     <PackageReference Include="ProjectDefaults" Version="1.0.147" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
   </ItemGroup>
diff --git a/src/HandlerOrdering/OrderHandlers.cs b/src/HandlerOrdering/OrderHandlers.cs
@@ -9,7 +9,7 @@ public void Customize(EndpointConfiguration configuration)
         }
     }
 
-    public void ApplyInterfaceHandlerOrdering(EndpointConfiguration configuration)
+    static void ApplyInterfaceHandlerOrdering(EndpointConfiguration configuration)
     {
         var handlerDependencies = GetHandlerDependencies(configuration);
         var sorted = new TypeSorter(handlerDependencies).Sorted;
@@ -24,6 +24,7 @@ static Dictionary<Type, List<Type>> GetHandlerDependencies(EndpointConfiguration
         {
             throw new($"Could not extract 'scannedTypes' field from {nameof(EndpointConfiguration)}. Raise an issue here https://github.com/NServiceBusExtensions/NServiceBus.HandlerOrdering/issues/new");
         }
+
         var types = (List<Type>) field.GetValue(configuration)!;
         return GetHandlerDependencies(types);
     }
@@ -40,17 +41,21 @@ internal static Dictionary<Type, List<Type>> GetHandlerDependencies(List<Type> t
                 {
                     continue;
                 }
+
                 if (face.GetGenericTypeDefinition() != typeof(IWantToRunAfter<>))
                 {
                     continue;
                 }
+
                 if (!dictionary.TryGetValue(type, out var dependencies))
                 {
                     dictionary[type] = dependencies = new();
                 }
+
                 dependencies.Add(face.GenericTypeArguments.First());
             }
         }
+
         return dictionary;
     }
 }
diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="8.2.4" />
+    <PackageReference Include="NServiceBus" Version="9.2.5" />
     <ProjectReference Include="..\HandlerOrdering\NServiceBus.HandlerOrdering.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Tests/Snippets/MessageHandler1.cs b/src/Tests/Snippets/MessageHandler1.cs
@@ -1,6 +1,4 @@
-﻿using NServiceBus;
-
-#region express-order1
+﻿#region express-order1
 public class MessageHandler1 :
     IHandleMessages<MyMessage>,
     IWantToRunAfter<MessageHandler3>
diff --git a/src/Tests/Snippets/MessageHandler2.cs b/src/Tests/Snippets/MessageHandler2.cs
@@ -1,6 +1,4 @@
-﻿using NServiceBus;
-
-#region express-order2
+﻿#region express-order2
 public class MessageHandler2 :
     IHandleMessages<MyMessage>,
     IWantToRunAfter<MessageHandler1>
diff --git a/src/Tests/Snippets/MessageHandler3.cs b/src/Tests/Snippets/MessageHandler3.cs
@@ -1,6 +1,4 @@
-﻿using NServiceBus;
-
-public class MessageHandler3 :
+﻿public class MessageHandler3 :
     IHandleMessages<MyMessage>
 {
     public Task Handle(MyMessage message, IMessageHandlerContext context) =>
diff --git a/src/Tests/Snippets/MyMessage.cs b/src/Tests/Snippets/MyMessage.cs
@@ -1,6 +1,4 @@
-﻿using NServiceBus;
-
-public class MyMessage :
+﻿public class MyMessage :
     IMessage
 {
     public Guid Id { get; set; }
diff --git a/src/Tests/Snippets/Usage.cs b/src/Tests/Snippets/Usage.cs
@@ -1,4 +1,4 @@
-﻿using NServiceBus;
+﻿#pragma warning disable IDE0021
 
 class Usage
 {
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" PrivateAssets="all" />
diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 ﻿{
   "sdk": {
-    "version": "8.0.101",
+    "version": "9.0.200",
     "allowPrerelease": true,
     "rollForward": "latestFeature"
   }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public void Customize(EndpointConfiguration configuration)`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`- public void ApplyInterfaceHandlerOrdering(EndpointConfiguration configuration)`
	`12`	`+ static void ApplyInterfaceHandlerOrdering(EndpointConfiguration configuration)`
`13`	`13`	`{`
`14`	`14`	`var handlerDependencies = GetHandlerDependencies(configuration);`
`15`	`15`	`var sorted = new TypeSorter(handlerDependencies).Sorted;`
`@@ -24,6 +24,7 @@ static Dictionary<Type, List<Type>> GetHandlerDependencies(EndpointConfiguration`
`24`	`24`	`{`
`25`	`25`	`throw new($"Could not extract 'scannedTypes' field from {nameof(EndpointConfiguration)}. Raise an issue here https://github.com/NServiceBusExtensions/NServiceBus.HandlerOrdering/issues/new");`
`26`	`26`	`}`
	`27`	`+`
`27`	`28`	`var types = (List<Type>) field.GetValue(configuration)!;`
`28`	`29`	`return GetHandlerDependencies(types);`
`29`	`30`	`}`
`@@ -40,17 +41,21 @@ internal static Dictionary<Type, List<Type>> GetHandlerDependencies(List<Type> t`
`40`	`41`	`{`
`41`	`42`	`continue;`
`42`	`43`	`}`
	`44`	`+`
`43`	`45`	`if (face.GetGenericTypeDefinition() != typeof(IWantToRunAfter<>))`
`44`	`46`	`{`
`45`	`47`	`continue;`
`46`	`48`	`}`
	`49`	`+`
`47`	`50`	`if (!dictionary.TryGetValue(type, out var dependencies))`
`48`	`51`	`{`
`49`	`52`	`dictionary[type] = dependencies = new();`
`50`	`53`	`}`
	`54`	`+`
`51`	`55`	`dependencies.Add(face.GenericTypeArguments.First());`
`52`	`56`	`}`
`53`	`57`	`}`
	`58`	`+`
`54`	`59`	`return dictionary;`
`55`	`60`	`}`
`56`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using NServiceBus;`
`2`		`-`
`3`		`-public class MessageHandler3 :`
	`1`	`+public class MessageHandler3 :`
`4`	`2`	`IHandleMessages<MyMessage>`
`5`	`3`	`{`
`6`	`4`	`public Task Handle(MyMessage message, IMessageHandlerContext context) =>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using NServiceBus;`
`2`		`-`
`3`		`-public class MyMessage :`
	`1`	`+public class MyMessage :`
`4`	`2`	`IMessage`
`5`	`3`	`{`
`6`	`4`	`public Guid Id { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using NServiceBus;`
	`1`	`+#pragma warning disable IDE0021`
`2`	`2`
`3`	`3`	`class Usage`
`4`	`4`	`{`