From 8d348460afad800d82aced1bc2b7c53021f2aea5 Mon Sep 17 00:00:00 2001
From: Scott Bilas <scottbilas@gmail.com>
Date: Wed, 22 Nov 2023 23:50:31 +0100
Subject: [PATCH] More .net 7/8 fixes

---
 .github/workflows/publish.yml | 6 +++---
 src/Core/Core-Tests.csproj    | 2 +-
 src/Core/Core.csproj          | 5 +----
 targets/Library.targets       | 6 ++++++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 024a0b0..bbcae77 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,13 +21,13 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
-      - name: Build for publish
-        run: dotnet publish -c Release
-
       - name: Run tests
         run: |
           dotnet test --nologo -l:"console;verbosity=normal" -c Release
 
+      - name: Pack nuget
+        run: dotnet pack src\Core\Core.csproj -c Release
+
       - name: Publish NuGet package
         run: |
           dotnet nuget push publish\Core\*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
diff --git a/src/Core/Core-Tests.csproj b/src/Core/Core-Tests.csproj
index 4ad5709..43c4e73 100644
--- a/src/Core/Core-Tests.csproj
+++ b/src/Core/Core-Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup><OkFeatures>T4</OkFeatures></PropertyGroup>
+  <PropertyGroup><OkFeatures>T4;Net78</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Tests.targets" />
 
   <PropertyGroup>
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 949dfe6..e1d15fc 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup><OkFeatures>T4</OkFeatures></PropertyGroup>
+  <PropertyGroup><OkFeatures>T4;Net78</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Library.targets" />
 
   <PropertyGroup>
@@ -8,9 +8,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>CS1591</NoWarn>
     <DefineConstants>$(DefineConstants);NICEIO_PUBLIC</DefineConstants>
-
-    <TargetFramework />
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
 
     <!-- because it's a package, avoid adding requirements -->
diff --git a/targets/Library.targets b/targets/Library.targets
index ae42754..8e89a1a 100644
--- a/targets/Library.targets
+++ b/targets/Library.targets
@@ -58,6 +58,12 @@
     <OkFeatures>;$(OkFeatures);</OkFeatures>
   </PropertyGroup>
 
+  <!--Net78 -->
+  <PropertyGroup Condition=" $(OkFeatures.Contains(';Net78;')) ">
+    <TargetFramework />
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
   <!--Core -->
   <ItemGroup Condition=" $(OkFeatures.Contains(';Core;')) or $(OkFeatures.Contains(';Docopt;')) ">
     <ProjectReference Include="$(OkSrcRoot)Core\Core.csproj" />