Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
PDFsharp-Team committed Jul 1, 2024
1 parent 963cd09 commit 1956cbf
Show file tree
Hide file tree
Showing 60 changed files with 223 additions and 113 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PDFsharp & MigraDoc 6

Version **6.1.0**
Published **2024-05-28**
Version **6.1.1**
Published **2024-07-01**

This is a version of the **PDFsharp** project, the main project of PDFsharp & MigraDoc 6 with updates for C# 12 and .NET 6.

Expand Down
4 changes: 2 additions & 2 deletions docs/BoilerplateText.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Note: Do not replicate information from the meta data (like "6.0.0" or "prerelea
PDFsharp:
This is a version of PDFsharp using .NET 6.
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
We also publish packages that contain PDFsharp plus MigraDoc.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
Expand All @@ -77,6 +77,6 @@ https://docs.pdfsharp.net/link/readme-v6.1.html
PDFsharp & MigraDoc:
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
4 changes: 3 additions & 1 deletion gitversion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# 23-05-24
# 25-06-30
assembly-versioning-scheme: MajorMinorPatch
# PDFSHARP_BUILD_VERSION are the days since 2005-01-01.
assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:PDFSHARP_BUILD_VERSION ?? 7121}'
mode: Mainline
assembly-informational-format: '{NuGetVersion}'
branches:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<!--<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</metadata>
<files>
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="README.md" />
<file src="..\..\..\..\..\assets\migradoc\images\MigraDoc-128x128.png" target="images\" />
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</metadata>
<files>
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="README.md" />
<file src="..\..\..\..\..\assets\migradoc\images\MigraDoc-128x128.png" target="images\" />
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
2 changes: 1 addition & 1 deletion src/foundation/nuget/src/MigraDoc.NuGet/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</metadata>
<files>
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="README.md" />
<file src="..\..\..\..\..\assets\pdfsharp\images\PDFsharp-128x128.png" target="images\" />
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This is a version of PDFsharp using .NET 6.
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
We also publish packages that contain PDFsharp plus MigraDoc.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</metadata>
<files>
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="bin\$config$\net472\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
<file src="README.md" />
<file src="..\..\..\..\..\assets\pdfsharp\images\PDFsharp-128x128.png" target="images\" />
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This is a version of PDFsharp using .NET 6.
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
We also publish packages that contain PDFsharp plus MigraDoc.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
2 changes: 1 addition & 1 deletion src/foundation/nuget/src/PDFsharp.NuGet/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This is a version of PDFsharp using .NET 6.
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472’.
We also publish packages that contain PDFsharp plus MigraDoc.
See the project docs site for further information:
https://docs.pdfsharp.net/link/readme-v6.1.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.0;net472</TargetFrameworks>
<RootNamespace>MigraDoc</RootNamespace>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\..\StrongnameKey.snk</AssemblyOriginatorKeyFile>
Expand All @@ -15,11 +15,11 @@
<DefineConstants>;</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<RootNamespace>MigraDoc</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
Expand All @@ -15,11 +15,11 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<RootNamespace>MigraDoc</RootNamespace>
<UseWPF>true</UseWPF>
Expand All @@ -15,11 +15,11 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<RootNamespace>MigraDoc</RootNamespace>
<DefineConstants>GDI</DefineConstants>
Expand All @@ -14,11 +14,11 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<RootNamespace>MigraDoc</RootNamespace>
<DefineConstants>WPF</DefineConstants>
Expand All @@ -15,11 +15,11 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472-windows|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net472|AnyCPU'">
<WarningLevel>0</WarningLevel>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<RootNamespace>MigraDoc.GrammarByExample_GDI</RootNamespace>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<RootNamespace>MigraDoc.GrammarByExample_WPF</RootNamespace>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<UseWPF>true</UseWPF>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
<TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<UseWPF>true</UseWPF>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 1956cbf

Please sign in to comment.