Merge pull request #34 from Nodsoft/develop

v0.6 - Add .NET 8 Support & drop .NET 7
Nodsoft · Mar 23, 2024 · 1f86d0d · 1f86d0d
2 parents ba6ac90 + 0866338
commit 1f86d0d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,14 +17,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
-      - name: Setup .NET 7.0
-        uses: actions/setup-dotnet@v2
+      - name: Setup .NET 8.0
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - uses: dotnet/[email protected]
         id: nbgv

diff --git a/.github/workflows/nuget-push.yml b/.github/workflows/nuget-push.yml
@@ -53,12 +53,12 @@ jobs:
         ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 
@@ -72,14 +72,14 @@ jobs:
         run: dotnet build
 
       - id: is-public-release
-        uses: ASzc/change-string-case-action@v2
+        uses: ASzc/change-string-case-action@v6
         with:
           string: ${{ steps.nbgv.outputs.PublicRelease }}
 
       # Publish
       - name: Build, Pack & Publish ${{ matrix.project.name }} to ${{ matrix.nuget.name }}
         id: publish_nuget
-        uses: Rebel028/publish-nuget@v2.7.0
+        uses: Rebel028/publish-nuget@v2.8.0
         with:
           # Filepath of the project to be packaged, relative to root of repository
           PROJECT_FILE_PATH: ${{ matrix.project.path }}

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -14,6 +14,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
@@ -15,11 +15,12 @@
 		<Product>Molten Obsidian</Product>
 		<PackageProjectUrl>https://github.com/Nodsoft/MoltenObsidian</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Nodsoft/MoltenObsidian</RepositoryUrl>
-		<RepositoryType>Git</RepositoryType>
+		<RepositoryType>git</RepositoryType>
 		<CommonPackageTags>obsidian, moltenobsidian, vault, markdown, html, extensions</CommonPackageTags>
 		<PackageTags>$(CommonPackageTags)</PackageTags> <!-- Default package tags -->
 
 		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageIcon>icon.png</PackageIcon>
 

diff --git a/Nodsoft.MoltenObsidian.Blazor/Nodsoft.MoltenObsidian.Blazor.csproj b/Nodsoft.MoltenObsidian.Blazor/Nodsoft.MoltenObsidian.Blazor.csproj
@@ -10,9 +10,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\Nodsoft.MoltenObsidian\Nodsoft.MoltenObsidian.csproj" />
-
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.18" />
+		<ProjectReference Include="..\Nodsoft.MoltenObsidian\Nodsoft.MoltenObsidian.csproj" />		
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.28" />
+	</ItemGroup>
+
 </Project>
diff --git a/Nodsoft.MoltenObsidian.Tool/Nodsoft.MoltenObsidian.Tool.csproj b/Nodsoft.MoltenObsidian.Tool/Nodsoft.MoltenObsidian.Tool.csproj
@@ -17,9 +17,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-		<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
-		<PackageReference Include="Throw" Version="1.3.1" />
+		<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+		<PackageReference Include="Spectre.Console.Cli" Version="0.48.0" />
+		<PackageReference Include="Throw" Version="1.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Nodsoft.MoltenObsidian/Nodsoft.MoltenObsidian.csproj b/Nodsoft.MoltenObsidian/Nodsoft.MoltenObsidian.csproj
@@ -5,10 +5,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-		<PackageReference Include="Markdig" Version="0.32.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+		<PackageReference Include="Markdig" Version="0.36.2" />
 		<PackageReference Include="Nodsoft.Markdig.SyntaxHighlighting" Version="1.0.8" />
-		<PackageReference Include="YamlDotNet" Version="13.1.0" />
+		<PackageReference Include="YamlDotNet" Version="15.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/.../Nodsoft.MoltenObsidian.Vaults.FileSystem/Nodsoft.MoltenObsidian.Vaults.FileSystem.csproj b/.../Nodsoft.MoltenObsidian.Vaults.FileSystem/Nodsoft.MoltenObsidian.Vaults.FileSystem.csproj
@@ -12,8 +12,8 @@
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

diff --git a/Vaults/Nodsoft.MoltenObsidian.Vaults.Ftp/Nodsoft.MoltenObsidian.Vaults.Ftp.csproj b/Vaults/Nodsoft.MoltenObsidian.Vaults.Ftp/Nodsoft.MoltenObsidian.Vaults.Ftp.csproj
@@ -12,8 +12,8 @@
         <PackageReference Include="FluentFTP" Version="46.0.2" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

diff --git a/Vaults/Nodsoft.MoltenObsidian.Vaults.Http/Nodsoft.MoltenObsidian.Vaults.Http.csproj b/Vaults/Nodsoft.MoltenObsidian.Vaults.Http/Nodsoft.MoltenObsidian.Vaults.Http.csproj
@@ -8,8 +8,8 @@
 		<ProjectReference Include="..\..\Nodsoft.MoltenObsidian.Manifest\Nodsoft.MoltenObsidian.Manifest.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.5",
+  "version": "0.6",
   "publicReleaseRefSpec": [
     "^refs/heads/main",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"