Add NServiceBus.MessageInterfaces package (#6977)

* Add NServiceBus.MessageInterfaces * Adjust references to IMessage * Update API approval file
Particular · Mar 19, 2024 · f0ae530 · f0ae530
1 parent e2a9813
commit f0ae530
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 37 deletions.
diff --git a/src/NServiceBus.AcceptanceTests/Core/DependencyInjection/When_endpoint_is_warmed_up.cs b/src/NServiceBus.AcceptanceTests/Core/DependencyInjection/When_endpoint_is_warmed_up.cs
@@ -115,7 +115,7 @@ class SpyContainer : IServiceProvider, IServiceScopeFactory
             public SpyContainer(IServiceCollection serviceCollection)
             {
                 foreach (var serviceDescriptor in serviceCollection
-                    .Where(sd => sd.ServiceType.Assembly == typeof(IMessage).Assembly))
+                    .Where(sd => sd.ServiceType.Assembly == typeof(IEndpointInstance).Assembly))
                 {
                     RegisteredServices[serviceDescriptor.ServiceType] = new RegisteredService
                     {

diff --git a/src/NServiceBus.Core.Analyzer.Tests.Common/Helpers/AnalyzerTestFixture.cs b/src/NServiceBus.Core.Analyzer.Tests.Common/Helpers/AnalyzerTestFixture.cs
@@ -114,7 +114,8 @@ static AnalyzerTestFixture()
                 MetadataReference.CreateFromFile(Assembly.Load("System.Private.CoreLib").Location),
 #endif
                 MetadataReference.CreateFromFile(typeof(EndpointConfiguration).GetTypeInfo().Assembly.Location),
-                MetadataReference.CreateFromFile(typeof(IUniformSession).GetTypeInfo().Assembly.Location));
+                MetadataReference.CreateFromFile(typeof(IUniformSession).GetTypeInfo().Assembly.Location),
+                MetadataReference.CreateFromFile(typeof(IMessage).GetTypeInfo().Assembly.Location));
         }
 
         static readonly ImmutableList<PortableExecutableReference> ProjectReferences;

diff --git a/src/NServiceBus.Core.Tests/API/Infra/NServiceBusAssembly.cs b/src/NServiceBus.Core.Tests/API/Infra/NServiceBusAssembly.cs
@@ -6,7 +6,7 @@
 
     static class NServiceBusAssembly
     {
-        public static readonly List<Type> Types = typeof(IMessage).Assembly.GetTypes()
+        public static readonly List<Type> Types = typeof(IEndpointInstance).Assembly.GetTypes()
             .Where(type => !type.IsObsolete())
             .ToList();
     }

diff --git a/src/NServiceBus.Core.Tests/API/NullableAnnotations.cs b/src/NServiceBus.Core.Tests/API/NullableAnnotations.cs
@@ -52,7 +52,7 @@ bool HasNonAnnotatedMember(Type type)
         {
             foreach (var member in type.GetMembers())
             {
-                if (member.DeclaringType.Assembly != typeof(IMessage).Assembly)
+                if (member.DeclaringType.Assembly != typeof(IEndpointInstance).Assembly)
                 {
                     continue;
                 }

diff --git a/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt b/src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt
@@ -478,7 +478,6 @@ namespace NServiceBus
     {
         System.Threading.CancellationToken CancellationToken { get; }
     }
-    public interface ICommand : NServiceBus.IMessage { }
     public interface IConfigureHowToFindSagaWithMessage
     {
         void ConfigureMapping<TSagaEntity, TMessage>(System.Linq.Expressions.Expression<System.Func<TSagaEntity, object?>> sagaEntityProperty, System.Linq.Expressions.Expression<System.Func<TMessage, object?>> messageProperty)
@@ -517,7 +516,6 @@ namespace NServiceBus
     {
         System.Threading.Tasks.Task Stop(System.Threading.CancellationToken cancellationToken = default);
     }
-    public interface IEvent : NServiceBus.IMessage { }
     public interface IHandleMessages<T>
     {
         System.Threading.Tasks.Task Handle(T message, NServiceBus.IMessageHandlerContext context);
@@ -526,7 +524,6 @@ namespace NServiceBus
     {
         System.Threading.Tasks.Task Timeout(T state, NServiceBus.IMessageHandlerContext context);
     }
-    public interface IMessage { }
     public interface IMessageConvention
     {
         string Name { get; }

diff --git a/src/NServiceBus.Core.Tests/RedirectHelper.cs b/src/NServiceBus.Core.Tests/RedirectHelper.cs
@@ -17,7 +17,7 @@ static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs ar
     {
         if (args.Name.StartsWith("NServiceBus.Core,"))
         {
-            return typeof(IMessage).Assembly;
+            return typeof(IEndpointInstance).Assembly;
         }
         return null;
     }

diff --git a/src/NServiceBus.Core/ICommand.cs b/src/NServiceBus.Core/ICommand.cs
diff --git a/src/NServiceBus.Core/IEvent.cs b/src/NServiceBus.Core/IEvent.cs
diff --git a/src/NServiceBus.Core/IMessage.cs b/src/NServiceBus.Core/IMessage.cs
diff --git a/src/NServiceBus.Core/NServiceBus.Core.csproj b/src/NServiceBus.Core/NServiceBus.Core.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup Label="Public dependencies">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="NServiceBus.MessageInterfaces" Version="[1.0.0, 2.0.0)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
     <PackageReference Include="System.Text.Json" Version="7.0.3" />

diff --git a/src/NServiceBus.Core/TypeForwarders.cs b/src/NServiceBus.Core/TypeForwarders.cs
@@ -0,0 +1,6 @@
+using System.Runtime.CompilerServices;
+using NServiceBus;
+
+[assembly: TypeForwardedTo(typeof(ICommand))]
+[assembly: TypeForwardedTo(typeof(IEvent))]
+[assembly: TypeForwardedTo(typeof(IMessage))]
diff --git a/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs b/src/NServiceBus.TransportTests/NServiceBusTransportTest.cs
@@ -39,7 +39,7 @@ protected static IConfigureTransportInfrastructure CreateConfigurer()
 
             if (string.IsNullOrWhiteSpace(transportToUse))
             {
-                var coreAssembly = typeof(IMessage).Assembly;
+                var coreAssembly = typeof(IEndpointInstance).Assembly;
 
                 var nonCoreTransport = transportDefinitions.Value.FirstOrDefault(t => t.Assembly != coreAssembly);