From b07e057c1fdb47790bc21eaef48659f99156ff23 Mon Sep 17 00:00:00 2001 From: Sergey Tihon Date: Tue, 19 Mar 2024 17:28:28 +0100 Subject: [PATCH 1/2] feat: migration to .net 8 --- .config/dotnet-tools.json | 6 - .github/workflows/main.yml | 26 +-- RELEASE_NOTES.md => CHANGELOG.md | 85 +++++---- Clippit.Tests/Clippit.Tests.csproj | 2 +- Clippit.sln | 2 +- Clippit/Clippit.csproj | 2 +- Clippit/paket.template | 6 +- build.cmd | 4 +- build.fsx | 120 ++++++------ build.fsx.lock | 284 ----------------------------- build.sh | 4 +- docs/api/.gitignore | 2 +- docs/docfx.json | 2 +- docs/index.md | 2 +- docs/toc.yml | 2 +- global.json | 2 +- paket.dependencies | 2 +- paket.lock | 47 +++-- 18 files changed, 142 insertions(+), 458 deletions(-) rename RELEASE_NOTES.md => CHANGELOG.md (76%) delete mode 100644 build.fsx.lock diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 92694cd0..b9052bc0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -7,12 +7,6 @@ "commands": [ "paket" ] - }, - "fake-cli": { - "version": "6.0.0", - "commands": [ - "fake" - ] } } } \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b84b2b9a..355a735b 100644 --- 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 b/CHANGELOG.md similarity index 76% rename from RELEASE_NOTES.md rename to CHANGELOG.md index f6ac31c9..a72b3a44 100644 --- a/RELEASE_NOTES.md +++ b/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 index f0f67f40..875f4128 100644 --- a/Clippit.Tests/Clippit.Tests.csproj +++ b/Clippit.Tests/Clippit.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 LatestMajor true latest diff --git a/Clippit.sln b/Clippit.sln index c901d1d4..f72084c3 100644 --- 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 index f2ef7562..79874d91 100644 --- a/Clippit/Clippit.csproj +++ b/Clippit/Clippit.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 latest Clippit Clippit diff --git a/Clippit/paket.template b/Clippit/paket.template index 47b2d7cd..7609ea84 100644 --- a/Clippit/paket.template +++ b/Clippit/paket.template @@ -20,11 +20,11 @@ tags 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 index d7f75484..e856b7b1 100644 --- a/build.cmd +++ b/build.cmd @@ -1,4 +1,2 @@ @echo off -dotnet tool restore -dotnet paket restore -dotnet fake run build.fsx %* \ No newline at end of file +dotnet fsi build.fsx -- -p build \ No newline at end of file diff --git a/build.fsx b/build.fsx index 5a5c89b0..ee5c325f 100644 --- a/build.fsx +++ b/build.fsx @@ -1,81 +1,67 @@ -#r @"paket: -source https://nuget.org/api/v2 -strategy: min -framework net6.0 -nuget FSharp.Core 6.0.0.0 -nuget Fake.Core.Target -nuget Fake.Core.ReleaseNotes -nuget Fake.DotNet.Paket -nuget Fake.DotNet.AssemblyInfoFile -nuget Fake.DotNet.Cli //" +#r "nuget: Fun.Build, 1.0.5" +#r "nuget: Fake.DotNet.AssemblyInfoFile" +#r "nuget: Fake.DotNet.Paket" -#if !FAKE -#load "./.fake/build.fsx/intellisense.fsx" -#r "netstandard" // Temp fix for https://github.com/fsharp/FAKE/issues/1985 -#endif +open Fun.Build +open Fake.IO +open Fake.DotNet +let version = + Changelog.GetLastVersion(__SOURCE_DIRECTORY__) + |> Option.defaultWith (fun () -> failwith "Version is not found") -// -------------------------------------------------------------------------------------- -// FAKE build script -// -------------------------------------------------------------------------------------- +pipeline "build" { + workingDir __SOURCE_DIRECTORY__ -open Fake -open Fake.Core -open Fake.Core.TargetOperators -open Fake.DotNet -open Fake.IO -open Fake.IO.Globbing.Operators + runBeforeEachStage (fun ctx -> + if ctx.GetStageLevel() = 0 then + printfn $"::group::{ctx.Name}") + + runAfterEachStage (fun ctx -> + if ctx.GetStageLevel() = 0 then + printfn "::endgroup::") -let gitName = "Clippit" -let description = "Fresh PowerTools for OpenXml" -let release = ReleaseNotes.load "RELEASE_NOTES.md" + stage "Check environment" { + run "dotnet tool restore" + run "dotnet paket restore" + } -// Targets -Target.create "Clean" (fun _ -> - Shell.mkdir "bin" - Shell.cleanDir "bin" -) + stage "Clean" { + run (fun _ -> + Shell.mkdir "bin" + Shell.cleanDir "bin") -Target.create "AssemblyInfo" (fun _ -> - let fileName = "Clippit/Properties/AssemblyInfo.Generated.cs" - AssemblyInfoFile.createCSharp fileName - [ AssemblyInfo.Title gitName - AssemblyInfo.Product gitName - AssemblyInfo.Description description - AssemblyInfo.Version release.AssemblyVersion - AssemblyInfo.FileVersion release.AssemblyVersion ] -) + run "dotnet clean" + } -Target.create "Build" (fun _ -> - "RELEASE_NOTES.md" |> Shell.copyFile "docs/api" + stage "AssemblyInfo" { + run (fun _ -> + let fileName = "Clippit/Properties/AssemblyInfo.Generated.cs" - let result = DotNet.exec id "build" "Clippit.sln -c Release" - if not result.OK - then failwithf "Build failed: %A" result.Errors -) + AssemblyInfoFile.createCSharp + fileName + [ AssemblyInfo.Title "Clippit" + AssemblyInfo.Product "Clippit" + AssemblyInfo.Description "Fresh PowerTools for OpenXml" + AssemblyInfo.Version version.Version + AssemblyInfo.FileVersion version.Version ]) + } -Target.create "RunTests" (fun _ -> - DotNet.test id "Clippit.Tests/" -) + stage "Build" { run "dotnet build Clippit.sln -c Release" } -Target.create "NuGet" (fun _ -> - Paket.pack(fun p -> - { p with - ToolType = ToolType.CreateLocalTool() - OutputPath = "bin" - Version = release.NugetVersion - ReleaseNotes = String.toLines release.Notes}) -) + stage "RunTests" { run "dotnet test Clippit.Tests/" } -Target.create "All" ignore + stage "NuGet" { + run (fun _ -> + Paket.pack (fun p -> + { p with + ToolType = ToolType.CreateLocalTool() + OutputPath = "bin" + Version = version.Version + ReleaseNotes = version.ReleaseNotes })) + } -// Build order -"Clean" - ==> "AssemblyInfo" - ==> "Build" - ==> "RunTests" - ==> "NuGet" - ==> "All" + runIfOnlySpecified +} -// start build -Target.runOrDefault "All" +tryPrintPipelineCommandHelp () diff --git a/build.fsx.lock b/build.fsx.lock deleted file mode 100644 index 4f1c37c1..00000000 --- a/build.fsx.lock +++ /dev/null @@ -1,284 +0,0 @@ -STORAGE: NONE -STRATEGY: MIN -RESTRICTION: == net6.0 -NUGET - remote: https://www.nuget.org/api/v2 - BlackFox.VsWhere (1.1) - FSharp.Core (>= 4.2.3) - Microsoft.Win32.Registry (>= 4.7) - Fake.Core.CommandLineParsing (5.23.1) - FParsec (>= 1.1.1) - FSharp.Core (>= 6.0) - Fake.Core.Context (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Environment (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.23.1) - Fake.Core.Context (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Process (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.String (5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Target (5.23.1) - Fake.Core.CommandLineParsing (>= 5.23.1) - Fake.Core.Context (>= 5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Trace (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.FakeVar (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Core.Xml (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.AssemblyInfoFile (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.MSBuild (>= 5.23.1) - Fake.DotNet.NuGet (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.MSBuild (5.23.1) - BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.23.1) - Fake.Core.Environment (>= 5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.SemVer (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Tasks (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.Core.Xml (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - Fake.Net.Http (>= 5.23.1) - FSharp.Core (>= 6.0) - Newtonsoft.Json (>= 13.0.1) - NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.23.1) - Fake.Core.Process (>= 5.23.1) - Fake.Core.String (>= 5.23.1) - Fake.Core.Trace (>= 5.23.1) - Fake.DotNet.Cli (>= 5.23.1) - Fake.IO.FileSystem (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.23.1) - Fake.Core.String (>= 5.23.1) - FSharp.Core (>= 6.0) - Fake.Net.Http (5.23.1) - Fake.Core.Trace (>= 5.23.1) - FSharp.Core (>= 6.0) - FParsec (1.1.1) - FSharp.Core (>= 4.3.4) - FSharp.Control.Reactive (5.0.2) - FSharp.Core (>= 4.7.2) - System.Reactive (>= 5.0) - FSharp.Core (6.0) - Microsoft.Build (16.10) - Microsoft.Build.Framework (>= 16.10) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Reflection.Metadata (>= 1.6) - System.Security.Principal.Windows (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - System.Text.Json (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Framework (16.10) - System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (16.10) - Microsoft.Build.Framework (>= 16.10) - Microsoft.Build.Utilities.Core (>= 16.10) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.CodeDom (>= 4.4) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 1.6) - System.Resources.Extensions (>= 4.6) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Cryptography.Xml (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Utilities.Core (16.10) - Microsoft.Build.Framework (>= 16.10) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) - Microsoft.NET.StringTools (1.0) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (3.1) - Microsoft.NETCore.Targets (1.0.1) - Microsoft.Win32.Registry (4.7) - System.Security.AccessControl (>= 4.7) - System.Security.Principal.Windows (>= 4.7) - Microsoft.Win32.SystemEvents (4.7) - Microsoft.NETCore.Platforms (>= 3.1) - Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.545) - Microsoft.Build (>= 16.10) - Microsoft.Build.Framework (>= 16.10) - Microsoft.Build.Tasks.Core (>= 16.10) - Microsoft.Build.Utilities.Core (>= 16.10) - Newtonsoft.Json (13.0.1) - NuGet.Common (5.11.3) - NuGet.Frameworks (>= 5.11.3) - NuGet.Configuration (5.11.3) - NuGet.Common (>= 5.11.3) - System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (5.11.3) - NuGet.Packaging (5.11.3) - Newtonsoft.Json (>= 9.0.1) - NuGet.Configuration (>= 5.11.3) - NuGet.Versioning (>= 5.11.3) - System.Security.Cryptography.Cng (>= 5.0) - System.Security.Cryptography.Pkcs (>= 5.0) - NuGet.Protocol (5.11.3) - NuGet.Packaging (>= 5.11.3) - NuGet.Versioning (5.11.3) - System.CodeDom (4.4) - System.Collections (4.0.11) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Collections.Immutable (5.0) - System.Configuration.ConfigurationManager (4.7) - System.Security.Cryptography.ProtectedData (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Drawing.Common (4.7) - Microsoft.NETCore.Platforms (>= 3.1) - Microsoft.Win32.SystemEvents (>= 4.7) - System.Formats.Asn1 (5.0) - System.Globalization (4.0.11) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.IO (4.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Text.Encoding (>= 4.0.11) - System.Threading.Tasks (>= 4.0.11) - System.Memory (4.5.4) - System.Reactive (5.0) - System.Reflection (4.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.IO (>= 4.1) - System.Reflection.Primitives (>= 4.0.1) - System.Runtime (>= 4.1) - System.Reflection.Metadata (1.6) - System.Reflection.Primitives (4.0.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Resources.Extensions (4.6) - System.Resources.ResourceManager (4.0.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Globalization (>= 4.0.11) - System.Reflection (>= 4.1) - System.Runtime (>= 4.1) - System.Runtime (4.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime.CompilerServices.Unsafe (5.0) - System.Runtime.Extensions (4.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Runtime.Handles (4.0.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Runtime.InteropServices (4.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Reflection (>= 4.1) - System.Reflection.Primitives (>= 4.0.1) - System.Runtime (>= 4.1) - System.Runtime.Handles (>= 4.0.1) - System.Security.AccessControl (4.7) - Microsoft.NETCore.Platforms (>= 3.1) - System.Security.Principal.Windows (>= 4.7) - System.Security.Cryptography.Cng (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Cng (>= 5.0) - System.Security.Cryptography.ProtectedData (4.7) - System.Security.Cryptography.Xml (4.7) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Security.Permissions (4.7) - System.Security.AccessControl (>= 4.7) - System.Windows.Extensions (>= 4.7) - System.Security.Principal.Windows (4.7) - System.Text.Encoding (4.0.11) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Text.Encoding.CodePages (4.0.1) - Microsoft.NETCore.Platforms (>= 1.0.1) - System.Collections (>= 4.0.11) - System.Globalization (>= 4.0.11) - System.IO (>= 4.1) - System.Reflection (>= 4.1) - System.Resources.ResourceManager (>= 4.0.1) - System.Runtime (>= 4.1) - System.Runtime.Extensions (>= 4.1) - System.Runtime.Handles (>= 4.0.1) - System.Runtime.InteropServices (>= 4.1) - System.Text.Encoding (>= 4.0.11) - System.Threading (>= 4.0.11) - System.Text.Json (4.7) - System.Threading (4.0.11) - System.Runtime (>= 4.1) - System.Threading.Tasks (>= 4.0.11) - System.Threading.Tasks (4.0.11) - Microsoft.NETCore.Platforms (>= 1.0.1) - Microsoft.NETCore.Targets (>= 1.0.1) - System.Runtime (>= 4.1) - System.Threading.Tasks.Dataflow (4.9) - System.Windows.Extensions (4.7) - System.Drawing.Common (>= 4.7) diff --git a/build.sh b/build.sh index 18f0d126..f7176799 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,2 @@ #!/bin/bash -dotnet tool restore -dotnet paket restore -dotnet fake run build.fsx $@ \ No newline at end of file +dotnet fsi build.fsx -- -p build \ No newline at end of file diff --git a/docs/api/.gitignore b/docs/api/.gitignore index 59670e50..15bc39d3 100644 --- a/docs/api/.gitignore +++ b/docs/api/.gitignore @@ -3,4 +3,4 @@ ############### *.yml .manifest -RELEASE_NOTES.md +CHANGELOG.md diff --git a/docs/docfx.json b/docs/docfx.json index 39fc4fdd..7cf743f8 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -19,7 +19,7 @@ { "files": [ "api/**.yml", - "api/RELEASE_NOTES.md" + "api/CHANGELOG.md" ] }, { diff --git a/docs/index.md b/docs/index.md index 9e883edb..270061f0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -53,6 +53,6 @@ It supports scenarios such as: ``` Copyright (c) Microsoft Corporation 2012-2017 Portions Copyright (c) Eric White Inc 2018-2019 -Portions Copyright (c) Sergey Tihon 2019-2021 +Portions Copyright (c) Sergey Tihon 2019-2024 Licensed under the MIT License. ``` \ No newline at end of file diff --git a/docs/toc.yml b/docs/toc.yml index 125d80be..22c0fb20 100644 --- a/docs/toc.yml +++ b/docs/toc.yml @@ -4,4 +4,4 @@ href: tutorials/ - name: API Documentation href: api/ - homepage: api/RELEASE_NOTES.md + homepage: api/CHANGELOG.md diff --git a/global.json b/global.json index 97216707..88848390 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.407", + "version": "8.0.203", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index e683bc1b..e503f988 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,7 +1,7 @@ source https://api.nuget.org/v3/index.json storage: none -framework: net6.0 +framework: net8.0 nuget DocumentFormat.OpenXml nuget DocumentFormat.OpenXml.Framework diff --git a/paket.lock b/paket.lock index 7a0bd5a6..69c2c1c2 100644 --- a/paket.lock +++ b/paket.lock @@ -1,10 +1,10 @@ STORAGE: NONE -RESTRICTION: == net6.0 +RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - DocumentFormat.OpenXml (3.0.1) - DocumentFormat.OpenXml.Framework (>= 3.0.1) - DocumentFormat.OpenXml.Framework (3.0.1) + DocumentFormat.OpenXml (3.0.2) + DocumentFormat.OpenXml.Framework (>= 3.0.2) + DocumentFormat.OpenXml.Framework (3.0.2) System.IO.Packaging (>= 8.0) IDisposableAnalyzers (4.0.7) Microsoft.CodeCoverage (17.9) @@ -18,32 +18,29 @@ NUGET Microsoft.TestPlatform.ObjectModel (>= 17.9) Newtonsoft.Json (>= 13.0.1) Newtonsoft.Json (13.0.3) - SixLabors.Fonts (2.0.1) - SixLabors.ImageSharp (3.1.2) - SixLabors.ImageSharp.Drawing (2.1.1) + SixLabors.Fonts (2.0.2) + SixLabors.ImageSharp (3.1.3) + SixLabors.ImageSharp.Drawing (2.1.2) SixLabors.Fonts (>= 2.0.1) - SixLabors.ImageSharp (>= 3.1.1) + SixLabors.ImageSharp (>= 3.1.3) System.Collections.Immutable (8.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) System.IO.Packaging (8.0) System.Reflection.Metadata (8.0) System.Collections.Immutable (>= 8.0) - System.Runtime.CompilerServices.Unsafe (6.0) System.Text.Encoding.CodePages (8.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - xunit (2.6.6) - xunit.analyzers (>= 1.10) - xunit.assert (>= 2.6.6) - xunit.core (2.6.6) + xunit (2.7) + xunit.analyzers (>= 1.11) + xunit.assert (>= 2.7) + xunit.core (2.7) xunit.abstractions (2.0.3) - xunit.analyzers (1.10) - xunit.assert (2.6.6) - xunit.core (2.6.6) - xunit.extensibility.core (2.6.6) - xunit.extensibility.execution (2.6.6) - xunit.extensibility.core (2.6.6) + xunit.analyzers (1.11) + xunit.assert (2.7) + xunit.core (2.7) + xunit.extensibility.core (2.7) + xunit.extensibility.execution (2.7) + xunit.extensibility.core (2.7) xunit.abstractions (>= 2.0.3) - xunit.extensibility.execution (2.6.6) - xunit.extensibility.core (2.6.6) - xunit.runner.console (2.6.6) - xunit.runner.visualstudio (2.5.6) + xunit.extensibility.execution (2.7) + xunit.extensibility.core (2.7) + xunit.runner.console (2.7) + xunit.runner.visualstudio (2.5.7) From f2906fd6daefcd541dbfa90ce9aa492b14abef44 Mon Sep 17 00:00:00 2001 From: Sergey Tihon Date: Tue, 19 Mar 2024 17:31:11 +0100 Subject: [PATCH 2/2] fix: copyright years --- Clippit/paket.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Clippit/paket.template b/Clippit/paket.template index 7609ea84..f2f064a8 100644 --- a/Clippit/paket.template +++ b/Clippit/paket.template @@ -14,7 +14,7 @@ licenseUrl requireLicenseAcceptance false copyright - Copyright 2012-2023 + Copyright 2012-2024 tags OpenXML PowerTools PowerPoint Word Excel HTML description