Merge pull request #5 from pfpack/feature/release-version-1.0.0

andreise · web-flow · commit 744ca6f50771 · 2021-04-24T14:12:01.000+03:00
Increase the version to 1.0.0-preview.1.0.0
diff --git a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj
@@ -8,13 +8,13 @@
 		<Description>PrimeFuncPack: A Functional Programming Pack for .NET</Description>
 		<Copyright>Copyright © 2020 Andrei Sergeev, Pavel Moskovoy</Copyright>
 		<RootNamespace>PrimeFuncPack.DependencyRegistry.Tests</RootNamespace>
-		<AssemblyName>EarlyFuncPack.DependencyRegistry.Tests</AssemblyName>
+		<AssemblyName>PrimeFuncPack.DependencyRegistry.Tests</AssemblyName>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="EarlyFuncPack.DependencyRegistry" Version="0.4.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
 		<PackageReference Include="Moq" Version="4.16.1" />
+		<PackageReference Include="PrimeFuncPack.DependencyRegistry" Version="1.0.0-preview.1.0.0" />
 		<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="2.0.6" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs b/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs
@@ -8,8 +8,7 @@ namespace PrimeFuncPack.DependencyRegistry.Tests
 {
     internal static class MockServiceCollection
     {
-        public static Mock<IServiceCollection> CreateMock(
-            Action<ServiceDescriptor>? callback = null)
+        public static Mock<IServiceCollection> CreateMock(Action<ServiceDescriptor>? callback = null)
         {
             var mock = new Mock<IServiceCollection>();
 
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/DependencyRegistrarTest.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/DependencyRegistrarTest.cs
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs
@@ -12,18 +12,14 @@ namespace PrimeFuncPack.DependencyRegistry.Tests
     partial class DependencyRegistrarTest
     {
         [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public void RegisterScoped_ExpectSourceServices(
-            bool isNotNull)
+        [InlineData(null)]
+        [InlineData(SomeString)]
+        public void RegisterScoped_ExpectSourceServices(string regService)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
             
-            string regService = isNotNull ? SomeString : null!;
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             var actualServices = registrar.RegisterScoped();
             Assert.Same(sourceServices, actualServices);
@@ -32,8 +28,7 @@ public void RegisterScoped_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterScoped_ExpectCallAddScopedOnce(
-            bool isNotNull)
+        public void RegisterScoped_ExpectCallAddScopedOnce(bool isNotNull)
         {
             RefType regService = isNotNull ? ZeroIdRefType : null!;
             var mockServices = MockServiceCollection.CreateMock(
@@ -48,10 +43,7 @@ public void RegisterScoped_ExpectCallAddScopedOnce(
                 });
 
             var sourceServices = mockServices.Object;
-            
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             _ = registrar.RegisterScoped();
             mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs
@@ -14,16 +14,13 @@ partial class DependencyRegistrarTest
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterSingleton_ExpectSourceServices(
-            bool isNotNull)
+        public void RegisterSingleton_ExpectSourceServices(bool isNotNull)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
             
             object regService = isNotNull ? new object() : null!;
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             var actualServices = registrar.RegisterSingleton();
             Assert.Same(sourceServices, actualServices);
@@ -32,8 +29,7 @@ public void RegisterSingleton_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterSingleton_ExpectCallAddSingletonOnce(
-            bool isNotNull)
+        public void RegisterSingleton_ExpectCallAddSingletonOnce(bool isNotNull)
         {
             RecordType regService = isNotNull ? PlusFifteenIdLowerSomeStringNameRecord : null!;
             var mockServices = MockServiceCollection.CreateMock(
@@ -48,10 +44,7 @@ public void RegisterSingleton_ExpectCallAddSingletonOnce(
                 });
 
             var sourceServices = mockServices.Object;
-            
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             _ = registrar.RegisterSingleton();
             mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs
@@ -14,16 +14,13 @@ partial class DependencyRegistrarTest
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterTransient_ExpectSourceServices(
-            bool isNotNull)
+        public void RegisterTransient_ExpectSourceServices(bool isNotNull)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
             
             RecordType regService = isNotNull ? PlusFifteenIdSomeStringNameRecord : null!;
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             var actualServices = registrar.RegisterTransient();
             Assert.Same(sourceServices, actualServices);
@@ -32,8 +29,7 @@ public void RegisterTransient_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterTransient_ExpectCallAddTransientOnce(
-            bool isNotNull)
+        public void RegisterTransient_ExpectCallAddTransientOnce(bool isNotNull)
         {
             RefType regService = isNotNull ? MinusFifteenIdRefType : null!;
             var mockServices = MockServiceCollection.CreateMock(
@@ -48,10 +44,7 @@ public void RegisterTransient_ExpectCallAddTransientOnce(
                 });
 
             var sourceServices = mockServices.Object;
-            
-            var registrar = DependencyRegistrar.Create(
-                sourceServices,
-                _ => regService);
+            var registrar = DependencyRegistrar.Create(sourceServices, _ => regService);
 
             _ = registrar.RegisterTransient();
             mockServices.Verify(s => s.Add(It.IsAny<ServiceDescriptor>()), Times.Once);
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/DependencyRegistryExtensionsTest.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/DependencyRegistryExtensionsTest.cs
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs
@@ -14,8 +14,7 @@ partial class DependencyRegistryExtensionsTest
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterScoped_ExpectSourceServices(
-            bool isNotNull)
+        public void RegisterScoped_ExpectSourceServices(bool isNotNull)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
@@ -32,8 +31,7 @@ public void RegisterScoped_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterScoped_ExpectCallAddScopedOnce(
-            bool isNotNull)
+        public void RegisterScoped_ExpectCallAddScopedOnce(bool isNotNull)
         {
             RecordType regService = isNotNull ? MinusFifteenIdSomeStringNameRecord: null!;
             var mockServices = MockServiceCollection.CreateMock(
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs
@@ -14,8 +14,7 @@ partial class DependencyRegistryExtensionsTest
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterSingleton_ExpectSourceServices(
-            bool isNotNull)
+        public void RegisterSingleton_ExpectSourceServices(bool isNotNull)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
@@ -32,8 +31,7 @@ public void RegisterSingleton_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterSingleton_ExpectCallAddSingletonOnce(
-            bool isNotNull)
+        public void RegisterSingleton_ExpectCallAddSingletonOnce(bool isNotNull)
         {
             object regService = isNotNull ? MinusFifteenIdNullNameRecord: null!;
             var mockServices = MockServiceCollection.CreateMock(
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs
@@ -14,8 +14,7 @@ partial class DependencyRegistryExtensionsTest
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterTransient_ExpectSourceServices(
-            bool isNotNull)
+        public void RegisterTransient_ExpectSourceServices(bool isNotNull)
         {            
             var mockServices = MockServiceCollection.CreateMock();
             var sourceServices = mockServices.Object;
@@ -32,8 +31,7 @@ public void RegisterTransient_ExpectSourceServices(
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
-        public void RegisterTransient_ExpectCallAddTransientOnce(
-            bool isNotNull)
+        public void RegisterTransient_ExpectCallAddTransientOnce(bool isNotNull)
         {
             string regService = isNotNull ? LowerSomeString: null!;
             var mockServices = MockServiceCollection.CreateMock(
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/DependencyRegistrar.T.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/DependencyRegistrar.T.cs
@@ -12,9 +12,7 @@ public sealed partial class DependencyRegistrar<T>
 
         private readonly Func<IServiceProvider, T> resolver;
 
-        internal DependencyRegistrar(
-            IServiceCollection services,
-            Func<IServiceProvider, T> resolver)
+        internal DependencyRegistrar(IServiceCollection services, Func<IServiceProvider, T> resolver)
         {
             this.services = services;
             this.resolver = resolver;
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterScoped.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterScoped.cs
@@ -6,8 +6,6 @@ namespace PrimeFuncPack
 {
     partial class DependencyRegistrar<T>
     {
-        public IServiceCollection RegisterScoped()
-            =>
-            services.AddScoped(resolver);
+        public IServiceCollection RegisterScoped() => services.AddScoped(resolver);
     }
 }
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterSingleton.cs
@@ -6,8 +6,6 @@ namespace PrimeFuncPack
 {
     partial class DependencyRegistrar<T>
     {
-        public IServiceCollection RegisterSingleton()
-            =>
-            services.AddSingleton(resolver);
+        public IServiceCollection RegisterSingleton() => services.AddSingleton(resolver);
     }
 }
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterTransient.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterTransient.cs
@@ -6,8 +6,6 @@ namespace PrimeFuncPack
 {
     partial class DependencyRegistrar<T>
     {
-        public IServiceCollection RegisterTransient()
-            =>
-            services.AddTransient(resolver);
+        public IServiceCollection RegisterTransient() => services.AddTransient(resolver);
     }
 }
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistrar.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistrar.cs
@@ -7,9 +7,7 @@ namespace PrimeFuncPack
 {
     public static class DependencyRegistrar
     {
-        public static DependencyRegistrar<T> Create<T>(
-            IServiceCollection services,
-            Func<IServiceProvider, T> resolver)
+        public static DependencyRegistrar<T> Create<T>(IServiceCollection services, Func<IServiceProvider, T> resolver)
             where T : class
             =>
             new(
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs
@@ -7,18 +7,14 @@ namespace PrimeFuncPack
 {
     public static class DependencyRegistryExtensions
     {
-        public static DependencyRegistrar<T> ToRegistrar<T>(
-            this Dependency<T> dependency,
-            IServiceCollection services)
+        public static DependencyRegistrar<T> ToRegistrar<T>(this Dependency<T> dependency, IServiceCollection services)
             where T : class
             =>
             InternalToRegistrar(
                 dependency ?? throw new ArgumentNullException(nameof(dependency)),
                 services ?? throw new ArgumentNullException(nameof(services)));
 
-        private static DependencyRegistrar<T> InternalToRegistrar<T>(
-            Dependency<T> dependency,
-            IServiceCollection services)
+        private static DependencyRegistrar<T> InternalToRegistrar<T>(Dependency<T> dependency, IServiceCollection services)
             where T : class
             =>
             new(services, dependency.Resolve);
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj b/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj
@@ -10,8 +10,8 @@
 		<Description>PrimeFuncPack: A Functional Programming Pack for .NET</Description>
 		<Copyright>Copyright © 2020 Andrei Sergeev, Pavel Moskovoy</Copyright>
 		<RootNamespace>PrimeFuncPack</RootNamespace>
-		<AssemblyName>EarlyFuncPack.DependencyRegistry</AssemblyName>
-		<Version>0.4.0</Version>
+		<AssemblyName>PrimeFuncPack.DependencyRegistry</AssemblyName>
+		<Version>1.0.0-preview.1.0.0</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ namespace PrimeFuncPack.DependencyRegistry.Tests`
`8`	`8`	`{`
`9`	`9`	`internal static class MockServiceCollection`
`10`	`10`	`{`
`11`		`- public static Mock<IServiceCollection> CreateMock(`
`12`		`- Action<ServiceDescriptor>? callback = null)`
	`11`	`+ public static Mock<IServiceCollection> CreateMock(Action<ServiceDescriptor>? callback = null)`
`13`	`12`	`{`
`14`	`13`	`var mock = new Mock<IServiceCollection>();`
`15`	`14`