Skip to content

Commit 91feca7

Browse files
committed
1 parent d751497 commit 91feca7

File tree

223 files changed

+4620
-1248
lines changed

Some content is hidden

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

223 files changed

+4620
-1248
lines changed

PdfSharp.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
<s:Boolean x:Key="/Default/UserDictionary/Words/=tabstop/@EntryIndexedValue">True</s:Boolean>
4545
<s:Boolean x:Key="/Default/UserDictionary/Words/=tabstops/@EntryIndexedValue">True</s:Boolean>
4646
<s:Boolean x:Key="/Default/UserDictionary/Words/=tabstop_0027s/@EntryIndexedValue">True</s:Boolean>
47+
<s:Boolean x:Key="/Default/UserDictionary/Words/=unfilter/@EntryIndexedValue">True</s:Boolean>
4748
<s:Boolean x:Key="/Default/UserDictionary/Words/=versioning/@EntryIndexedValue">True</s:Boolean>
4849
<s:Boolean x:Key="/Default/UserDictionary/Words/=xgfx/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

README.md

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

3-
Version **6.0.0-preview-2**
4-
Published **2023-04-25**
3+
Version **6.0.0-preview-3**
4+
Published **2023-07-27**
55

6-
This is the second preview of the **PDFsharp** project, the main project of PDFsharp & MigraDoc 6.0 with updates for C# 10 and .NET 6.0.
6+
This is the third preview 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)
Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
# Updates local nuget packages.
2-
3-
#Requires -Version 7
4-
#Requires -PSEdition Core
5-
6-
param (
7-
[Parameter(Mandatory = $false)] [bool]$deleteBinAndObj = $true
8-
)
9-
10-
Push-Location $PSScriptRoot
11-
12-
try {
13-
Write-Host "Delete bin and obj " $deleteBinAndObj
14-
if ($deleteBinAndObj) {
15-
Write-Host "Deleting BIN and OBJ"
16-
.\del-bin-and-obj.ps1
17-
Write-Host "Done deleting bin and obj"
18-
}
19-
20-
Push-Location ..
21-
try {
22-
Write-Host "Invoking ’dotnet build’"
23-
dotnet build -c release
24-
$build = $LASTEXITCODE
25-
Write-Host "’dotnet build’ has finished"
26-
}
27-
finally {
28-
Pop-Location
29-
}
30-
31-
if ($build -gt 0) {
32-
Write-Host "’dotnet build’ failed with code " $build
33-
throw "’dotnet build’ failed with code " + $build
34-
}
35-
36-
.\update-local-nuget-packages-release.ps1
37-
}
38-
finally {
39-
Pop-Location
40-
}
1+
# Updates local nuget packages.
2+
3+
#Requires -Version 7
4+
#Requires -PSEdition Core
5+
6+
param (
7+
[Parameter(Mandatory = $false)] [bool]$deleteBinAndObj = $true
8+
)
9+
10+
Push-Location $PSScriptRoot
11+
12+
try {
13+
Write-Host "Delete bin and obj " $deleteBinAndObj
14+
if ($deleteBinAndObj) {
15+
Write-Host "Deleting BIN and OBJ"
16+
.\del-bin-and-obj.ps1
17+
Write-Host "Done deleting bin and obj"
18+
}
19+
20+
Push-Location ..
21+
try {
22+
Write-Host "Invoking ’dotnet build’"
23+
dotnet build -c release
24+
$build = $LASTEXITCODE
25+
Write-Host "’dotnet build’ has finished"
26+
}
27+
finally {
28+
Pop-Location
29+
}
30+
31+
if ($build -gt 0) {
32+
Write-Host "’dotnet build’ failed with code " $build
33+
throw "’dotnet build’ failed with code " + $build
34+
}
35+
36+
.\update-local-nuget-packages-release.ps1
37+
}
38+
finally {
39+
Pop-Location
40+
}

docs/BoilerplateText.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ MigraDoc is a .NET library that allows developers to create documents such as PD
6565

6666
PDFsharp:
6767
This is a preview version of PDFsharp 6.0.0 using .NET 6.
68-
The package ’PdfSharp’ can be used on any platform including Windows and Linux.
69-
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only.
68+
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
69+
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
7070
We also publish packages that contain PDFsharp plus MigraDoc.
7171
See the project docs site for further information:
7272
https://docs.pdfsharp.net/history/readme-v6.0.html
7373

7474

7575
PDFsharp & MigraDoc:
7676
This is a preview version of PDFsharp and MigraDoc Foundation 6.0.0 using .NET 6.
77-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux.
78-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only.
77+
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
78+
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
7979
See the project docs site for further information:
8080
https://docs.pdfsharp.net/history/readme-v6.0.html

docs/DevNotes.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,40 @@
55
## List of files to be checked before publishing a release
66

77
README.md
8+
9+
10+
## Comments
11+
12+
### DELETE yyyy-mm-dd
13+
14+
Here is code that is replaced by newer code and should be deleted in the future.
15+
But keeps here at the moment as reference in case the new code has bugs.
16+
17+
After the specified date the code can be deleted.
18+
19+
### KEEP
20+
21+
Here is older code that is not used anymore but keeps here for
22+
documentation or reference purposes and shall not be removed.
23+
24+
### TODO
25+
26+
**Here is something to be done __before the project is released__.**
27+
28+
### BUG
29+
30+
**Here is a bug that must be fixed before the project is released.**
31+
32+
### IMPROV
33+
34+
Here is code that substantially works but has potential for improvements
35+
for better reliability.
36+
37+
### OBSERVATION
38+
39+
40+
### EXPERIMENTAL
41+
42+
43+
### TEST
44+
Here is code that should be coved by (more) unit tests.

gitversion.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# 23-03-22
1+
# 23-05-24
22
assembly-versioning-scheme: MajorMinorPatch
33
mode: Mainline
44
assembly-informational-format: '{NuGetVersion}'
55
branches:
66
develop: # Current development
7-
# 5.0.0-develop.123
7+
# branch: develop -- is always 'develop'
8+
# version: {6.0.0}-develop.123 -- taken from git tag plus 'develop' plus commit count
89
regex: ^develop$
910
mode: ContinuousDeployment
1011
increment: None
@@ -13,11 +14,10 @@ branches:
1314
track-merge-target: true
1415
source-branches: ['feature', 'release']
1516
release: # Release and preview versions.
16-
# 22.40.0 / 22.40.0-rc-1
17-
# 5.0.0-preview-2
17+
# branch: release/6.0.0-preview-3 -- must be same as git tag without leading 'v'.
18+
# version: {6-0-0-preview-3} -- taken from git tag only
1819
regex: ^(release[/-]|master)
19-
# ^(user|feature|fix)[/-]
20-
# Must not have mode set to be mainline
20+
# Must not have mode set to be mainline? WTF?
2121
increment: None
2222
tag: ''
2323
prevent-increment-of-merged-branch-version: true
@@ -26,8 +26,8 @@ branches:
2626
is-mainline: true
2727
source-branches: ['develop', 'release', 'feature']
2828
feature: # Features and bug fixes.
29-
# 22.40.0-dev-anse-gvupd.1
30-
# 5.0.0-dev-my-branch.123
29+
# branch: feature/my-new-feature -- arbitrary name, e.g. a new preview
30+
# version: {6.0.0}-dev-{my-new-feature}.123 -- taken from git tag plus 'dev-' plus branch name plus commit count
3131
regex: ^(user|feature|fix)[/-]
3232
mode: ContinuousDeployment
3333
increment: None
@@ -39,6 +39,4 @@ branches:
3939
regex: ^(pull|pull\-requests|pr)[/-]
4040
tag: PullRequest
4141
mode: ContinuousDeployment
42-
#ignore:
43-
# sha: []
4442
merge-message-formats: {}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is a preview version of PDFsharp and MigraDoc Foundation 6.0.0 using .NET 6.
2-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux.
3-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only.
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’.
44
See the project docs site for further information:
55
https://docs.pdfsharp.net/link/readme-v6.0.html
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is a preview version of PDFsharp and MigraDoc Foundation 6.0.0 using .NET 6.
2-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux.
3-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only.
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’.
44
See the project docs site for further information:
55
https://docs.pdfsharp.net/link/readme-v6.0.html
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is a preview version of PDFsharp and MigraDoc Foundation 6.0.0 using .NET 6.
2-
The package ’PDFsharp-MigraDoc’ can be used on any platform including Windows and Linux.
3-
The packages ’PDFsharp-MigraDoc-GDI’ and ’PDFsharp-MigraDoc-WPF’ can be used under Windows only.
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’.
44
See the project docs site for further information:
55
https://docs.pdfsharp.net/link/readme-v6.0.html
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This is a preview version of PDFsharp 6.0.0 using .NET 6.
2-
The package ’PdfSharp’ can be used on any platform including Windows and Linux.
3-
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only.
2+
The package ’PdfSharp’ can be used on any platform including Windows and Linux. The Target Framework is ’net6.0’.
3+
The packages ’PDFsharp-gdi’ and ’PDFsharp-wpf’ can be used under Windows only. The Target Framework is ’net6.0-windows’.
44
We also publish packages that contain PDFsharp plus MigraDoc.
55
See the project docs site for further information:
66
https://docs.pdfsharp.net/link/readme-v6.0.html

0 commit comments

Comments
 (0)