Merge branch 'release/0.8.0'

devlead · Nov 10, 2022 · 87a0541 · 87a0541
2 parents ef09ab8 + 38cad60
commit 87a0541
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 12 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.3.0",
+      "version": "3.0.0",
       "commands": [
         "dotnet-cake"
       ]
     },
     "dpi": {
-      "version": "2022.10.28.57",
+      "version": "2022.11.10.59",
       "commands": [
         "dpi"
       ]

diff --git a/README.md b/README.md
@@ -3,3 +3,27 @@
 @devlead .NET Console Template is my opinionated template alternative to `dotnet new console`.
 
 Background and more details in my blog post [My preferred .NET console stack](https://www.devlead.se/posts/2021/2021-01-15-my-preferred-console-stack).
+
+## Installation
+
+```PowerShell
+dotnet new install Devlead.Console.Template
+```
+
+## Usage
+
+Create a new project with same name as folder
+
+```PowerShell
+dotnet new devleadconsole
+```
+
+Create a new project with specified name
+```PowerShell
+dotnet new devleadconsole -n MyConsole
+```
+
+Create a new project with specified target framework `net6.0` or `net7.0` supported (*default `net7.0`*).
+```PowerShell
+dotnet new devleadconsole -n MyConsole --framework net6.0
+```
diff --git a/build.cake b/build.cake
@@ -181,5 +181,30 @@ Task("Clean")
                 }
         )
     )
+.Then("Create-GitHub-Release")
+    .WithCriteria<BuildData>( (context, data) => data.ShouldPushNuGetPackages())
+    .Does<BuildData>(
+        static (context, data) => context
+            .Command(
+                new CommandSettings {
+                    ToolName = "GitHub CLI",
+                    ToolExecutableNames = new []{ "gh.exe", "gh" },
+                    EnvironmentVariables = { { "GH_TOKEN", data.GitHubNuGetApiKey } }
+                },
+                new ProcessArgumentBuilder()
+                    .Append("release")
+                    .Append("create")
+                    .Append(data.Version)
+                    .AppendSwitchQuoted("--title", data.Version)
+                    .Append("--generate-notes")
+                    .Append(string.Join(
+                        ' ',
+                        context
+                            .GetFiles(data.NuGetOutputPath.FullPath + "/*.nupkg")
+                            .Select(path => path.FullPath.Quote())
+                        ))
+
+            )
+    )
 .Then("GitHub-Actions")
 .Run();
diff --git a/global.json b/global.json
@@ -1,7 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.2.22477.23",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "version": "7.0.100",
+    "rollForward": "latestFeature"
   }
 }
diff --git a/src/Devlead.Console.Template/templates/devleadconsole/Devlead.Console/Devlead.Console.csproj b/src/Devlead.Console.Template/templates/devleadconsole/Devlead.Console/Devlead.Console.csproj
@@ -7,13 +7,9 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net7.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-rc.2.22472.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0-rc.2.22472.3" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.1.0" />