Prepare RTM (#538)

* Prepare RTM * Use system json * Approve * Tweaks --------- Co-authored-by: Brandon Ording <bording@gmail.com>
Particular · Feb 19, 2024 · da38d08 · da38d08
1 parent dfb626a
commit da38d08
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Upload packages
@@ -41,4 +40,3 @@ jobs:
           retention-days: 7
       - name: Run tests
         uses: Particular/run-tests-action@v1.7.0
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 8.0.x
-          dotnet-quality: 'preview'
       - name: Build
         run: dotnet build src --configuration Release
       - name: Sign NuGet packages
@@ -37,5 +36,5 @@ jobs:
       - name: Deploy
         uses: Particular/push-octopus-package-action@v1.2.1
         with:
-          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}  
-          
+          octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
+
diff --git a/src/NServiceBus.Callback.Testing.Tests/NServiceBus.Callback.Testing.Tests.csproj b/src/NServiceBus.Callback.Testing.Tests/NServiceBus.Callback.Testing.Tests.csproj
@@ -12,8 +12,8 @@
   <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.1" />
-    <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.Callbacks.AcceptanceTests/DefaultServer.cs b/src/NServiceBus.Callbacks.AcceptanceTests/DefaultServer.cs
@@ -35,6 +35,8 @@ public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescr
 
             var storageDir = Path.Combine(NServiceBusAcceptanceTest.StorageRootDir, NUnit.Framework.TestContext.CurrentContext.Test.ID);
 
+            configuration.UseSerialization<SystemJsonSerializer>();
+
             configuration.UseTransport(new LearningTransport
             {
                 StorageDirectory = storageDir

diff --git a/src/NServiceBus.Callbacks.AcceptanceTests/NServiceBus.Callbacks.AcceptanceTests.csproj b/src/NServiceBus.Callbacks.AcceptanceTests/NServiceBus.Callbacks.AcceptanceTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/NServiceBus.Callbacks.Testing/NServiceBus.Callbacks.Testing.csproj b/src/NServiceBus.Callbacks.Testing/NServiceBus.Callbacks.Testing.csproj
@@ -3,8 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>NServiceBus Callbacks 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.0.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/NServiceBus.Callbacks.Testing/TestableCallbackAwareSession.cs b/src/NServiceBus.Callbacks.Testing/TestableCallbackAwareSession.cs
@@ -8,16 +8,25 @@
     using NServiceBus;
     using NServiceBus.Testing;
 
+    /// <summary>
+    /// A callbacks-aware testable <see cref="IMessageSession"/> implementation.
+    /// </summary>
     public class TestableCallbackAwareSession : TestableMessageSession
     {
         List<Tuple<Func<object, SendOptions, bool>, object>> matchers = [];
 
+        /// <summary>
+        /// Registers a response for the matched request.
+        /// </summary>
         public void When<TRequest, TResult>(Func<TRequest, bool> matcher, TResult response)
             where TRequest : class
         {
             When((TRequest m, SendOptions _) => matcher(m), response);
         }
 
+        /// <summary>
+        /// Registers a response for the matched request.
+        /// </summary>
         public void When<TRequest, TResult>(Func<TRequest, SendOptions, bool> matcher, TResult response)
             where TRequest : class
         {
@@ -27,6 +36,9 @@ public void When<TRequest, TResult>(Func<TRequest, SendOptions, bool> matcher, T
             }, response));
         }
 
+        /// <summary>
+        ///  Sends the provided message.
+        /// </summary>
         public override async Task Send(object message, SendOptions options, CancellationToken cancellationToken = default)
         {
             await base.Send(message, options, cancellationToken).ConfigureAwait(false);

diff --git a/src/NServiceBus.Callbacks.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/NServiceBus.Callbacks.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -1,6 +1,6 @@
 [assembly: System.CLSCompliant(false)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.Callbacks.Testing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.Callbacks.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.Callbacks.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 namespace NServiceBus
 {

diff --git a/src/NServiceBus.Callbacks.Tests/NServiceBus.Callbacks.Tests.csproj b/src/NServiceBus.Callbacks.Tests/NServiceBus.Callbacks.Tests.csproj
@@ -1,9 +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>
+    <AssemblyOriginatorKeyFile>..\NServiceBusTests.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +14,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.1" />
+    <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/NServiceBus.Callbacks/InternalsVisibleTo.cs b/src/NServiceBus.Callbacks/InternalsVisibleTo.cs
diff --git a/src/NServiceBus.Callbacks/NServiceBus.Callbacks.csproj b/src/NServiceBus.Callbacks/NServiceBus.Callbacks.csproj
@@ -3,13 +3,18 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>NServiceBus Callbacks</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
     <PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="NServiceBus.Callbacks.Testing" Key="$(NServiceBusKey)" />
+    <InternalsVisibleTo Include="NServiceBus.Callbacks.Tests" Key="$(NServiceBusTestsKey)" />
+  </ItemGroup>
+
 </Project>