Merge branch 'release/0.9.0'

devlead · Oct 30, 2023 · dce6b4e · dce6b4e
2 parents 87a0541 + a532ed7
commit dce6b4e
Show file tree

Hide file tree

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,11 @@ jobs:
         with:
           dotnet-version: '6.0.x'
 
+      - name: Install .NET SDK 7.0.x
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7.0.x'
+
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:

diff --git a/global.json b/global.json
@@ -1,6 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100",
-    "rollForward": "latestFeature"
+    "version": "8.0.100-rc.2.23502.2"
   }
 }
diff --git a/src/Devlead.Console.Template/Devlead.Console.Template.csproj b/src/Devlead.Console.Template/Devlead.Console.Template.csproj
@@ -4,7 +4,7 @@
     <PackageType>Template</PackageType>
     <AssemblyName>Devlead.Console.Template</AssemblyName>
     <Title>Devlead console templates for the .NET SDK.</Title>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>

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
@@ -12,9 +12,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.1.0" />
-    <PackageReference Include="Spectre.Console" Version="0.45.0" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
+    <PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.2.0" />
+    <PackageReference Include="Spectre.Console" Version="0.47.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>