Skip to content

Commit b28bc32

Browse files
PDFsharp-TeamPDFsharp-Team
committed
​
1 parent b748631 commit b28bc32

File tree

197 files changed

+2482
-8785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+2482
-8785
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# PDFsharp & MigraDoc 6.0
22

3-
Version **6.0.0**
4-
Published **2023-11-07**
3+
Version **6.1.0-preview-1**
4+
Published **2023-12-21**
55

6-
This is a stable version of the **PDFsharp** project, the main project of PDFsharp & MigraDoc 6.0 with updates for C# 10 and .NET 6.0.
6+
This is a preview version of the **PDFsharp** project, the main project of PDFsharp & MigraDoc 6.0 with updates for C# 10 and .NET 6.0.
77

88
PDFsharp: Copyright (c) 2005-2023 empira Software GmbH, Troisdorf (Cologne Area, Germany)
99
MigraDoc: Copyright (c) 2001-2023 empira Software GmbH, Troisdorf (Cologne Area, Germany)
@@ -31,7 +31,7 @@ Execute `.\dev\download-assets.ps1`
3131

3232
* You need the latest .NET SDK version installed
3333
* If you got an exception from `GitVersion.MsBuild` let us know.
34-
You can set a tag to define a valid version, e.g.: `git tag v6.0.0` to make it work.
34+
You can set a tag to define a valid version, e.g.: `git tag v6.1.0` to make it work.
3535

3636
### Central package management
3737

‎dev/update-nuget-bnt.ps1‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/BoilerplateText.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ Note: Do not replicate information from the meta data (like "6.0.0" or "prerelea
6767

6868
PDFsharp:
6969
This is a version of PDFsharp using .NET 6.
70-
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
71-
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
70+
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
71+
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Frameworks are ’net6.0-windows’ and ’net472-windows’.
7272
We also publish packages that contain PDFsharp plus MigraDoc.
7373
See the project docs site for further information:
74-
https://docs.pdfsharp.net/history/readme-v6.0.html
74+
https://docs.pdfsharp.net/history/readme-v6.1.html
7575

7676

7777
PDFsharp & MigraDoc:
7878
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
79-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
80-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
79+
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
80+
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’.
8181
See the project docs site for further information:
82-
https://docs.pdfsharp.net/history/readme-v6.0.html
82+
https://docs.pdfsharp.net/history/readme-v6.1.html

‎src/Directory.Packages.props‎

Lines changed: 114 additions & 161 deletions
Large diffs are not rendered by default.

‎src/foundation/nuget/src/Dummy-PDFsharp.NuGet-wpf/Dummy-PDFsharp.NuGet-wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
55
<EnableWindowsTargeting>true</EnableWindowsTargeting>
66
<!--<NoBuild>true</NoBuild>
77
<IncludeBuildOutput>false</IncludeBuildOutput>-->

‎src/foundation/nuget/src/MigraDoc.NuGet-gdi/MigraDoc.NuGet-gdi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
55
<EnableWindowsTargeting>true</EnableWindowsTargeting>
66
<NoBuild>true</NoBuild>
77
<IncludeBuildOutput>false</IncludeBuildOutput>

‎src/foundation/nuget/src/MigraDoc.NuGet-gdi/MigraDoc.NuGet-gdi.nuspec‎

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,45 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3-
<metadata>
4-
<id>$id$</id>
5-
<version>$version$</version>
6-
<description>$description$</description>
7-
<summary>$summary$</summary>
8-
<authors>$authors$</authors>
9-
<owners>$owners$</owners>
10-
<projectUrl>$projectUrl$</projectUrl>
11-
<license type="expression">MIT</license>
12-
<icon>images\MigraDoc-128x128.png</icon>
13-
<readme>README.md</readme>
14-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
15-
<releaseNotes>$releaseNotes$</releaseNotes>
16-
<copyright>$copyright$</copyright>
17-
<tags>$tags$</tags>
18-
<repository type="git" url="https://github.com/empira/PDFsharp" branch="master" commit="" />
19-
<title>$title$</title>
20-
<dependencies>
21-
<group targetFramework="net6.0-windows7.0">
22-
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
23-
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
24-
</group>
25-
</dependencies>
26-
<frameworkReferences>
27-
<group targetFramework="net6.0-windows7.0">
28-
<frameworkReference name="Microsoft.WindowsDesktop.App.WindowsForms" />
29-
</group>
30-
</frameworkReferences>
31-
</metadata>
32-
<files>
33-
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
34-
<file src="README.md" />
35-
<file src="..\..\..\..\..\assets\migradoc\images\MigraDoc-128x128.png" target="images\" />
36-
</files>
3+
<metadata>
4+
<id>$id$</id>
5+
<version>$version$</version>
6+
<description>$description$</description>
7+
<summary>$summary$</summary>
8+
<authors>$authors$</authors>
9+
<owners>$owners$</owners>
10+
<projectUrl>$projectUrl$</projectUrl>
11+
<license type="expression">MIT</license>
12+
<icon>images\MigraDoc-128x128.png</icon>
13+
<readme>README.md</readme>
14+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
15+
<releaseNotes>$releaseNotes$</releaseNotes>
16+
<copyright>$copyright$</copyright>
17+
<tags>$tags$</tags>
18+
<repository type="git" url="https://github.com/empira/PDFsharp" branch="master" commit="" />
19+
<title>$title$</title>
20+
<dependencies>
21+
<group targetFramework="net6.0-windows7.0">
22+
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
23+
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
24+
</group>
25+
<group targetFramework="net472">
26+
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
27+
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
28+
</group>
29+
</dependencies>
30+
<frameworkReferences>
31+
<group targetFramework="net6.0-windows7.0">
32+
<frameworkReference name="Microsoft.WindowsDesktop.App.WindowsForms" />
33+
</group>
34+
<group targetFramework="net472">
35+
<!--<frameworkReference name="Microsoft.WindowsDesktop.App.WindowsForms" />-->
36+
</group>
37+
</frameworkReferences>
38+
</metadata>
39+
<files>
40+
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
41+
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
42+
<file src="README.md" />
43+
<file src="..\..\..\..\..\assets\migradoc\images\MigraDoc-128x128.png" target="images\" />
44+
</files>
3745
</package>

‎src/foundation/nuget/src/MigraDoc.NuGet-gdi/ReleaseNotes.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is a version of PDFsharp and MigraDoc Foundation using .NET 6.
2-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
3-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
2+
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Frameworks are ’net6.0’ and ’netstandard2.0’.
3+
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’.
44
See the project docs site for further information:
5-
https://docs.pdfsharp.net/link/readme-v6.0.html
5+
https://docs.pdfsharp.net/link/readme-v6.1.html

‎src/foundation/nuget/src/MigraDoc.NuGet-wpf/MigraDoc.NuGet-wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFrameworks>net6.0-windows;net472-windows</TargetFrameworks>
55
<EnableWindowsTargeting>true</EnableWindowsTargeting>
66
<NoBuild>true</NoBuild>
77
<IncludeBuildOutput>false</IncludeBuildOutput>

‎src/foundation/nuget/src/MigraDoc.NuGet-wpf/MigraDoc.NuGet-wpf.nuspec‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<summary>$summary$</summary>
88
<authors>$authors$</authors>
99
<owners>$owners$</owners>
10-
<projectUrl>$projectUrl$</projectUrl>
10+
<projectUrl>$projectUrl$</projectUrl>
1111
<license type="expression">MIT</license>
1212
<icon>images\MigraDoc-128x128.png</icon>
1313
<readme>README.md</readme>
@@ -19,18 +19,26 @@
1919
<title>$title$</title>
2020
<dependencies>
2121
<group targetFramework="net6.0-windows7.0">
22-
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
23-
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
22+
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
23+
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
24+
</group>
25+
<group targetFramework="net472">
26+
<dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
27+
<dependency id="Microsoft.Extensions.Logging.Console" version="6.0.0" />
2428
</group>
2529
</dependencies>
2630
<frameworkReferences>
2731
<group targetFramework="net6.0-windows7.0">
2832
<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />
2933
</group>
34+
<group targetFramework="net472">
35+
<!--<frameworkReference name="Microsoft.WindowsDesktop.App.WPF" />-->
36+
</group>
3037
</frameworkReferences>
3138
</metadata>
3239
<files>
3340
<file src="bin\$config$\net6.0-windows\**\*.*" target="lib\net6.0-windows7.0\" exclude="**\*NuGet*"/>
41+
<file src="bin\$config$\net472-windows\**\*.*" target="lib\net472\" exclude="**\*NuGet*"/>
3442
<file src="README.md" />
3543
<file src="..\..\..\..\..\assets\migradoc\images\MigraDoc-128x128.png" target="images\" />
3644
</files>

0 commit comments

Comments
 (0)