From 260731933dd7abbe58d6582bc3175e4b81891202 Mon Sep 17 00:00:00 2001
From: xafero <xafero@users.noreply.github.com>
Date: Mon, 15 Apr 2024 15:12:46 +0200
Subject: [PATCH] Created a workflow for NuGet and for the viewer executable
 (#7)

* Create dotnet-desktop.yml

* Updating NET and creating a workflow

* Adding NET Standard for very old users

* Fixing missing framework
---
 .github/workflows/dotnet.yml     | 44 ++++++++++++++++++++++++++++++++
 ImageFormats/FitsReader.cs       |  2 +-
 ImageFormats/ImageFormats.csproj | 25 +++++++++++++++---
 ImageViewer/ImageViewer.csproj   |  3 ++-
 4 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/dotnet.yml

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
new file mode 100644
index 0000000..63520c4
--- /dev/null
+++ b/.github/workflows/dotnet.yml
@@ -0,0 +1,44 @@
+name: .NET Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 15
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
+    - name: Build
+      run: dotnet build -c Release
+
+    - name: Pack
+      run: dotnet pack -c Release --no-build -o nupkg
+
+    - name: Publish
+      run: dotnet publish -p:PublishSingleFile=true -r win-x64 -f net8.0-windows -c Release --self-contained false ImageViewer\ImageViewer.csproj -o dist
+
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: All NuGet packages
+        path: nupkg
+
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: All app executables
+        path: dist
diff --git a/ImageFormats/FitsReader.cs b/ImageFormats/FitsReader.cs
index 43f27ab..1ac619a 100644
--- a/ImageFormats/FitsReader.cs
+++ b/ImageFormats/FitsReader.cs
@@ -83,7 +83,7 @@ public static Image Load(Stream stream)
                         else if (headerSeq > 0 && !itemStr.StartsWith("XTENSION")) { return bmp; }
                     }
 
-                    if (!itemStr.Contains('=')) { continue; }
+                    if (!itemStr.Contains('=' + "")) { continue; }
 
                     string[] parts = itemStr.Split('=');
                     if (parts.Length < 2) { continue; }
diff --git a/ImageFormats/ImageFormats.csproj b/ImageFormats/ImageFormats.csproj
index 427e9a7..014d7d8 100644
--- a/ImageFormats/ImageFormats.csproj
+++ b/ImageFormats/ImageFormats.csproj
@@ -1,20 +1,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+
     <RootNamespace>DmitryBrant.ImageFormats</RootNamespace>
     <AssemblyName>ImageFormats</AssemblyName>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>    
+
+  <PropertyGroup>
+    <PackageId>DmitryBrant.ImageFormats</PackageId>
+    <Version>1.0.1</Version>
     <Title>ImageFormats</Title>
     <Authors>Dmitry Brant</Authors>
     <Copyright>Copyright © Dmitry Brant, 2021-</Copyright>
     <PackageProjectUrl>https://dmitrybrant.com</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/dbrant/imageformats</RepositoryUrl>
     <Description>Library for decoding old and obscure image formats.</Description>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>    
+    <PackageTags>decoding;graphics;images;library;targa;tga;ras;sun;zsoft;pcx;netpbm;ppm;pgm;pbm;pnm;sgi;dicom</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0' OR '$(TargetFramework)'=='net8.0'">
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+
 </Project>
diff --git a/ImageViewer/ImageViewer.csproj b/ImageViewer/ImageViewer.csproj
index 9e3f490..337b772 100644
--- a/ImageViewer/ImageViewer.csproj
+++ b/ImageViewer/ImageViewer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFrameworks>net8.0-windows;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ImageViewer</RootNamespace>
@@ -12,6 +12,7 @@
     <Authors>Dmitry Brant</Authors>
     <Description></Description>
     <Copyright>Copyright © Dmitry Brant, 2020</Copyright>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>