From 85f9d357d5bfd03429a2b984f6017f3a539721e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 21:24:18 +0000
Subject: [PATCH 1/2] Bump the nservicebuscore group in /src with 4 updates

Bumps the nservicebuscore group in /src with 4 updates: [NServiceBus](https://github.com/Particular/NServiceBus), [NServiceBus.AcceptanceTesting](https://github.com/Particular/NServiceBus), [NServiceBus.AcceptanceTests.Sources](https://github.com/Particular/NServiceBus) and [NServiceBus.PersistenceTests.Sources](https://github.com/Particular/NServiceBus).


Updates `NServiceBus` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus.AcceptanceTesting` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus.AcceptanceTests.Sources` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus.AcceptanceTesting` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus.PersistenceTests.Sources` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

Updates `NServiceBus` from 9.0.0 to 9.1.0
- [Release notes](https://github.com/Particular/NServiceBus/releases)
- [Commits](https://github.com/Particular/NServiceBus/compare/9.0.0...9.1.0)

---
updated-dependencies:
- dependency-name: NServiceBus
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus.AcceptanceTesting
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus.AcceptanceTests.Sources
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus.AcceptanceTesting
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus.PersistenceTests.Sources
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
- dependency-name: NServiceBus
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nservicebuscore
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../NServiceBus.Storage.MongoDB.AcceptanceTests.csproj          | 2 +-
 .../NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj     | 2 +-
 .../NServiceBus.Storage.MongoDB.PersistenceTests.csproj         | 2 +-
 .../NServiceBus.Storage.MongoDB.Tests.csproj                    | 2 +-
 ....Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj | 2 +-
 ...ServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
index 00de3f1e..48da9056 100644
--- a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
index 00de3f1e..48da9056 100644
--- a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj b/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj
index 2176825f..f7271437 100644
--- a/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.PersistenceTests/NServiceBus.Storage.MongoDB.PersistenceTests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.PersistenceTests.Sources" Version="9.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj b/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj
index 313d7a26..efbb6caf 100644
--- a/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus" Version="9.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Particular.Approvals" Version="1.0.0" />
diff --git a/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj
index 863d9f4f..27fcec3b 100644
--- a/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.1.0" />
     <PackageReference Include="NServiceBus.TransactionalSession" Version="3.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj b/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj
index 0de6e6aa..dd6483cf 100644
--- a/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.TransactionalSession.Tests/NServiceBus.Storage.MongoDB.TransactionalSession.Tests.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus" Version="9.1.0" />
     <PackageReference Include="NServiceBus.TransactionalSession" Version="3.0.0" />
     <PackageReference Include="Particular.Approvals" Version="1.0.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />

From 0e3caa21758e7aac0d30cbce55c222f3e9177b14 Mon Sep 17 00:00:00 2001
From: Mauro Servienti <mauro.servienti@gmail.com>
Date: Wed, 24 Jul 2024 14:49:32 +0200
Subject: [PATCH 2/2] Remove test files not meant to be included

---
 ...erviceBus.Storage.MongoDB.AcceptanceTests.csproj | 13 ++++++++++++-
 ...eBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
index 48da9056..ee4a6fa9 100644
--- a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
@@ -12,9 +12,20 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(PkgNServiceBus_AcceptanceTests_Sources)' != ''">
+    <!--
+    TODO: The following two tests were not meant to be included in the sources. A fix has been merged to Core master and release-9.1 in:
+    - https://github.com/Particular/NServiceBus/pull/7121
+    - https://github.com/Particular/NServiceBus/pull/7122
+    The following two MSBuild elements can be removed once a version of the ATT source package is released
+    -->
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Core\DependencyInjection\When_resolving_address_translator.cs" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Core\OpenTelemetry\Metrics\When_retrying_messages.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
index 48da9056..ee4a6fa9 100644
--- a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
+++ b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
@@ -12,9 +12,20 @@
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.1.0" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(PkgNServiceBus_AcceptanceTests_Sources)' != ''">
+    <!--
+    TODO: The following two tests were not meant to be included in the sources. A fix has been merged to Core master and release-9.1 in:
+    - https://github.com/Particular/NServiceBus/pull/7121
+    - https://github.com/Particular/NServiceBus/pull/7122
+    The following two MSBuild elements can be removed once a version of the ATT source package is released
+    -->
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Core\DependencyInjection\When_resolving_address_translator.cs" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Core\OpenTelemetry\Metrics\When_retrying_messages.cs" />
+  </ItemGroup>
+
 </Project>