Merge pull request #145 from Particular/develop

Switch to release flow

CONTRIBUTING.md

@@ -0,0 +1 @@
+For information on contributing, see https://docs.particular.net/platform/contributing.

GitVersion.yml

@@ -1,7 +1,10 @@
 assembly-versioning-scheme: Major
-next-version: 7.0
+next-version: 1.0
 branches:
-  develop:
+  master:
+    mode: ContinuousDeployment
     tag: alpha
+    increment: Minor
+    tracks-release-branches: true
   release:
-    tag: rc
+    tag: ''

LICENSE.md

@@ -3,8 +3,8 @@ If you do not agree to these terms, do not access the NServiceBus code.
 
 Your license to the NServiceBus source and/or binaries is governed by the Reciprocal Public License 1.5 (RPL1.5) license as described here: 
 
-http://www.opensource.org/licenses/rpl1.5.txt
+https://www.opensource.org/licenses/rpl1.5.txt
 
 If you do not wish to release the source of software you build using NServiceBus, you may use NServiceBus source and/or binaries under the License Agreement described here:
 
-http://particular.net/LicenseAgreement
+https://particular.net/LicenseAgreement

src/NServiceBus.Testing.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -20,8 +20,10 @@ namespace NServiceBus.Testing
         public void Register<T>(params T[] instance)
             where T :  class { }
         public void Register<T>(System.Func<T> factory) { }
+        public void Register(System.Type type, System.Func<object> factory) { }
         public void Register<T>(System.Func<T[]> factory)
             where T :  class { }
+        public void Register(System.Type type, System.Func<object[]> factory) { }
         public virtual void Release(object instance) { }
     }
     public class Handler<T>

src/NServiceBus.Testing.Tests/FakeBuilderTests.cs

@@ -0,0 +1,72 @@
+namespace NServiceBus.Testing.Tests
+{
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class FakeBuilderTests
+    {
+        [Test]
+        public void ShouldResolveRegisteredFuncs()
+        {
+            var builder = new FakeBuilder();
+
+            var instance = new SomeClass();
+
+            builder.Register(()=> instance);
+
+            Assert.AreSame(instance, builder.Build<SomeClass>());
+        }
+
+        [Test]
+        public void ShouldResolveRegisteredFuncArrays()
+        {
+            var builder = new FakeBuilder();
+
+            var instance = new SomeClass();
+            var instance2 = new SomeClass();
+
+            builder.Register(() => new []
+            {
+                instance,
+                instance2
+            });
+
+            CollectionAssert.Contains(builder.BuildAll<SomeClass>(), instance);
+            CollectionAssert.Contains(builder.BuildAll<SomeClass>(), instance2);
+        }
+
+        [Test]
+        public void ShouldResolveRegisteredObjectFuncs()
+        {
+            var builder = new FakeBuilder();
+
+            object instance = new SomeClass();
+
+            builder.Register(typeof(SomeClass),() => instance);
+
+            Assert.AreSame(instance, builder.Build<SomeClass>());
+        }
+
+        [Test]
+        public void ShouldResolveRegisteredObjectFuncArrays()
+        {
+            var builder = new FakeBuilder();
+
+            var instance = new SomeClass();
+            var instance2 = new SomeClass();
+
+            builder.Register(typeof(SomeClass), () => new object[]
+            {
+                instance,
+                instance2
+            });
+
+            CollectionAssert.Contains(builder.BuildAll<SomeClass>(), instance);
+            CollectionAssert.Contains(builder.BuildAll<SomeClass>(), instance2);
+        }
+
+        class SomeClass
+        {
+        }
+    }
+}

src/NServiceBus.Testing/NSB.Testing.Fakes/FakeBuilder.cs

@@ -140,6 +140,17 @@ public void Register<T>(Func<T> factory)
             });
         }
 
+        /// <summary>
+        /// Registers a factory method which will be invoked every time an instance of <paramref name="type"/> is resolved.
+        /// </summary>
+        public void Register(Type type, Func<object> factory)
+        {
+            factories.Add(type, () => new []
+            {
+                factory()
+            });
+        }
+
         /// <summary>
         /// Registers a factory method which will be invoked every time an instance of <typeparamref name="T" /> is resolved.
         /// </summary>
@@ -148,6 +159,14 @@ public void Register<T>(Func<T[]> factory) where T : class
             factories.Add(typeof(T), factory);
         }
 
+        /// <summary>
+        /// Registers a factory method which will be invoked every time an instance of <paramref name="type"/> is resolved.
+        /// </summary>
+        public void Register(Type type, Func<object[]> factory)
+        {
+            factories.Add(type, factory);
+        }
+
         Dictionary<Type, Func<object[]>> factories = new Dictionary<Type, Func<object[]>>();
 
         Dictionary<Type, object[]> instances = new Dictionary<Type, object[]>();

src/NServiceBus.Testing/NServiceBus.Testing.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
     <PackageReference Include="Obsolete.Fody" Version="4.3.2" PrivateAssets="All" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
-    <PackageReference Include="Particular.Packaging" Version="0.2.1" PrivateAssets="All" />
+    <PackageReference Include="Particular.Packaging" Version="0.3.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>