Prepare RTM (#603)

* Prepare RTM * Don't use $(SolutionDir) in key path * Clean up warnings * Update license notices --------- Co-authored-by: Brandon Ording <[email protected]>
Particular · Feb 8, 2024 · c4c18b8 · c4c18b8
1 parent c123fa2
commit c4c18b8
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 226 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/NOTICE.txt b/NOTICE.txt
diff --git a/THIRD-PARTY-NOTICES.txt b/THIRD-PARTY-NOTICES.txt
@@ -0,0 +1,15 @@
+License notice for net-object-deep-copy
+---------------------------------------
+
+https://github.com/Burtsev-Alexey/net-object-deep-copy/blob/master/README
+
+Source code is released under the MIT license.
+
+The MIT License (MIT)
+Copyright (c) 2014 Burtsev Alexey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/NServiceBus.Testing.Tests/NServiceBus.Testing.Tests.csproj b/src/NServiceBus.Testing.Tests/NServiceBus.Testing.Tests.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" 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.Testing.Tests/Sagas/BasicSaga.cs b/src/NServiceBus.Testing.Tests/Sagas/BasicSaga.cs
@@ -35,7 +35,7 @@ public async Task TestBasicSaga()
             Assert.That(shipped.OrderId == "abc");
         }
 
-        public class ShippingPolicy : NServiceBus.Saga<ShippingPolicyData>,
+        public class ShippingPolicy : Saga<ShippingPolicyData>,
             IAmStartedByMessages<OrderPlaced>,
             IAmStartedByMessages<OrderBilled>,
             IHandleTimeouts<ShippingDelay>

diff --git a/src/NServiceBus.Testing.Tests/Sagas/DelayedMessages.cs b/src/NServiceBus.Testing.Tests/Sagas/DelayedMessages.cs
@@ -40,7 +40,7 @@ public async Task TestDealyedMessages()
             Assert.That(delayedCmdResult.SagaDataSnapshot.DelayedCommandReceived, Is.True);
         }
 
-        public class DelaySaga : NServiceBus.Saga<Data>,
+        public class DelaySaga : Saga<Data>,
             IAmStartedByMessages<Start>,
             IHandleMessages<DelayedCmd>,
             IHandleTimeouts<RegularTimeout>

diff --git a/src/NServiceBus.Testing.Tests/Sagas/ExternalHandlerSimulator.cs b/src/NServiceBus.Testing.Tests/Sagas/ExternalHandlerSimulator.cs
@@ -26,7 +26,7 @@ public async Task ExternalHandlerShouldSupplyReplyMessage()
             Assert.That(doneEvt.CorrId, Is.EqualTo("abc"));
         }
 
-        public class MySaga : NServiceBus.Saga<MyData>,
+        public class MySaga : Saga<MyData>,
             IAmStartedByMessages<StartMsg>,
             IHandleMessages<Step1Response>
         {

diff --git a/src/NServiceBus.Testing.Tests/Sagas/HeaderMappings.cs b/src/NServiceBus.Testing.Tests/Sagas/HeaderMappings.cs
@@ -22,7 +22,7 @@ public async Task TestHeaderMappings()
             Assert.That(result.SagaDataSnapshot.HeaderMessageReceived, Is.True);
         }
 
-        public class HeaderSaga : NServiceBus.Saga<HeaderSagaData>,
+        public class HeaderSaga : Saga<HeaderSagaData>,
             IAmStartedByMessages<HeaderMessage>
         {
             protected override void ConfigureHowToFindSaga(SagaPropertyMapper<HeaderSagaData> mapper)

diff --git a/src/NServiceBus.Testing.Tests/Sagas/ReplyMessage.cs b/src/NServiceBus.Testing.Tests/Sagas/ReplyMessage.cs
@@ -25,7 +25,7 @@ public async Task TestReplyMessageApi()
             Assert.That(endResult.SagaDataSnapshot.ReplyReceived, Is.True);
         }
 
-        public class MySaga : NServiceBus.Saga<MyData>,
+        public class MySaga : Saga<MyData>,
             IAmStartedByMessages<StartMsg>,
             IHandleMessages<Step1Reply>
         {

diff --git a/src/NServiceBus.Testing.Tests/Sagas/ReplyToOriginator.cs b/src/NServiceBus.Testing.Tests/Sagas/ReplyToOriginator.cs
@@ -44,7 +44,7 @@ public async Task OriginatorShouldBeSetByDefault()
             Assert.AreEqual(replyAddress, reply.Message<ReplyMessage>().OriginatorAddress);
         }
 
-        class ReplyingSaga : NServiceBus.Saga<ReplyingSagaData>, IAmStartedByMessages<StartSagaMessage>, IHandleMessages<SendReplyMessage>
+        class ReplyingSaga : Saga<ReplyingSagaData>, IAmStartedByMessages<StartSagaMessage>, IHandleMessages<SendReplyMessage>
         {
             protected override void ConfigureHowToFindSaga(SagaPropertyMapper<ReplyingSagaData> mapper) => mapper
                 .ConfigureMapping<StartSagaMessage>(m => m.CorrelationProperty)

diff --git a/src/NServiceBus.Testing.Tests/Sagas/SagaCompletion.cs b/src/NServiceBus.Testing.Tests/Sagas/SagaCompletion.cs
@@ -17,7 +17,7 @@ public async Task MarkStartedSagaAsComplete()
             Assert.IsTrue(result.Completed);
         }
 
-        class TestSaga : NServiceBus.Saga<TestSagaData>, IAmStartedByMessages<StartSagaMessage>
+        class TestSaga : Saga<TestSagaData>, IAmStartedByMessages<StartSagaMessage>
         {
             protected override void ConfigureHowToFindSaga(SagaPropertyMapper<TestSagaData> mapper) => mapper
                 .MapSaga(d => d.CorrelationId)

diff --git a/src/NServiceBus.Testing.Tests/Sagas/SagaCompletionWithTimeouts.cs b/src/NServiceBus.Testing.Tests/Sagas/SagaCompletionWithTimeouts.cs
@@ -21,7 +21,7 @@ public async Task TimeoutShouldBeSwallowedAfterSagaCompletion()
             Assert.That(result[0].Completed, Is.True);
         }
 
-        public class MyCustomSaga : NServiceBus.Saga<MyCustomSagaData>,
+        public class MyCustomSaga : Saga<MyCustomSagaData>,
             IAmStartedByMessages<MsgHappensTwice>,
             IHandleTimeouts<TimeoutHappensTwice>
         {

diff --git a/src/NServiceBus.Testing.Tests/Sagas/SendToSelf.cs b/src/NServiceBus.Testing.Tests/Sagas/SendToSelf.cs
@@ -24,7 +24,7 @@ public async Task ShouldEnqueueMessageForProcessing()
             Assert.That(doneEvt.CorrId, Is.EqualTo("abc"));
         }
 
-        public class MySaga : NServiceBus.Saga<MyData>,
+        public class MySaga : Saga<MyData>,
             IAmStartedByMessages<StartMsg>,
             IHandleMessages<SendToSelfCmd>
         {

diff --git a/src/NServiceBus.Testing.Tests/Sagas/TwoSagas.cs b/src/NServiceBus.Testing.Tests/Sagas/TwoSagas.cs
@@ -24,7 +24,7 @@ public async Task TestWithDifferentCorrelationIds()
             Assert.That(shipped.OrderId == "abc");
         }
 
-        public class ShippingPolicy : NServiceBus.Saga<ShippingPolicyData>,
+        public class ShippingPolicy : Saga<ShippingPolicyData>,
             IAmStartedByMessages<OrderPlaced>,
             IAmStartedByMessages<OrderBilled>
         {

diff --git a/src/NServiceBus.Testing/NSB.Testing.Fakes/TestableEndpointInstance.cs b/src/NServiceBus.Testing/NSB.Testing.Fakes/TestableEndpointInstance.cs
@@ -16,9 +16,7 @@ public partial class TestableEndpointInstance : TestableMessageSession, IEndpoin
         /// <summary>
         /// Stops the endpoint.
         /// </summary>
-#pragma warning disable PS0002 // Instance methods on types implementing ICancellableContext should not have a CancellationToken parameter
         public virtual Task Stop(CancellationToken cancellationToken = default)
-#pragma warning restore PS0002 // Instance methods on types implementing ICancellableContext should not have a CancellationToken parameter
         {
             EndpointStopped = true;
             return Task.CompletedTask;

diff --git a/src/NServiceBus.Testing/NSB.Testing.Fakes/TestingLoggerFactory.cs b/src/NServiceBus.Testing/NSB.Testing.Fakes/TestingLoggerFactory.cs
@@ -20,7 +20,7 @@ public TestingLoggerFactory()
         }
 
         /// <summary>
-        /// Controls the <see cref="Logging.LogLevel" /> for all default logging.
+        /// Controls the <see cref="LogLevel" /> for all default logging.
         /// </summary>
         /// <param name="level">The log level to be used.</param>
         public void Level(LogLevel level)

diff --git a/src/NServiceBus.Testing/NServiceBus.Testing.csproj b/src/NServiceBus.Testing/NServiceBus.Testing.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>A testing framework for NServiceBus</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
-    <PackageReference Include="NServiceBus" Version="9.0.0-alpha.1" />
+    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
     <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
     <PackageReference Include="Particular.Packaging" Version="4.0.0" PrivateAssets="All" />
   </ItemGroup>