Merge pull request #52 from pfpack/release/v2.0.0-rc.1.2.0

release/v2.0.0-rc.1.2.0
pfpack · Dec 6, 2021 · b5e64af · b5e64af
2 parents f342ac0 + 72a0a01
commit b5e64af
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
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
@@ -46,19 +46,19 @@ jobs:
       run: dotnet test ./src/*/*/ServiceProviderExtensions.Tests.csproj --no-restore  -c Release
 
     - name: Restore Dependency.Core
-      run: dotnet restore ./src/*/*/Core.csproj
+      run: dotnet restore ./src/*/*/Dependency.Core.csproj
 
     - name: Build Dependency.Core
-      run: dotnet build ./src/*/*/Core.csproj --no-restore  -c Release
+      run: dotnet build ./src/*/*/Dependency.Core.csproj --no-restore  -c Release
 
     - name: Pack Dependency.Core
-      run: dotnet pack ./src/*/*/Core.csproj --no-restore -o ~/nuget  -c Release
+      run: dotnet pack ./src/*/*/Dependency.Core.csproj --no-restore -o ~/nuget  -c Release
 
     - name: Restore Dependency.Core.Tests
-      run: dotnet restore ./src/*/*/Core.Tests.csproj
+      run: dotnet restore ./src/*/*/Dependency.Core.Tests.csproj
 
     - name: Test Dependency.Core.Tests
-      run: dotnet test ./src/*/*/Core.Tests.csproj --no-restore  -c Release
+      run: dotnet test ./src/*/*/Dependency.Core.Tests.csproj --no-restore  -c Release
 
     - name: Restore Dependency
       run: dotnet restore ./src/*/*/Dependency.csproj

diff --git a/...endency-core/Core.Tests/Core.Tests.csproj → ...e/Core.Tests/Dependency.Core.Tests.csproj b/...endency-core/Core.Tests/Core.Tests.csproj → ...e/Core.Tests/Dependency.Core.Tests.csproj
@@ -10,11 +10,11 @@
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
     <Copyright>Copyright © 2020-2021 Andrei Sergeev, Pavel Moskovoy</Copyright>
     <RootNamespace>PrimeFuncPack.Tests</RootNamespace>
-    <AssemblyName>PrimeFuncPack.Dependency.Tests</AssemblyName>
+    <AssemblyName>PrimeFuncPack.Dependency.Core.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\Core\Dependency.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -32,4 +32,4 @@
     </PackageReference>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/dependency-core/Core/Dependency.01/With.02/With.02.Dependency.cs b/src/dependency-core/Core/Dependency.01/With.02/With.02.Dependency.cs
@@ -15,5 +15,5 @@ partial class Dependency<T>
         =>
         new(
             resolver,
-            other.Resolve);
+            other.InternalToResolver());
 }
diff --git a/src/dependency-core/Core/Core.csproj → ...pendency-core/Core/Dependency.Core.csproj b/src/dependency-core/Core/Core.csproj → ...pendency-core/Core/Dependency.Core.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Dependency.Core is a core library for .NET providing a functional programming based technology to build consistent dependency trees validated in the compile time.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.Dependency.Core</AssemblyName>
-    <Version>2.0.0-rc.1.1.0</Version>
+    <Version>2.0.0-rc.1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.0.0" />
+    <PackageReference Include="PrimeFuncPack.Core.Unit" Version="2.1.0" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/dependency/Dependency/Dependency.csproj b/src/dependency/Dependency/Dependency.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Dependency is a framework for .NET providing a functional programming based technology to build consistent dependency trees validated in the compile time.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.Dependency</AssemblyName>
-    <Version>2.0.0-rc.1.1.0</Version>
+    <Version>2.0.0-rc.1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.0-rc.1.1.0" />
+    <PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.0.0-rc.1.2.0" />
     <PackageReference Include="PrimeFuncPack.Dependency.ServiceProviderExtensions" Version="2.0.0-rc.1.0.0" />
   </ItemGroup>
 
-</Project>
+</Project>