Merge pull request #21 from pfpack/release/v2.0.0-rc.1.0.0

pmosk · web-flow · commit 3b9927a4c7bc · 2022-02-07T23:15:57.000+03:00
release/v2.0.0-rc.1.0.0
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.x
-        include-prerelease: true
+        include-prerelease: false
 
     - name: Create Local NuGet Directory
       run: mkdir ~/nuget
@@ -38,13 +38,13 @@ jobs:
 
     - name: Pack DependencyRegistry
       run: dotnet pack ./src/*/*/DependencyRegistry.csproj --no-restore -o ~/nuget  -c Release
-      
+
     - name: Restore DependencyRegistry.Tests
       run: dotnet restore ./src/*/*/DependencyRegistry.Tests.csproj
 
     - name: Test DependencyRegistry.Tests
       run: dotnet test ./src/*/*/DependencyRegistry.Tests.csproj --no-restore  -c Release
-      
+
     - name: Push Packages
       if: ${{ github.event_name == 'release' }}
       run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Andrei Sergeev, Pavel Moskovoy
+Copyright (c) 2020-2022 Andrei Sergeev, Pavel Moskovoy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj b/src/dependency-registry/DependencyRegistry.Tests/DependencyRegistry.Tests.csproj
@@ -26,7 +26,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/DependencyRegistrar.T.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/DependencyRegistrar.T.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 using System;
 
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterScoped.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterScoped.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 
 namespace PrimeFuncPack
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterSingleton.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterSingleton.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 
 namespace PrimeFuncPack
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterTransient.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar.T/RegisterTransient.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 
 namespace PrimeFuncPack
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistrar.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistrar.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 using System;
 
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs b/src/dependency-registry/DependencyRegistry/DependencyRegistrar/DependencyRegistryExtensions.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
 using Microsoft.Extensions.DependencyInjection;
 using System;
 
diff --git a/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj b/src/dependency-registry/DependencyRegistry/DependencyRegistry.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
@@ -13,11 +13,11 @@
     <RepositoryUrl>https://github.com/pfpack/pfpack-dependency-registry</RepositoryUrl>
     <Company>pfpack</Company>
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
-    <Copyright>Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy</Copyright>
+    <Copyright>Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy</Copyright>
     <Description>PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.DependencyRegistry</AssemblyName>
-    <Version>1.3.0-preview.1.0.0</Version>
+    <Version>2.0.0-rc.1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="1.2.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.1" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#nullable enable`
`2`		`-`
`3`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`2`	`using System;`
`5`	`3`