sergey-tihon · sergey-tihon · Mar 19, 2024 · Mar 19, 2024 · Mar 19, 2024
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -7,12 +7,6 @@
       "commands": [
         "paket"
       ]
-    },
-    "fake-cli": {
-      "version": "6.0.0",
-      "commands": [
-        "fake"
-      ]
     }
   }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
     - master
-    - net6
 
 jobs:
   build:
@@ -16,22 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [6.0.407]
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET 8.0 SDK
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ matrix.dotnet }}
-    - name: Install local tools
-      run: dotnet tool restore
-    - name: Paket Restore
-      run: dotnet paket restore
+        dotnet-version: '8.0.x'
     - name: Build and Test
-      run: dotnet fake run build.fsx
+      run: dotnet fsi build.fsx -- -p build
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
       with: 
@@ -45,16 +39,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET 8.0 SDK
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.407
-    - name: Install local tools
-      run: dotnet tool restore
-    - name: Paket Restore
-      run: dotnet paket restore
+        dotnet-version: '8.0.x'
     - name: Build and Test
-      run: dotnet fake run build.fsx
+      run: dotnet fsi build.fsx -- -p build
     - name: Setup DocFX
       uses: crazy-max/ghaction-chocolatey@v1
       with:

diff --git a/RELEASE_NOTES.md → CHANGELOG.md b/RELEASE_NOTES.md → CHANGELOG.md
@@ -1,139 +1,144 @@
-#### 2.0.1 Jan 16, 2024
+# Changelog
+
+## [2.1.0] - Mar 18, 2024
+- Migration to .NET 8.0
+
+## [2.0.1] - Jan 16, 2024
 - Fix regression cased by migration to struct inside OpenXML v3
 - DocumentFormat.OpenXml 3.0 -> 3.0.1
 - SixLabors.Fonts 2.0 -> 2.0.1
 - SixLabors.ImageSharp 3.0.2 -> 3.1.2
 - SixLabors.ImageSharp.Drawing 2.0.1 -> 2.1.0
 
-#### 2.0.0 Nov 26, 2023
+## [2.0.0] - Nov 26, 2023
 - Migration to .NET 6.0
 - DocumentFormat.OpenXml 3.0.0-beta0003
-- `System.Drawing.Common` replaced by `SixLabors.ImageSharp.Drawing`
+- `System.Drawing.Common` replaced by SixLabors.ImageSharp.Drawing`
 - Removed `libgdiplus` dependency
 - Drop old `WmlComparer`
 
-#### 1.13.5 - Mar 27, 2023
+## [1.13.5] - Mar 27, 2023
 - perf: improved PublishSlides perf #61
 
-#### 1.13.4 - Dec 6, 2022
+## [1.13.4] - Dec 6, 2022
 - fix: issues with 7.0 packages
 
-#### 1.13.3 - Dec 5, 2022
+## [1.13.3] - Dec 5, 2022
 - fix: PublishSlides: missing ppt/metadata for google presentations #59
 - Dependencies updated
 
-#### 1.13.2 - Oct 4, 2022
+## [1.13.2] - Oct 4, 2022
 - remove caracters to prevent > at document assembler [#57](https://github.com/sergey-tihon/Clippit/pull/57)
 - Handle W.lastRenderedPageBreak in UnicodeMapper [#58](https://github.com/sergey-tihon/Clippit/pull/58)
 
-#### 1.13.1 - Sept 27, 2022
+## [1.13.1] - Sept 27, 2022
 - `long` overload for `Cell.Number`
 
-#### 1.13.0 - Sept 27, 2022
+## [1.13.0] - Sept 27, 2022
 - DocumentFormat.OpenXml (2.18)
 - Added Cell.Bool for Excel helpers
 
-#### 1.12.2 - Jul 13, 2022
+## [1.12.2] - Jul 13, 2022
 - fix: PtOpenXmlUtil: process corrupted OpenXmlPart items [#56](https://github.com/sergey-tihon/Clippit/pull/56)
 
-#### 1.12.1 - Jul 11, 2022
+## [1.12.1] - Jul 11, 2022
 - DocumentFormat.OpenXml (2.17.1)
 
-#### 1.12.0 - Jun 2, 2022
+## [1.12.0] - Jun 2, 2022
 - Static Cell builder class for simpler and safer Excel generation
 - Auto new modified date for decks composed with PresentationBuilder
 
-#### 1.11.0 - May 29, 2022
+## [1.11.0] - May 29, 2022
 - PublishSlides: reduced memory consumption [#53](https://github.com/sergey-tihon/Clippit/pull/53)
 
-#### 1.10.2 - Mar 16, 2022
+## [1.10.2] - Mar 16, 2022
 - DocumentFormat.OpenXml (2.16.0)
 - Lock `System.Drawing.Common` version to `v5`
 
-#### 1.10.0 - Feb 19, 2022
+## [1.10.0] - Feb 19, 2022
 - Added support of ExtendedChartPart (http://schemas.microsoft.com/office/drawing/2014/chartex) in PresentationBuilder and DocumentBuilder.
 
-#### 1.9.2 - Feb 17, 2022
+## [1.9.2] - Feb 17, 2022
 - Fix: Don't show hidden slides after PresentationBuilder.BuildPresentation
 
-#### 1.9.1 - Feb 9, 2022
+## [1.9.1] - Feb 9, 2022
 - Fixed incorrect usage of Stream API
 
-#### 1.9.0 - Jan 28, 2022
+## [1.9.0] - Jan 28, 2022
 - DocumentFormat.OpenXml (2.15.0)
 
-#### 1.8.2 - Dec 16, 2021
+## [1.8.2] - Dec 16, 2021
 - Improved memory consumption for PresentationBuilder.PublishSlides [#44 by @f1nzer](https://github.com/sergey-tihon/Clippit/pull/44)
 - Revert DocumentFormat.OpenXml back to 2.13.1 (because of [this issue](https://github.com/OfficeDev/Open-XML-SDK/issues/1069))
 
-#### 1.8.1 - Nov 5, 2021
+## [1.8.1] - Nov 5, 2021
 - DocumentFormat.OpenXml (2.14.0)
 
-#### 1.8.0 - Oct 25, 2021
+## [1.8.0] - Oct 25, 2021
 - DocumentAssembler: Support for multi-value XPath results [#39](https://github.com/sergey-tihon/Clippit/pull/39)
 
-#### 1.7.3 - Oct 7, 2021
+## [1.7.3] - Oct 7, 2021
 - Fixed copy Chart Style Parts in FluentPresentationBuilder
 
-#### 1.7.2 - Aug 23, 2021
+## [1.7.2] - Aug 23, 2021
 - DocumentFormat.OpenXml v2.13.1
 
-#### 1.7.1 - Aug 18, 2021
+## [1.7.1] - Aug 18, 2021
 - Resolving bug with nested rowspans [335](https://github.com/sergey-tihon/Clippit/pull/35)
 
-#### 1.7.0 - Aug 15, 2021
+## [1.7.0] - Aug 15, 2021
 - DocumentAssembler: Support for images [#31](https://github.com/sergey-tihon/Clippit/pull/31)
 
-#### 1.6.1 - Jul 11, 2021
+## [1.6.1] - Jul 11, 2021
 - New docs site generated by DocFx [#33](https://github.com/sergey-tihon/Clippit/pull/33)
 - Tests suite cleanup, samples converted to tests [#32](https://github.com/sergey-tihon/Clippit/pull/32)
 
-#### 1.6.0 - Jul 3, 2021
+## [1.6.0] - Jul 3, 2021
 - Add WorkbookDfn.WriteTo(Stream) method [#29](https://github.com/sergey-tihon/Clippit/pull/29)
 - Fixed generation of multiple Excel tables
 - Fixed formatting of cells with DateTime
 
-#### 1.5.0 - Jun 26, 2021
+## [1.5.0] - Jun 26, 2021
 - Structural comparison for Theme, Master, Layout [#20](https://github.com/sergey-tihon/Clippit/pull/20)
 - Auto-scaling for slides from presentations with different slide size
 - DocumentFormat.OpenXml (2.13)
 - System.Drawing.Common (5.0.2)
 
-#### 1.4.0 - Feb 10, 2021
-- DocumentBuilder: Added ISource and TableCellSource - [#17](https://github.com/sergey-tihon/Clippit/pull/17)
+## [1.4.0] - Feb 10, 2021
+- DocumentBuilder: Added ISource and TableCellSource] - [#17](https://github.com/sergey-tihon/Clippit/pull/17)
 - DocumentFormat.OpenXml (2.12.1)
 - Added dependency on System.IO.Packaging
 - Fixed DateTime/DateTimeOffset serialisation format to Excel
 
-#### 1.3.1 - July 30, 2020
+## [1.3.1] - July 30, 2020
 - PresentationBuilder: Fixed CopyExtendedPart
 
-#### 1.3.0 - July 29, 2020
+## [1.3.0] - July 29, 2020
 - DocumentFormat.OpenXml (2.11.3)
 - PresentationBuilder: Bug Fixes [#16](https://github.com/sergey-tihon/Clippit/pull/16)
 
-#### 1.2.1 - May 2, 2020
+## [1.2.1] - May 2, 2020
 - HTML to WML: Allow font-size with unit rem [#13](https://github.com/sergey-tihon/Clippit/pull/13)
 
-#### 1.2.0 - March 12, 2020
+## [1.2.0] - March 12, 2020
 - DocumentFormat.OpenXml (2.10.1)
 
-#### 1.1.4 - December 6, 2019
+## [1.1.4] - December 6, 2019
 - Slide title extracted and saved to document title [#10](https://github.com/sergey-tihon/Clippit/pull/10)
 - Ensured that Modified date is propagated
 - Compiled and tested on .NET Core 3.1 [#9](https://github.com/sergey-tihon/Clippit/pull/9)
 
-#### 1.1.3 - December 3, 2019
+## [1.1.3] - December 3, 2019
 - Don't rename theme when we extract slides from auto-generated 1-layout master
 
-#### 1.1.2 - December 2, 2019
+## [1.1.2] - December 2, 2019
 - Bug fixes
 
-#### 1.1.1 - December 1, 2019
+## [1.1.1] - December 1, 2019
 - Extract and merge presentation without slides (only masters) [#5](https://github.com/sergey-tihon/Clippit/pull/5)
 
-#### 1.1.0 - November 29, 2019
+## [1.1.0] - November 29, 2019
 - Added Slide Publishing API [#2](https://github.com/sergey-tihon/Clippit/pull/2)
 
-#### 1.0.0 - November 21, 2019
+## [1.0.0] - November 21, 2019
 - Initial release: [latest version of OpenXmlPowerTools](https://github.com/EricWhiteDev/Open-Xml-PowerTools/tree/6e56a5f5cf662f3bd3da87945a5d3ed2329964ff)
diff --git a/Clippit.Tests/Clippit.Tests.csproj b/Clippit.Tests/Clippit.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>

diff --git a/Clippit.sln b/Clippit.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 		paket.dependencies = paket.dependencies
 		README.md = README.md
-		RELEASE_NOTES.md = RELEASE_NOTES.md
+		CHANGELOG.md = CHANGELOG.md
 		build.fsx = build.fsx
 	EndProjectSection
 EndProject

diff --git a/Clippit/Clippit.csproj b/Clippit/Clippit.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AssemblyName>Clippit</AssemblyName>
     <RootNamespace>Clippit</RootNamespace>

diff --git a/Clippit/paket.template b/Clippit/paket.template
@@ -14,17 +14,17 @@ licenseUrl
 requireLicenseAcceptance
     false
 copyright
-    Copyright 2012-2023
+    Copyright 2012-2024
 tags
     OpenXML PowerTools PowerPoint Word Excel HTML
 description
     Fresh PowerTools for OpenXml
 files
-    bin/Release/net6.0/Clippit.dll ==> lib/net6.0
-    bin/Release/net6.0/Clippit.pdb ==> lib/net6.0
+    bin/Release/net8.0/Clippit.dll ==> lib/net8.0
+    bin/Release/net8.0/Clippit.pdb ==> lib/net8.0
 
 dependencies
-    framework: net6.0
+    framework: net8.0
         DocumentFormat.OpenXml >= LOCKEDVERSION
         DocumentFormat.OpenXml.Framework >= LOCKEDVERSION
         SixLabors.ImageSharp.Drawing >= LOCKEDVERSION
diff --git a/build.cmd b/build.cmd
@@ -1,4 +1,2 @@
 @echo off
-dotnet tool restore
-dotnet paket restore
-dotnet fake run build.fsx %*
+dotnet fsi build.fsx -- -p build