Merge pull request #12 from ricaun-io/develop

ricaun · web-flow · commit 98407527134b · 2021-12-17T16:00:45.000-03:00
Update to 0.0.10
diff --git a/Build/.nuke/build.schema.json b/Build/.nuke/build.schema.json
@@ -37,6 +37,9 @@
             "VSCode"
           ]
         },
+        "MainProject": {
+          "type": "string"
+        },
         "Name": {
           "type": "string"
         },
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -19,10 +19,6 @@
     <None Include="..\.github\workflows\*.yml" LinkBase="ci" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Build.cs~RF299b4df2.TMP" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ricaun.Nuke\ricaun.Nuke.csproj" />
   </ItemGroup>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.0.10] / 2021-12-17
+- Change Base Release `.nupkg` or full folder
+- Fix HazSolutionExtension
+- Add GetMainProject on IHazMainProject 
+- private GetMainProject
+- Add HazSolutionExtension
+- Add HazMainProjectExtension
+- Add IHazMainProject
+- Rename Example Folder Project
+
 ## [0.0.9] / 2021-12-17
 - Clear Build
 - Test Native Example Compile
@@ -66,6 +76,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - First Release
 
 [vNext]: https://github.com/ricaun-io/ricaun.Nuke/compare/1.0.0...HEAD
+[0.0.10]: https://github.com/ricaun-io/ricaun.Nuke/compare/0.0.9...0.0.10
+[0.0.9]: https://github.com/ricaun-io/ricaun.Nuke/compare/0.0.8...0.0.9
 [0.0.8]: https://github.com/ricaun-io/ricaun.Nuke/compare/0.0.7...0.0.8
 [0.0.7]: https://github.com/ricaun-io/ricaun.Nuke/compare/0.0.6...0.0.7
 [0.0.6]: https://github.com/ricaun-io/ricaun.Nuke/compare/0.0.5...0.0.6
diff --git a/ricaun.Nuke.Examples/Program.cs b/ricaun.Nuke.Examples/Program.cs
diff --git a/ricaun.Nuke.Examples/ricaun.Nuke.Example.csproj b/ricaun.Nuke.Examples/ricaun.Nuke.Example.csproj
diff --git a/ricaun.Nuke.sln b/ricaun.Nuke.sln
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{4EED
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ricaun.Nuke.Example", "Examples\ricaun.Nuke.Example.csproj", "{027171E5-2FB6-4A4C-A8DE-F3E148B47FFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ricaun.Nuke.Example", "ricaun.Nuke.Examples\ricaun.Nuke.Example.csproj", "{027171E5-2FB6-4A4C-A8DE-F3E148B47FFB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ricaun.Nuke/Components/ICompile.cs b/ricaun.Nuke/Components/ICompile.cs
@@ -3,13 +3,13 @@
 
 namespace ricaun.Nuke.Components
 {
-    public interface ICompile : IClean, IHazSolution, INukeBuild
+    public interface ICompile : IClean, IHazMainProject, IHazSolution, INukeBuild
     {
         Target Compile => _ => _
             .DependsOn(Clean)
             .Executes(() =>
             {
-                Solution.BuildMainProject();
+                Solution.BuildProject(MainProject);
             });
     }
 }
diff --git a/ricaun.Nuke/Components/ICompileExample.cs b/ricaun.Nuke/Components/ICompileExample.cs
@@ -10,7 +10,7 @@ public interface ICompileExample : IHazExample, ICompile, ISign, IRelease, IHazC
             .Before(Sign)
             .Executes(() =>
             {
-                Solution.BuildOtherProject(GetExampleProject(), (project) =>
+                Solution.BuildProject(GetExampleProject(), (project) =>
                 {
                     SignProject(project);
                     var folder = ExampleDirectory;
diff --git a/ricaun.Nuke/Components/IGitRelease.cs b/ricaun.Nuke/Components/IGitRelease.cs
@@ -20,7 +20,7 @@ public interface IGitRelease : IRelease, IHazGitRepository, IHazGitVersion, IHaz
             .OnlyWhenDynamic(() => GitRepository.IsOnMainOrMasterBranch())
             .Executes(() =>
             {
-                var project = Solution.GetMainProject();
+                var project = MainProject;
 
                 if (Directory.Exists(ReleaseDirectory) == false)
                 {
diff --git a/ricaun.Nuke/Components/IHazContent.cs b/ricaun.Nuke/Components/IHazContent.cs
@@ -6,14 +6,14 @@
 using ricaun.Nuke.Extensions;
 namespace ricaun.Nuke.Components
 {
-    public interface IHazContent : IHazSolution, INukeBuild
+    public interface IHazContent : IHazMainProject, IHazSolution, INukeBuild
     {
         /// <summary>
         /// Folder Content 
         /// </summary>
         [Parameter]
         string Folder => ValueInjectionUtility.TryGetValue(() => Folder) ?? "Content";
-        AbsolutePath ContentDirectory => GetContentDirectory(Solution.GetMainProject());
+        AbsolutePath ContentDirectory => GetContentDirectory(MainProject);
         public AbsolutePath GetContentDirectory(Project project) => project.Directory / "bin" / Folder;
     }
 }
diff --git a/ricaun.Nuke/Components/IHazMainProject.cs b/ricaun.Nuke/Components/IHazMainProject.cs
@@ -0,0 +1,37 @@
+﻿using Nuke.Common;
+using Nuke.Common.ProjectModel;
+using Nuke.Common.ValueInjection;
+using ricaun.Nuke.Extensions;
+namespace ricaun.Nuke.Components
+{
+    public interface IHazMainProject : IHazSolution, INukeBuild
+    {
+        /// <summary>
+        /// Name of the MainProject (default: <seealso cref="Solution.Name"/>)
+        /// </summary>
+        [Parameter]
+        string Name => ValueInjectionUtility.TryGetValue(() => Name) ?? Solution.Name;
+
+        /// <summary>
+        /// MainProject (default: <seealso cref="Solution.Name"/>)
+        /// </summary>
+        [Parameter]
+        public Project MainProject => ValueInjectionUtility.TryGetValue(() => MainProject) ?? Solution.GetOtherProject(Name);
+
+        /// <summary>
+        /// MainProject (default: <seealso cref="Solution.Name"/>)
+        /// </summary>
+        /// <returns></returns>
+        public Project GetMainProject() => MainProject;
+    }
+
+    public static class HazMainProjectExtension
+    {
+        /// <summary>
+        /// Get MainProject
+        /// </summary>
+        /// <param name="hazMainProject"></param>
+        /// <returns></returns>
+        public static Project GetMainProject(this IHazMainProject hazMainProject) => hazMainProject.MainProject;
+    }
+}
diff --git a/ricaun.Nuke/Components/IHazRelease.cs b/ricaun.Nuke/Components/IHazRelease.cs
@@ -6,15 +6,15 @@
 using ricaun.Nuke.Extensions;
 namespace ricaun.Nuke.Components
 {
-    public interface IHazRelease : IHazSolution, INukeBuild
+    public interface IHazRelease : IHazMainProject, IHazSolution, INukeBuild
     {
         /// <summary>
         /// Folder Release 
         /// </summary>
         [Parameter]
         string Folder => ValueInjectionUtility.TryGetValue(() => Folder) ?? "Release";
 
-        AbsolutePath ReleaseDirectory => GetReleaseDirectory(Solution.GetMainProject());
+        AbsolutePath ReleaseDirectory => GetReleaseDirectory(MainProject);
 
         public AbsolutePath GetReleaseDirectory(Project project) => project.Directory / "bin" / Folder;
     }
diff --git a/ricaun.Nuke/Components/IHazSolution.cs b/ricaun.Nuke/Components/IHazSolution.cs
@@ -8,4 +8,14 @@ public interface IHazSolution : INukeBuild
     {
         [Required] [Solution] Solution Solution => ValueInjectionUtility.TryGetValue(() => Solution);
     }
+
+    public static class HazSolutionExtension
+    {
+        /// <summary>
+        /// Get Solution
+        /// </summary>
+        /// <param name="hazSolution"></param>
+        /// <returns></returns>
+        public static Solution GetSolution(this IHazSolution hazSolution) => hazSolution.Solution;
+    }
 }
diff --git a/ricaun.Nuke/Components/IRelease.cs b/ricaun.Nuke/Components/IRelease.cs
@@ -14,7 +14,7 @@ public interface IRelease : IHazRelease, IHazContent, ISign, INukeBuild
             .TriggeredBy(Sign)
             .Executes(() =>
             {
-                ReleaseProject(Solution.GetMainProject());
+                ReleaseProject(MainProject);
             });
 
         /// <summary>
@@ -35,7 +35,7 @@ public void ReleaseProject(Project project)
             var fileName = $"{project.Name} {version}";
             var ProjectDirectory = ReleaseDirectory / fileName;
 
-            var nupkgs = PathConstruction.GlobFiles(ContentDirectory.Parent, "**/*.nupkg", "**/*.exe");
+            var nupkgs = PathConstruction.GlobFiles(ContentDirectory, "**/*.nupkg");
             if (nupkgs.Count > 0)
             {
                 nupkgs.ForEach(file => FileSystemTasks.CopyFileToDirectory(file, ProjectDirectory));
diff --git a/ricaun.Nuke/Components/ISign.cs b/ricaun.Nuke/Components/ISign.cs
@@ -12,7 +12,7 @@ public interface ISign : ICompile, IHazSign, IHazSolution, INukeBuild
             .TriggeredBy(Compile)
             .Executes(() =>
             {
-                SignProject(Solution.GetMainProject());
+                SignProject(MainProject);
             });
 
         /// <summary>
diff --git a/ricaun.Nuke/Extensions/BuildExtension.cs b/ricaun.Nuke/Extensions/BuildExtension.cs
@@ -62,7 +62,7 @@ public static IEnumerable<string> GetConfigurations(this Solution Solution)
         /// Build the Main project
         /// </summary>
         /// <param name="Solution"></param>
-        public static void BuildMainProject(this Solution Solution)
+        private static void BuildMainProject(this Solution Solution)
         {
             if (Solution.GetMainProject() is Project project)
             {
@@ -90,7 +90,7 @@ public static void ClearSolution(this Solution Solution, AbsolutePath BuildProje
         /// </summary>
         /// <param name="Solution"></param>
         /// <returns></returns>
-        public static Project GetMainProject(this Solution Solution)
+        private static Project GetMainProject(this Solution Solution)
         {
             return Solution.GetProjects("*")
                 .FirstOrDefault(p => p.Name.Equals(Solution.Name, StringComparison.OrdinalIgnoreCase));
diff --git a/ricaun.Nuke/Extensions/BuildOtherExtension.cs b/ricaun.Nuke/Extensions/BuildOtherExtension.cs
@@ -13,9 +13,9 @@ public static class BuildOtherExtension
         /// <param name="Solution"></param>
         /// <param name="projectName"></param>
         /// <param name="afterBuild"></param>
-        public static void BuildOtherProject(this Solution Solution, string projectName, Action<Project> afterBuild = null)
+        public static void BuildProject(this Solution Solution, string projectName, Action<Project> afterBuild = null)
         {
-            Solution.BuildOtherProject(Solution.GetOtherProject(projectName), afterBuild);
+            Solution.BuildProject(Solution.GetOtherProject(projectName), afterBuild);
         }
 
         /// <summary>
@@ -24,7 +24,7 @@ public static void BuildOtherProject(this Solution Solution, string projectName,
         /// <param name="Solution"></param>
         /// <param name="projectName"></param>
         /// <param name="afterBuild"></param>
-        public static void BuildOtherProject(this Solution Solution, Project project, Action<Project> afterBuild = null)
+        public static void BuildProject(this Solution Solution, Project project, Action<Project> afterBuild = null)
         {
             if (project is Project)
             {
diff --git a/ricaun.Nuke/ricaun.Nuke.csproj b/ricaun.Nuke/ricaun.Nuke.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.Nuke</PackageId>
-    <Version>0.0.9</Version>
+    <Version>0.0.10</Version>
   </PropertyGroup>
 
   <PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@`
`3`	`3`
`4`	`4`	`namespace ricaun.Nuke.Components`
`5`	`5`	`{`
`6`		`- public interface ICompile : IClean, IHazSolution, INukeBuild`
	`6`	`+ public interface ICompile : IClean, IHazMainProject, IHazSolution, INukeBuild`
`7`	`7`	`{`
`8`	`8`	`Target Compile => _ => _`
`9`	`9`	`.DependsOn(Clean)`
`10`	`10`	`.Executes(() =>`
`11`	`11`	`{`
`12`		`- Solution.BuildMainProject();`
	`12`	`+ Solution.BuildProject(MainProject);`
`13`	`13`	`});`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public interface ICompileExample : IHazExample, ICompile, ISign, IRelease, IHazC`
`10`	`10`	`.Before(Sign)`
`11`	`11`	`.Executes(() =>`
`12`	`12`	`{`
`13`		`- Solution.BuildOtherProject(GetExampleProject(), (project) =>`
	`13`	`+ Solution.BuildProject(GetExampleProject(), (project) =>`
`14`	`14`	`{`
`15`	`15`	`SignProject(project);`
`16`	`16`	`var folder = ExampleDirectory;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public interface IGitRelease : IRelease, IHazGitRepository, IHazGitVersion, IHaz`
`20`	`20`	`.OnlyWhenDynamic(() => GitRepository.IsOnMainOrMasterBranch())`
`21`	`21`	`.Executes(() =>`
`22`	`22`	`{`
`23`		`- var project = Solution.GetMainProject();`
	`23`	`+ var project = MainProject;`
`24`	`24`
`25`	`25`	`if (Directory.Exists(ReleaseDirectory) == false)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@`
`6`	`6`	`using ricaun.Nuke.Extensions;`
`7`	`7`	`namespace ricaun.Nuke.Components`
`8`	`8`	`{`
`9`		`- public interface IHazContent : IHazSolution, INukeBuild`
	`9`	`+ public interface IHazContent : IHazMainProject, IHazSolution, INukeBuild`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Folder Content`
`13`	`13`	`/// </summary>`
`14`	`14`	`[Parameter]`
`15`	`15`	`string Folder => ValueInjectionUtility.TryGetValue(() => Folder) ?? "Content";`
`16`		`- AbsolutePath ContentDirectory => GetContentDirectory(Solution.GetMainProject());`
	`16`	`+ AbsolutePath ContentDirectory => GetContentDirectory(MainProject);`
`17`	`17`	`public AbsolutePath GetContentDirectory(Project project) => project.Directory / "bin" / Folder;`
`18`	`18`	`}`
`19`	`19`	`}`