From 47fc07cdcad4a689a67c138be12424e8de125238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Thu, 4 Jun 2026 06:34:22 +0200
Subject: [PATCH 1/5] Reference analyzer and fixer to avoid race conditions
 when packing

---
 .../NServiceBus.AzureFunctions.Common.csproj             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
index 3f7b3e5..684d388 100644
--- a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
+++ b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
@@ -15,6 +15,15 @@
     <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj"
+                      ReferenceOutputAssembly="false"
+                      PrivateAssets="all" />
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj"
+                      ReferenceOutputAssembly="false"
+                      PrivateAssets="all" />
+  </ItemGroup>
+
   <PropertyGroup>
     <Description>Shared source generator and hosting infrastructure for NServiceBus endpoints hosted in Azure Functions.</Description>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPropsFileToPackage</TargetsForTfmSpecificContentInPackage>

From 7da6930e44780a09c4e3acccb19b53b7afc997bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Thu, 4 Jun 2026 06:39:42 +0200
Subject: [PATCH 2/5] Refactor project file to consolidate package references
 for analyzer and code fixes

---
 .../NServiceBus.AzureFunctions.Common.csproj          | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
index 684d388..c11c5ec 100644
--- a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
+++ b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
@@ -13,15 +13,8 @@
 
   <ItemGroup Label="Private dependencies">
     <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj"
-                      ReferenceOutputAssembly="false"
-                      PrivateAssets="all" />
-    <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj"
-                      ReferenceOutputAssembly="false"
-                      PrivateAssets="all" />
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup>

From 1dcbb883a95ccc65e1762a2b175fdd9ca591db24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Thu, 4 Jun 2026 06:48:05 +0200
Subject: [PATCH 3/5] Organize project file by adding separate item group for
 private analyzer dependencies

---
 .../NServiceBus.AzureFunctions.Common.csproj                 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
index c11c5ec..e6ff688 100644
--- a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
+++ b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
@@ -13,10 +13,13 @@
 
   <ItemGroup Label="Private dependencies">
     <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
+  </ItemGroup>
+  
+  <ItemGroup Label="Private analyzer dependencies">
     <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
     <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
   </ItemGroup>
-
+  
   <PropertyGroup>
     <Description>Shared source generator and hosting infrastructure for NServiceBus endpoints hosted in Azure Functions.</Description>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPropsFileToPackage</TargetsForTfmSpecificContentInPackage>

From c543fe8d989e2b8daec504f8fe8a1014d9119361 Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Thu, 4 Jun 2026 08:09:51 +0200
Subject: [PATCH 4/5] Add project references for analyzer and code fixes

---
 .../NServiceBus.AzureFunctions.Common.csproj       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
index e6ff688..118675d 100644
--- a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
+++ b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
@@ -6,6 +6,11 @@
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
   <ItemGroup Label="Public dependencies">
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.52.0" />
     <PackageReference Include="NServiceBus" Version="10.2.4" />
@@ -13,13 +18,8 @@
 
   <ItemGroup Label="Private dependencies">
     <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
-  </ItemGroup>
-  
-  <ItemGroup Label="Private analyzer dependencies">
-    <ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
-    <ProjectReference Include="..\NServiceBus.AzureFunctions.CodeFixes\NServiceBus.AzureFunctions.CodeFixes.csproj" ReferenceOutputAssembly="false" PrivateAssets="All" />
-  </ItemGroup>
-  
+  </ItemGroup
+
   <PropertyGroup>
     <Description>Shared source generator and hosting infrastructure for NServiceBus endpoints hosted in Azure Functions.</Description>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddPropsFileToPackage</TargetsForTfmSpecificContentInPackage>

From c543491ed7a17866bf71fa76e6144d9e0abcdaf3 Mon Sep 17 00:00:00 2001
From: Daniel Marbach <daniel.marbach@openplace.net>
Date: Thu, 4 Jun 2026 08:12:03 +0200
Subject: [PATCH 5/5] Fix closing tag for Private dependencies ItemGroup

---
 .../NServiceBus.AzureFunctions.Common.csproj                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
index 118675d..031e0a5 100644
--- a/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
+++ b/src/NServiceBus.AzureFunctions.Common/NServiceBus.AzureFunctions.Common.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup Label="Private dependencies">
     <PackageReference Include="Particular.Packaging" Version="4.5.0" PrivateAssets="All" />
-  </ItemGroup
+  </ItemGroup>
 
   <PropertyGroup>
     <Description>Shared source generator and hosting infrastructure for NServiceBus endpoints hosted in Azure Functions.</Description>