Skip to content

Commit 91d71c5

Browse files
PDFsharp-TeamPDFsharp-Team
committed
​
1 parent 3fb4e9e commit 91d71c5

File tree

434 files changed

+8907
-4595
lines changed

Some content is hidden

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

434 files changed

+8907
-4595
lines changed

‎PdfSharp.sln‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{18632E7D-54D
99
src\Directory.Build.targets = src\Directory.Build.targets
1010
src\Directory.Packages.props = src\Directory.Packages.props
1111
src\dotnet-test.Build.props = src\dotnet-test.Build.props
12+
src\nuget.config = src\nuget.config
1213
EndProjectSection
1314
EndProject
1415
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PDFsharp", "PDFsharp", "{5912CE0D-0DCE-479F-944A-0DFA4CE95A88}"
@@ -224,6 +225,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.TestHelper-gdi", "
224225
EndProject
225226
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.TestHelper-wpf", "src\tools\src\PdfSharp.TestHelper-wpf\PdfSharp.TestHelper-wpf.csproj", "{284F0281-F283-4EC3-BD60-DD0CD5A5442F}"
226227
EndProject
228+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.Fonts", "src\foundation\src\shared\src\PdfSharp.Fonts\PdfSharp.Fonts.csproj", "{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E}"
229+
EndProject
230+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.Fonts.TestApp", "src\foundation\src\shared\testapps\PdfSharp.Fonts.TestApp\PdfSharp.Fonts.TestApp.csproj", "{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776}"
231+
EndProject
232+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.Fonts.Test", "src\foundation\src\shared\tests\PdfSharp.Fonts.Test\PdfSharp.Fonts.Test.csproj", "{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14}"
233+
EndProject
234+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.Testing", "src\foundation\src\shared\src\PdfSharp.Testing\PdfSharp.Testing.csproj", "{D17FA884-98B9-41E2-AB27-2603F79000F5}"
235+
EndProject
236+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev", "dev", "{BA039CC9-132E-4103-BB47-87C3E3398F82}"
237+
ProjectSection(SolutionItems) = preProject
238+
dev\build-local-nuget-packages-release.ps1 = dev\build-local-nuget-packages-release.ps1
239+
dev\del-bin-and-obj.ps1 = dev\del-bin-and-obj.ps1
240+
dev\del-nupkg.ps1 = dev\del-nupkg.ps1
241+
dev\download-assets.ps1 = dev\download-assets.ps1
242+
dev\download-fonts.ps1 = dev\download-fonts.ps1
243+
dev\README.md = dev\README.md
244+
dev\run-tests.ps1 = dev\run-tests.ps1
245+
dev\update-local-nuget-packages-debug.ps1 = dev\update-local-nuget-packages-debug.ps1
246+
dev\update-local-nuget-packages-release.ps1 = dev\update-local-nuget-packages-release.ps1
247+
dev\_update-local-nuget-packages.ps1 = dev\_update-local-nuget-packages.ps1
248+
EndProjectSection
249+
EndProject
227250
Global
228251
GlobalSection(SolutionConfigurationPlatforms) = preSolution
229252
Debug|Any CPU = Debug|Any CPU
@@ -454,6 +477,10 @@ Global
454477
{AE89ED51-5A8A-4663-ABBE-2D399C8528F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
455478
{AE89ED51-5A8A-4663-ABBE-2D399C8528F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
456479
{AE89ED51-5A8A-4663-ABBE-2D399C8528F4}.Release|Any CPU.Build.0 = Release|Any CPU
480+
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
481+
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
482+
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
483+
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Release|Any CPU.Build.0 = Release|Any CPU
457484
{6E63D5DF-CADA-4AD5-8824-F1FB97185A49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
458485
{6E63D5DF-CADA-4AD5-8824-F1FB97185A49}.Debug|Any CPU.Build.0 = Debug|Any CPU
459486
{6E63D5DF-CADA-4AD5-8824-F1FB97185A49}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -462,10 +489,22 @@ Global
462489
{284F0281-F283-4EC3-BD60-DD0CD5A5442F}.Debug|Any CPU.Build.0 = Debug|Any CPU
463490
{284F0281-F283-4EC3-BD60-DD0CD5A5442F}.Release|Any CPU.ActiveCfg = Release|Any CPU
464491
{284F0281-F283-4EC3-BD60-DD0CD5A5442F}.Release|Any CPU.Build.0 = Release|Any CPU
465-
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
466-
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
467-
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
468-
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC}.Release|Any CPU.Build.0 = Release|Any CPU
492+
{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
493+
{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
494+
{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
495+
{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E}.Release|Any CPU.Build.0 = Release|Any CPU
496+
{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
497+
{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776}.Debug|Any CPU.Build.0 = Debug|Any CPU
498+
{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776}.Release|Any CPU.ActiveCfg = Release|Any CPU
499+
{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776}.Release|Any CPU.Build.0 = Release|Any CPU
500+
{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
501+
{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14}.Debug|Any CPU.Build.0 = Debug|Any CPU
502+
{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14}.Release|Any CPU.ActiveCfg = Release|Any CPU
503+
{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14}.Release|Any CPU.Build.0 = Release|Any CPU
504+
{D17FA884-98B9-41E2-AB27-2603F79000F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
505+
{D17FA884-98B9-41E2-AB27-2603F79000F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
506+
{D17FA884-98B9-41E2-AB27-2603F79000F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
507+
{D17FA884-98B9-41E2-AB27-2603F79000F5}.Release|Any CPU.Build.0 = Release|Any CPU
469508
EndGlobalSection
470509
GlobalSection(SolutionProperties) = preSolution
471510
HideSolutionNode = FALSE
@@ -558,6 +597,11 @@ Global
558597
{6B5BAD8B-F029-452D-A721-0CF5F95DA1DC} = {CC13B431-6963-480F-8C21-1F78A220A399}
559598
{6E63D5DF-CADA-4AD5-8824-F1FB97185A49} = {CC13B431-6963-480F-8C21-1F78A220A399}
560599
{284F0281-F283-4EC3-BD60-DD0CD5A5442F} = {CC13B431-6963-480F-8C21-1F78A220A399}
600+
{9EC27C83-FCD6-44B8-9BC6-9F270DD58C8E} = {DE458BB2-5942-4588-A74A-AE9CA86F284C}
601+
{2D32A2B9-CE4E-4F0D-9A76-1578FC3F4776} = {9A382224-6874-4ED3-8DF6-1DD3466A02CE}
602+
{D5A4EB68-4E71-4AAE-8A77-AACC46A55A14} = {A1AE894D-9061-44F0-8268-328AC41F403A}
603+
{D17FA884-98B9-41E2-AB27-2603F79000F5} = {DE458BB2-5942-4588-A74A-AE9CA86F284C}
604+
{BA039CC9-132E-4103-BB47-87C3E3398F82} = {31FE507C-F342-4DA4-9BE5-B3D2ED93E9CC}
561605
EndGlobalSection
562606
GlobalSection(ExtensibilityGlobals) = postSolution
563607
SolutionGuid = {D5FF5562-3C79-434B-B951-B84542D01625}

‎PdfSharp.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<s:Boolean x:Key="/Default/UserDictionary/Words/=encryptor/@EntryIndexedValue">True</s:Boolean>
2222
<s:Boolean x:Key="/Default/UserDictionary/Words/=Endian/@EntryIndexedValue">True</s:Boolean>
2323
<s:Boolean x:Key="/Default/UserDictionary/Words/=endianness/@EntryIndexedValue">True</s:Boolean>
24+
<s:Boolean x:Key="/Default/UserDictionary/Words/=endstream/@EntryIndexedValue">True</s:Boolean>
2425
<s:Boolean x:Key="/Default/UserDictionary/Words/=Failsafe/@EntryIndexedValue">True</s:Boolean>
2526
<s:Boolean x:Key="/Default/UserDictionary/Words/=flate/@EntryIndexedValue">True</s:Boolean>
2627
<s:Boolean x:Key="/Default/UserDictionary/Words/=flavlor/@EntryIndexedValue">True</s:Boolean>
@@ -29,6 +30,7 @@
2930
<s:Boolean x:Key="/Default/UserDictionary/Words/=Invers/@EntryIndexedValue">True</s:Boolean>
3031
<s:Boolean x:Key="/Default/UserDictionary/Words/=iref/@EntryIndexedValue">True</s:Boolean>
3132
<s:Boolean x:Key="/Default/UserDictionary/Words/=iter/@EntryIndexedValue">True</s:Boolean>
33+
<s:Boolean x:Key="/Default/UserDictionary/Words/=lucida/@EntryIndexedValue">True</s:Boolean>
3234
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdddl/@EntryIndexedValue">True</s:Boolean>
3335
<s:Boolean x:Key="/Default/UserDictionary/Words/=Migra/@EntryIndexedValue">True</s:Boolean>
3436
<s:Boolean x:Key="/Default/UserDictionary/Words/=panose/@EntryIndexedValue">True</s:Boolean>

‎README.md‎

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

3-
Version **6.1.0-preview-2**
4-
Published **2024-03-21**
3+
Version **6.1.0-preview-3**
4+
Published **2024-04-30**
55

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

@@ -33,8 +33,9 @@ Execute
3333
`dotnet build` should build the solution without any warnings or errors.
3434

3535
* You need the latest .NET SDK version installed
36-
* If you got an exception from `GitVersion.MsBuild` let us know.
37-
You can set a tag to define a valid version, e.g.: `git tag v6.1.0` to make it work.
36+
* Please note that you need a git repository with at least one commit in order to build the PDFsharp solution.
37+
Without a git repo with at least one commit, you will get an error message from `GitVersion.MsBuild` while building the solution.
38+
You can set a tag to define a valid version, e.g.: `git tag v6.1.0` to make it build with a specific version number. Without tag, version 0.1.0 will be used.
3839

3940
### Central package management
4041

@@ -65,3 +66,8 @@ Stefan Lange
6566
Thomas Hövel
6667
Martin Ossendorf
6768
Andreas Seifert
69+
70+
## Libraries used by PDFsharp
71+
72+
The Core build of PDFsharp uses BigGustave to read PNG images. BigGustave was released into the public domain and does not restrict the MIT license used by PDFsharp.
73+
Link to project repository: https://github.com/EliotJones/BigGustave

‎dev/_update-local-nuget-packages.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Updates local nuget packages.
1+
# Updates local nuget packages - implementation
22

33
#Requires -Version 7
44
#Requires -PSEdition Core

‎dev/del-bin-and-obj.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Delete contents of bin and obj folders
2+
13
#Requires -Version 7
24
#Requires -PSEdition Core
35

‎dev/download-assets.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ foreach ($asset in $assetList) {
4444

4545
$idx = $asset.LastIndexOf("/")
4646
$assetFolder = $asset.Substring(0, $idx)
47-
Expand-Archive "$destination/$asset" -DestinationPath "$destination/$assetFolder" -Force
47+
Expand-Archive -Force "$destination/$asset" -DestinationPath "$destination/$assetFolder"
4848

4949
Remove-Item "$destination/$asset"
5050
# Not all ZIP files contain compress.ps1. Suppress error messages.
@@ -53,17 +53,17 @@ foreach ($asset in $assetList) {
5353

5454
# Part 2: Download fonts
5555

56-
$source = "https://fonts.google.com/"
56+
$source = "https://assets.pdfsharp.net/"
5757
$destination = "$PSScriptRoot/../assets/fonts/Noto/Noto_Sans/static/"
5858

5959
New-Item -ItemType Directory -Path $destination
6060
New-Item -ItemType Directory -Path "$destination/temp/"
6161

62-
$url = $source + "download?family=Noto%20Sans"
62+
$url = $source + "fonts/Noto/Noto_Sans.zip"
6363
$dest = $destination
6464

6565
Invoke-WebRequest $url -OutFile "$dest/temp/noto_sans_temp.zip"
66-
Expand-Archive "$destination/temp/noto_sans_temp.zip" -DestinationPath "$destination/temp/" -Force
66+
Expand-Archive -Force "$destination/temp/noto_sans_temp.zip" -DestinationPath "$destination/temp/"
6767

6868
# Successfully extracted. Now move the fonts files.
6969
[string[]]$folderList = @(

‎dev/download-fonts.ps1‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
Write-Host "Not in use anymore"
2+
Exit
3+
4+
# Downloads assets.
5+
6+
# This file downloads assets required to compile the PDFsharp/MigraDoc source codes.
7+
# This file runs under PowerShell Core 7.0 or higher.
8+
9+
#Requires -Version 7
10+
#Requires -PSEdition Core
11+
12+
# Download fonts
13+
# https://fonts.google.com/download?family=Noto%20Sans%20TC
14+
15+
$source = "https://fonts.google.com/"
16+
$destination = "$PSScriptRoot/../assets/fonts/Noto/Noto_Sans_TC"
17+
18+
New-Item -ItemType Directory -Path $destination
19+
# New-Item -ItemType Directory -Path "$destination/temp/"
20+
21+
$url = $source + "download?family=Noto%20Sans%20TC"
22+
$dest = $destination
23+
24+
Invoke-WebRequest $url -OutFile "$dest/noto_sans_TC.zip"
25+
Expand-Archive "$destination/noto_sans_TC.zip" -DestinationPath "$destination" -Force
26+
27+
Remove-Item "$destination//noto_sans_TC.zip" -Recurse
28+
# # Successfully extracted. Now move the fonts files.
29+
# [string[]]$folderList = @(
30+
# "NotoSans"
31+
# "NotoSans_Condensed"
32+
# "NotoSans_ExtraCondensed"
33+
# "NotoSans_SemiCondensed"
34+
# )
35+
36+
# foreach ($folder in $folderList) {
37+
# Copy-Item -Path "$destination/temp/static/$folder/*" -Include "*.ttf" -Destination $dest
38+
# }
39+
40+
# Remove the folder.
41+
# Remove-Item "$destination/temp" -Recurse

‎dev/run-tests.ps1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
If changes to the script are needed, implement them in the PDFsharp repository and update all copies of the script in other repositories.
4646
#>
4747

48+
<#
49+
BUG: Run with release build not implemented.
50+
BUG: After .\dev\run-tests.ps1 script runs in an endless error loop.
51+
BUG: Allow to run all tests, including GBE.
52+
#>
53+
4854
#Requires -Version 7
4955
#Requires -PSEdition Core
5056

‎dev/update-local-nuget-packages-debug.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Update local nuget packages debug build
2+
13
#Requires -Version 7
24
#Requires -PSEdition Core
35

‎dev/update-local-nuget-packages-release.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Update local nuget packages release build
2+
13
#Requires -Version 7
24
#Requires -PSEdition Core
35

0 commit comments

Comments
 (0)