From 561ca6f7d742e69ca30585237c48aed65dd3cc43 Mon Sep 17 00:00:00 2001
From: pmosk <pm@ggroupp.ru>
Date: Sun, 12 Sep 2021 16:31:40 +0300
Subject: [PATCH 1/2] Update Dependency.Core version

---
 .github/workflows/dotnet.yml                         |  2 +-
 .../DependencyRegistry.Tests.csproj                  | 12 ++++++++----
 .../Mock/MockServiceCollection.cs                    |  1 -
 .../Tests.DependencyRegistrar/Test.Factory.cs        |  1 -
 .../Tests.DependencyRegistrar/Test.RegisterScoped.cs |  1 -
 .../Test.RegisterSingleton.cs                        |  1 -
 .../Test.RegisterTransient.cs                        |  1 -
 .../Test.Factory.cs                                  |  4 +---
 .../Test.RegisterScoped.cs                           |  5 ++---
 .../Test.RegisterSingleton.cs                        |  5 ++---
 .../Test.RegisterTransient.cs                        |  5 ++---
 .../DependencyRegistryExtensions.cs                  |  4 ++--
 .../DependencyRegistry/DependencyRegistry.csproj     |  5 +++--
 13 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index f685d27..bb772ca 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -2,7 +2,7 @@ name: .NET
 
 on:
   push:
-    branches: [ master ]
+    branches: [ feature/*, master ]
     
   pull_request:
     branches: [ master ]
diff --git a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj
index d271a97..bf6e3fc 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj
+++ b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IsPackable>false</IsPackable>
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
@@ -12,16 +13,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <ProjectReference Include="..\DependencyRegistry\DependencyRegistry.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="PrimeFuncPack.DependencyRegistry" Version="1.1.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">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs b/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs
index 48d1212..d88ed3c 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Mock/MockServiceCollection.cs
@@ -2,7 +2,6 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
-using System;
 
 namespace PrimeFuncPack.DependencyRegistry.Tests
 {
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs
index d7bd886..997f3b1 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.Factory.cs
@@ -1,7 +1,6 @@
 #nullable enable
 
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs
index e96f423..9019785 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterScoped.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs
index a6d5128..c7ad678 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterSingleton.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs
index 29c1a4e..1dd9705 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistrar/Test.RegisterTransient.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs
index 40cfc9f..b07288d 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.Factory.cs
@@ -1,7 +1,6 @@
 #nullable enable
 
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -26,8 +25,7 @@ public void ToRegistrar_DependencyIsNull_ExpectArgumentNullException()
         [Fact]
         public void ToRegistrar_ServicesAreNull_ExpectArgumentNullException()
         {
-            var dependency = Dependency.Create(
-                _ => MinusFifteenIdSomeStringNameRecord);
+            var dependency = Dependency.Of(MinusFifteenIdSomeStringNameRecord);
 
             var ex = Assert.Throws<ArgumentNullException>(
                 () => _ = dependency.ToRegistrar(null!));
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs
index 83457aa..4059a64 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterScoped.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -20,7 +19,7 @@ public void RegisterScoped_ExpectSourceServices(bool isNotNull)
             var sourceServices = mockServices.Object;
             
             RefType regService = isNotNull ? ZeroIdRefType : null!;
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
 
@@ -46,7 +45,7 @@ public void RegisterScoped_ExpectCallAddScopedOnce(bool isNotNull)
                 });
 
             var sourceServices = mockServices.Object;
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
             _ = registrar.RegisterScoped();
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs
index b6cc066..8947236 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterSingleton.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -20,7 +19,7 @@ public void RegisterSingleton_ExpectSourceServices(bool isNotNull)
             var sourceServices = mockServices.Object;
             
             RefType regService = isNotNull ? MinusFifteenIdRefType : null!;
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
 
@@ -46,7 +45,7 @@ public void RegisterSingleton_ExpectCallAddSingletonOnce(bool isNotNull)
                 });
 
             var sourceServices = mockServices.Object;
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
             _ = registrar.RegisterSingleton();
diff --git a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs
index 7caac9a..12394f3 100644
--- a/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs
+++ b/src/dependency-registry/DependencyRegistry.Tests/Tests.DependencyRegistryExtensions/Test.RegisterTransient.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using PrimeFuncPack.UnitTest;
-using System;
 using Xunit;
 using static PrimeFuncPack.UnitTest.TestData;
 
@@ -20,7 +19,7 @@ public void RegisterTransient_ExpectSourceServices(bool isNotNull)
             var sourceServices = mockServices.Object;
             
             RecordType regService = isNotNull ? ZeroIdNullNameRecord : null!;
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
 
@@ -46,7 +45,7 @@ public void RegisterTransient_ExpectCallAddTransientOnce(bool isNotNull)
                 });
 
             var sourceServices = mockServices.Object;            
-            var dependency = Dependency.Create(_ => regService);
+            var dependency = Dependency.Of(regService);
 
             var registrar = dependency.ToRegistrar(sourceServices);
             _ = registrar.RegisterTransient();
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs
index d378775..5778203 100644
--- a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs
+++ b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs
@@ -10,11 +10,11 @@ public static class DependencyRegistryExtensions
         public static DependencyRegistrar<T> ToRegistrar<T>(this Dependency<T> dependency, IServiceCollection services)
             where T : class
             =>
-            InternalToRegistrar(
+            InnerToRegistrar(
                 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> InnerToRegistrar<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
index 40567c0..c1b936e 100644
--- a/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj
+++ b/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -11,7 +12,7 @@
     <Copyright>Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy</Copyright>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.DependencyRegistry</AssemblyName>
-    <Version>1.1.0</Version>
+    <Version>1.2.0-preview.1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="1.1.0" />
+    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="1.2.0-rc.1.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file

From 3d62e302a4a5b29934f61dc6b99e07a9cad82c05 Mon Sep 17 00:00:00 2001
From: pmosk <pm@ggroupp.ru>
Date: Sun, 12 Sep 2021 16:33:44 +0300
Subject: [PATCH 2/2] Update dotnet.yml

---
 .github/workflows/dotnet.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index bb772ca..29ca6b3 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -21,7 +21,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
+        include-prerelease: true
         
     - name: Create Local NuGet Directory
       run: mkdir ~/nuget