Skip to content

Commit 0426cab

Browse files
LakerfieldLakerfield
committed
Add netstandard projects + pdfsharp image tweak
1 parent 7af2b4b commit 0426cab

File tree

7 files changed

+101
-4
lines changed

7 files changed

+101
-4
lines changed

‎MigraDoc/src/MigraDoc-netstandard.sln

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.15
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigraDoc.DocumentObjectModel-netstandard", "MigraDoc.DocumentObjectModel\MigraDoc.DocumentObjectModel-netstandard.csproj", "{9E42FB80-E214-4AC6-9744-3D4B5D911FED}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigraDoc.Rendering-netstandard", "MigraDoc.Rendering\MigraDoc.Rendering-netstandard.csproj", "{26C73013-8CCD-45F1-B78B-9713199E3044}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp-netstandard", "..\..\PDFsharp\src\PdfSharp\PdfSharp-netstandard.csproj", "{EF308AC8-8F42-488F-AB45-8D04E456E9E2}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfSharp.Charting-netstandard", "..\..\PDFsharp\src\PdfSharp.Charting\PdfSharp.Charting-netstandard.csproj", "{F43AF66F-9F0A-4F0D-BC8F-8039BC3D14F7}"
13+
EndProject
14+
Global
15+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16+
Debug|Any CPU = Debug|Any CPU
17+
Release|Any CPU = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{9E42FB80-E214-4AC6-9744-3D4B5D911FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{9E42FB80-E214-4AC6-9744-3D4B5D911FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{9E42FB80-E214-4AC6-9744-3D4B5D911FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{9E42FB80-E214-4AC6-9744-3D4B5D911FED}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{26C73013-8CCD-45F1-B78B-9713199E3044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{26C73013-8CCD-45F1-B78B-9713199E3044}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{26C73013-8CCD-45F1-B78B-9713199E3044}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{26C73013-8CCD-45F1-B78B-9713199E3044}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{EF308AC8-8F42-488F-AB45-8D04E456E9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{EF308AC8-8F42-488F-AB45-8D04E456E9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{EF308AC8-8F42-488F-AB45-8D04E456E9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{EF308AC8-8F42-488F-AB45-8D04E456E9E2}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{F43AF66F-9F0A-4F0D-BC8F-8039BC3D14F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{F43AF66F-9F0A-4F0D-BC8F-8039BC3D14F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{F43AF66F-9F0A-4F0D-BC8F-8039BC3D14F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{F43AF66F-9F0A-4F0D-BC8F-8039BC3D14F7}.Release|Any CPU.Build.0 = Release|Any CPU
36+
EndGlobalSection
37+
GlobalSection(SolutionProperties) = preSolution
38+
HideSolutionNode = FALSE
39+
EndGlobalSection
40+
GlobalSection(ExtensibilityGlobals) = postSolution
41+
SolutionGuid = {66D8D584-CE9D-48CD-9FEF-50826C334D79}
42+
EndGlobalSection
43+
EndGlobal

‎MigraDoc/src/MigraDoc.DocumentObjectModel/MigraDoc.DocumentObjectModel-netstandard.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
7+
<AssemblyName>MigraDoc.DocumentObjectModel</AssemblyName>
8+
<RootNamespace>MigraDoc.DocumentObjectModel</RootNamespace>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12+
<DefineConstants>TRACE;DEBUG;NETSTANDARD2_0;PORTABLE</DefineConstants>
13+
</PropertyGroup>
14+
15+
</Project>

‎MigraDoc/src/MigraDoc.DocumentObjectModel/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
using System.Runtime.InteropServices;
3131
using MigraDoc.DocumentObjectModel;
3232

33+
#if !PORTABLE
3334
[assembly: AssemblyTitle(VersionInfo.Title)]
3435
[assembly: AssemblyDescription(VersionInfo.Description)]
3536
[assembly: AssemblyConfiguration("")]
@@ -43,6 +44,7 @@
4344
[assembly: AssemblyTrademark(VersionInfo.Trademark)]
4445
[assembly: AssemblyVersion(VersionInfo.Version)]
4546
[assembly: AssemblyCulture(VersionInfo.Culture)]
47+
#endif
4648

4749
[assembly: InternalsVisibleTo("MigraDoc.Forms-gdi, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
4850
[assembly: InternalsVisibleTo("MigraDoc.Forms-wpf, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
@@ -53,7 +55,6 @@
5355
[assembly: InternalsVisibleTo("MigraDoc.Rendering-sl, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
5456
[assembly: InternalsVisibleTo("MigraDoc.Rendering-wp, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
5557
[assembly: InternalsVisibleTo("MigraDoc.Rendering-wrt, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
56-
5758
[assembly: InternalsVisibleTo("MigraDoc.RtfRendering, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
5859
[assembly: InternalsVisibleTo("MigraDoc.RtfRendering-gdi, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]
5960
[assembly: InternalsVisibleTo("MigraDoc.RtfRendering-wpf, PublicKey=00240000048000009400000006020000002400005253413100040000010001008794e803e566eccc3c9181f52c4f7044e5442cc2ce3cbba9fc11bc4186ba2e446cd31deea20c1a8f499e978417fad2bc74143a4f8398f7cf5c5c0271b0f7fe907c537cff28b9d582da41289d1dae90168a3da2a5ed1115210a18fdae832479d3e639ca4003286ba8b98dc9144615c040ed838981ac816112df3b5a9e7cab4fbb")]

‎MigraDoc/src/MigraDoc.Rendering/MigraDoc.Rendering-netstandard.csproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
7+
<RootNamespace>MigraDoc.Rendering</RootNamespace>
8+
<AssemblyName>MigraDoc.Rendering</AssemblyName>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12+
<DefineConstants>TRACE;DEBUG;NETSTANDARD2_0;PORTABLE</DefineConstants>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<Compile Remove="Rendering.Forms\**" />
17+
<Compile Remove="Rendering.Printing\**" />
18+
<Compile Remove="Rendering.Windows\**" />
19+
<EmbeddedResource Remove="Rendering.Forms\**" />
20+
<EmbeddedResource Remove="Rendering.Printing\**" />
21+
<EmbeddedResource Remove="Rendering.Windows\**" />
22+
<None Remove="Rendering.Forms\**" />
23+
<None Remove="Rendering.Printing\**" />
24+
<None Remove="Rendering.Windows\**" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\..\..\PDFsharp\src\PdfSharp.Charting\PdfSharp.Charting-netstandard.csproj" />
29+
<ProjectReference Include="..\..\..\PDFsharp\src\PdfSharp\PdfSharp-netstandard.csproj" />
30+
<ProjectReference Include="..\MigraDoc.DocumentObjectModel\MigraDoc.DocumentObjectModel-netstandard.csproj" />
31+
</ItemGroup>
32+
33+
</Project>

‎MigraDoc/src/MigraDoc.Rendering/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
// DEALINGS IN THE SOFTWARE.
2626
#endregion
2727

28+
#if !PORTABLE
2829
using System.Reflection;
2930
using System.Runtime.CompilerServices;
3031
using System.Runtime.InteropServices;
@@ -47,3 +48,4 @@
4748
[assembly: ComVisible(false)]
4849
//[assembly: AssemblyDelaySign(false)]
4950
//[assembly: AssemblyKeyName("")]
51+
#endif

‎MigraDoc/src/MigraDoc.Rendering/Rendering/ImageRenderer.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,15 +349,18 @@ XImage CreateXImage(string uri)
349349
XImage image = XImage.FromStream(stream);
350350
return image;
351351
}
352+
#elif PORTABLE
353+
XImage image = XImage.FromStream(() => new MemoryStream(bytes));
354+
return image;
352355
#else
353356
using (Stream stream = new MemoryStream(bytes))
354357
{
355358
XImage image = XImage.FromStream(stream);
356359
return image;
357360
}
358361
#endif
359-
}
360-
return XImage.FromFile(uri);
362+
}
363+
return XImage.FromFile(uri);
361364
}
362365

363366
readonly Image _image;

‎PDFsharp

0 commit comments

Comments
 (0)