Prepare for RTM (#481)

* Prepare for RTM * Tweaks --------- Co-authored-by: Brandon Ording <[email protected]>
Particular · Mar 6, 2024 · 2e6bdf7 · 2e6bdf7
1 parent bc97919
commit 2e6bdf7
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 136 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages

diff --git a/src/AcceptanceTests/AcceptanceTests.csproj b/src/AcceptanceTests/AcceptanceTests.csproj
@@ -12,34 +12,34 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0-alpha.2" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="9.0.0" GeneratePathProperty="true" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="$(NuGetPackageRoot)**\\ConfigureEndpointInMemoryPersistence.cs" />
-    <Compile Remove="$(NuGetPackageRoot)**\\ConfigureEndpointMsmqTransport.cs" />
-    <Compile Remove="$(NuGetPackageRoot)**\\DeterministicGuid.cs" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Audit\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Correlation\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\DataBus\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\DelayedDelivery\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Forwarding\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\MessageId\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Pipeline\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Recoverability\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Routing\**" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Satellites\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Scheduling\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\SelfVerification\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Serialization\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Sagas\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Outbox\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Timeout\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\TimeToBeReceived\*" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Tx\**" />
-    <Compile Remove="$(NuGetPackageRoot)**\\Versioning\*" />
+  <ItemGroup Condition="'$(PkgNServiceBus_AcceptanceTests_Sources)' != ''">
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\ConfigureEndpointInMemoryPersistence.cs" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\ConfigureEndpointMsmqTransport.cs" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\DeterministicGuid.cs" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Audit\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Correlation\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\DataBus\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\DelayedDelivery\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Forwarding\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\MessageId\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Pipeline\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Recoverability\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Routing\**" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Satellites\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Scheduling\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\SelfVerification\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Serialization\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Sagas\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Outbox\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Timeout\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\TimeToBeReceived\*" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Tx\**" />
+    <Compile Remove="$(PkgNServiceBus_AcceptanceTests_Sources)\**\Versioning\*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NServiceBus.UniformSession.Testing.Tests/APIApprovals.cs b/src/NServiceBus.UniformSession.Testing.Tests/APIApprovals.cs
@@ -11,7 +11,7 @@ public void Approve()
     {
         var publicApi = typeof(TestableUniformSession).Assembly.GeneratePublicApi(new ApiGeneratorOptions
         {
-            ExcludeAttributes = new[] { "System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute" }
+            ExcludeAttributes = ["System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute"]
         });
 
         Approver.Verify(publicApi);

diff --git a/src/NServiceBus.UniformSession.Testing.Tests/NServiceBus.UniformSession.Testing.Tests.csproj b/src/NServiceBus.UniformSession.Testing.Tests/NServiceBus.UniformSession.Testing.Tests.csproj
@@ -1,19 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.UniformSession.Testing\NServiceBus.UniformSession.Testing.csproj" />
-    <ProjectReference Include="..\UniformSession\NServiceBus.UniformSession.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.2" />
-    <PackageReference Include="NServiceBus.Testing" Version="9.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="9.0.0" />
+    <PackageReference Include="NServiceBus.Testing" Version="9.0.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.UniformSession.Testing/NServiceBus.UniformSession.Testing.csproj b/src/NServiceBus.UniformSession.Testing/NServiceBus.UniformSession.Testing.csproj
@@ -1,10 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>NServiceBus Uniform Session Testing</Description>
   </PropertyGroup>
 
@@ -13,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Testing" Version="9.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus.Testing" Version="[9.0.0, 10.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/NServiceBus.UniformSession.Testing/TestableUniformSession.cs b/src/NServiceBus.UniformSession.Testing/TestableUniformSession.cs
@@ -5,27 +5,47 @@
     using System.Threading.Tasks;
     using NServiceBus.Testing;
 
+    /// <summary>
+    /// A testable implementation of <see cref="IUniformSession" />.
+    /// </summary>
     public class TestableUniformSession : IUniformSession
     {
-        TestablePipelineContext innerContext;
-        TestableMessageSession innerSession;
+        readonly TestablePipelineContext innerContext;
+        readonly TestableMessageSession innerSession;
 
+        /// <summary>
+        /// Creates a new instance of <see cref="TestableUniformSession" />.
+        /// </summary>
         public TestableUniformSession() : this(new TestablePipelineContext())
         {
         }
 
+        /// <summary>
+        /// Creates a new instance of <see cref="TestableUniformSession" />.
+        /// </summary>
+        /// <param name="innerSession">The <see cref="TestableMessageSession" /> the session should use to send and publish messages.</param>
         public TestableUniformSession(TestableMessageSession innerSession)
         {
             this.innerSession = innerSession;
         }
 
+        /// <summary>
+        /// Creates a new instance of <see cref="TestableUniformSession" />.
+        /// </summary>
+        /// <param name="innerContext">The <see cref="TestablePipelineContext" /> the session should use to send and publish messages.</param>
         public TestableUniformSession(TestablePipelineContext innerContext)
         {
             this.innerContext = innerContext;
         }
 
+        /// <summary>
+        /// The messages that have been sent from the session.
+        /// </summary>
         public SentMessage<object>[] SentMessages => innerContext?.SentMessages ?? innerSession.SentMessages;
 
+        /// <summary>
+        /// The messages that have been published from the session.
+        /// </summary>
         public PublishedMessage<object>[] PublishedMessages => innerContext?.PublishedMessages ?? innerSession.PublishedMessages;
 
         Task IUniformSession.Send(object message, SendOptions options, CancellationToken cancellationToken)

diff --git a/src/Tests/APIApprovals.cs b/src/Tests/APIApprovals.cs
@@ -13,7 +13,7 @@ public void Approve()
         {
             var publicApi = typeof(IUniformSession).Assembly.GeneratePublicApi(new ApiGeneratorOptions
             {
-                ExcludeAttributes = new[] { "System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute" }
+                ExcludeAttributes = ["System.Runtime.Versioning.TargetFrameworkAttribute", "System.Reflection.AssemblyMetadataAttribute"]
             });
             Approver.Verify(publicApi);
         }

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.2" />
+    <PackageReference Include="NServiceBus" Version="9.0.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/UniformSession/Guard.cs b/src/UniformSession/Guard.cs
diff --git a/src/UniformSession/NServiceBus.UniformSession.csproj b/src/UniformSession/NServiceBus.UniformSession.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.2" />
+    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/UniformSession/UniformSessionExtensions.cs b/src/UniformSession/UniformSessionExtensions.cs
@@ -17,8 +17,8 @@ public static class UniformSessionExtensions
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task Send(this IUniformSession session, object message, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(message), message);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(message);
 
             return session.Send(message, new SendOptions(), cancellationToken);
         }
@@ -35,8 +35,8 @@ public static Task Send(this IUniformSession session, object message, Cancellati
         /// </remarks>
         public static Task Send<T>(this IUniformSession session, Action<T> messageConstructor, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(messageConstructor), messageConstructor);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(messageConstructor);
 
             return session.Send(messageConstructor, new SendOptions(), cancellationToken);
         }
@@ -50,9 +50,9 @@ public static Task Send<T>(this IUniformSession session, Action<T> messageConstr
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task Send(this IUniformSession session, string destination, object message, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNullAndEmpty(nameof(destination), destination);
-            Guard.AgainstNull(nameof(message), message);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentException.ThrowIfNullOrWhiteSpace(destination);
+            ArgumentNullException.ThrowIfNull(message);
 
             var options = new SendOptions();
 
@@ -71,9 +71,9 @@ public static Task Send(this IUniformSession session, string destination, object
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task Send<T>(this IUniformSession session, string destination, Action<T> messageConstructor, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNullAndEmpty(nameof(destination), destination);
-            Guard.AgainstNull(nameof(messageConstructor), messageConstructor);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentException.ThrowIfNullOrWhiteSpace(destination);
+            ArgumentNullException.ThrowIfNull(messageConstructor);
 
             var options = new SendOptions();
 
@@ -90,8 +90,8 @@ public static Task Send<T>(this IUniformSession session, string destination, Act
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task SendLocal(this IUniformSession session, object message, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(message), message);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(message);
 
             var options = new SendOptions();
 
@@ -109,8 +109,8 @@ public static Task SendLocal(this IUniformSession session, object message, Cance
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task SendLocal<T>(this IUniformSession session, Action<T> messageConstructor, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(messageConstructor), messageConstructor);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(messageConstructor);
 
             var options = new SendOptions();
 
@@ -127,8 +127,8 @@ public static Task SendLocal<T>(this IUniformSession session, Action<T> messageC
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task Publish(this IUniformSession session, object message, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(message), message);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(message);
 
             return session.Publish(message, new PublishOptions(), cancellationToken);
         }
@@ -141,7 +141,7 @@ public static Task Publish(this IUniformSession session, object message, Cancell
         /// <typeparam name="T">The message type.</typeparam>
         public static Task Publish<T>(this IUniformSession session, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
+            ArgumentNullException.ThrowIfNull(session);
 
             return session.Publish<T>(_ => { }, new PublishOptions(), cancellationToken);
         }
@@ -155,8 +155,8 @@ public static Task Publish<T>(this IUniformSession session, CancellationToken ca
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe.</param>
         public static Task Publish<T>(this IUniformSession session, Action<T> messageConstructor, CancellationToken cancellationToken = default)
         {
-            Guard.AgainstNull(nameof(session), session);
-            Guard.AgainstNull(nameof(messageConstructor), messageConstructor);
+            ArgumentNullException.ThrowIfNull(session);
+            ArgumentNullException.ThrowIfNull(messageConstructor);
 
             return session.Publish(messageConstructor, new PublishOptions(), cancellationToken);
         }