diff --git a/src/BuildAll-PdfSharp.sln b/src/BuildAll-PdfSharp.sln
index 51818cd7..00e9c810 100644
--- a/src/BuildAll-PdfSharp.sln
+++ b/src/BuildAll-PdfSharp.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDFsharp", "PdfSharp\PDFsharp.csproj", "{5A6055BC-BF86-4FDD-9F62-0109DB7A303B}"
 EndProject
@@ -113,21 +113,32 @@ Global
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|ARM.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|Win32.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Debug|x86.Build.0 = Debug|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|ARM.Build.0 = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Win32.ActiveCfg = Release|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|Win32.Build.0 = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|x64.Build.0 = Release|Any CPU
 		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8AC0A387-E736-4BD8-8728-00F1303AE6D3}
+	EndGlobalSection
 EndGlobal
diff --git a/src/PdfSharp-gdi/PdfSharp-gdi.csproj b/src/PdfSharp-gdi/PdfSharp-gdi.csproj
index 941eee61..e589b128 100644
--- a/src/PdfSharp-gdi/PdfSharp-gdi.csproj
+++ b/src/PdfSharp-gdi/PdfSharp-gdi.csproj
@@ -1,113 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5384CE57-1F94-4D22-860D-2E9C1AC12DDF}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
     <AssemblyName>PdfSharp-gdi</AssemblyName>
     <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>PdfSharp</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-        <SccProjectName>SAK</SccProjectName>
-        <SccLocalPath>SAK</SccLocalPath>
-        <SccAuxPath>SAK</SccAuxPath>
-        <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
+    <TargetFramework>net35</TargetFramework>
+    <BaseAddress>285212672</BaseAddress>
+    <DefineConstants>$(DefineConstants);GDI;UseGdiObjects</DefineConstants>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;GDI;UseGdiObjects</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>default</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;GDI;UseGdiObjects</DefineConstants>
     <DocumentationFile>bin\Release\PdfSharp-gdi.xml</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\PdfSharp\!internal\Configuration.cs">
@@ -1214,47 +1129,9 @@
     </EmbeddedResource>
     <None Include="StrongnameKey.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\images\" />
-    <Folder Include="SharpZipLib\SharpZip\" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\PdfSharp\SharpZipLib\ReadMe.txt">
       <Link>SharpZipLib\ReadMe.txt</Link>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/PdfSharp-wpf/PdfSharp-wpf.csproj b/src/PdfSharp-wpf/PdfSharp-wpf.csproj
index 21e1c3b1..9c9a532b 100644
--- a/src/PdfSharp-wpf/PdfSharp-wpf.csproj
+++ b/src/PdfSharp-wpf/PdfSharp-wpf.csproj
@@ -1,85 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{02FCC0BB-2AA2-43BA-8D2F-66D168B87A1D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net35</TargetFramework>
     <RootNamespace>PdfSharp</RootNamespace>
     <AssemblyName>PdfSharp-wpf</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-        <SccProjectName>SAK</SccProjectName>
-        <SccLocalPath>SAK</SccLocalPath>
-        <SccAuxPath>SAK</SccAuxPath>
-        <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>$(DefineConstants);WPF</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WPF</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DocumentationFile>
     </DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WPF</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\PdfSharp-wpf.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\PdfSharp\!internal\Configuration.cs">
@@ -1150,10 +1097,6 @@
     <Compile Include="..\PdfSharp\Windows\VisualPresenter.cs">
       <Link>Windows\VisualPresenter.cs</Link>
     </Compile>
-    <Compile Include="Windows\PagePreview.xaml.cs">
-      <DependentUpon>PagePreview.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\PagePreviewDesignTimeData.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\PdfSharp\Resources\Messages.de.restext">
@@ -1166,23 +1109,6 @@
   <ItemGroup>
     <None Include="StrongnameKey.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\PdfSharp\SharpZipLib\ReadMe.txt">
       <Link>SharpZipLib\ReadMe.txt</Link>
@@ -1194,13 +1120,4 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/PdfSharp.Charting-gdi/PdfSharp.Charting-gdi.csproj b/src/PdfSharp.Charting-gdi/PdfSharp.Charting-gdi.csproj
index 98b22b7f..54621bfd 100644
--- a/src/PdfSharp.Charting-gdi/PdfSharp.Charting-gdi.csproj
+++ b/src/PdfSharp.Charting-gdi/PdfSharp.Charting-gdi.csproj
@@ -1,106 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CFDB7D46-EA8D-47DE-B10A-9E755A1B48BA}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
     <AssemblyName>PdfSharp.Charting-gdi</AssemblyName>
     <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>PdfSharp</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;GDI</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;GDI</DefineConstants>
-    <DocumentationFile>bin\Release\PdfSharp.Charting-gdi.xml</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TargetFramework>net35</TargetFramework>
+    <DefineConstants>$(DefineConstants);GDI</DefineConstants>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
@@ -381,37 +294,10 @@
       <Link>Resources\Messages.restext</Link>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="StrongnameKey.snk" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PdfSharp-gdi\PdfSharp-gdi.csproj">
-      <Project>{3f01920c-1117-4e1b-9c01-54eb82e5a1d1}</Project>
-      <Name>PdfSharp-gdi</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\PdfSharp-gdi\PdfSharp-gdi.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/PdfSharp.Charting-wpf/PdfSharp.Charting-wpf.csproj b/src/PdfSharp.Charting-wpf/PdfSharp.Charting-wpf.csproj
index 4290aedc..5c34095c 100644
--- a/src/PdfSharp.Charting-wpf/PdfSharp.Charting-wpf.csproj
+++ b/src/PdfSharp.Charting-wpf/PdfSharp.Charting-wpf.csproj
@@ -1,106 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E6A2734E-0CD6-4210-8AEC-47EE348F8D78}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
+    <TargetFramework>net35</TargetFramework>
     <AssemblyName>PdfSharp.Charting-wpf</AssemblyName>
     <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>PdfSharp</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <SignAssembly>true</SignAssembly>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG;WPF</DefineConstants>
-    <DocumentationFile>bin\Debug\PdfSharp.Charting-wpf.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>false</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;WPF</DefineConstants>
-    <DocumentationFile>bin\Release\PdfSharp.Charting-wpf.xml</DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DefineConstants>$(DefineConstants);WPF</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -385,36 +300,8 @@
     <None Include="..\PdfSharp.Charting\StrongnameKey.snk">
       <Link>StrongnameKey.snk</Link>
     </None>
-    <None Include="PdfSharp.Charting-wpf.csproj.resharper" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PdfSharp-wpf\PdfSharp-wpf.csproj">
-      <Project>{02FCC0BB-2AA2-43BA-8D2F-66D168B87A1D}</Project>
-      <Name>PdfSharp-wpf</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\PdfSharp-wpf\PdfSharp-wpf.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/PdfSharp.Charting/PdfSharp.Charting.csproj b/src/PdfSharp.Charting/PdfSharp.Charting.csproj
index c141b9fe..2db5e85e 100644
--- a/src/PdfSharp.Charting/PdfSharp.Charting.csproj
+++ b/src/PdfSharp.Charting/PdfSharp.Charting.csproj
@@ -1,46 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6F98A822-41B0-4C7A-85A6-E95C1D3E88EF}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfSharp</RootNamespace>
     <AssemblyName>PdfSharp.Charting</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net35</TargetFramework>
+    <DefineConstants>$(DefineConstants);CORE</DefineConstants>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\PdfSharp.Charting.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -49,95 +19,6 @@
     <Compile Include="..\PdfSharp\root\VersionInfo.cs">
       <Link>root\VersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Charting.Renderers\AreaChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\AreaPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\AxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\AxisTitleRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarClusteredLegendRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarClusteredPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarDataLabelRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarGridlinesRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\BarStackedPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\ChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\Colors.cs" />
-    <Compile Include="Charting.Renderers\ColumnChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnClusteredPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnDataLabelRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnLikeChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnLikeGridlinesRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnLikeLegendRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnLikePlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\ColumnStackedPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\CombinationChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\Converter.cs" />
-    <Compile Include="Charting.Renderers\DataLabelRenderer.cs" />
-    <Compile Include="Charting.Renderers\GridlinesRenderer.cs" />
-    <Compile Include="Charting.Renderers\HorizontalStackedYAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\HorizontalXAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\HorizontalYAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\LegendEntryRenderer.cs" />
-    <Compile Include="Charting.Renderers\LegendRenderer.cs" />
-    <Compile Include="Charting.Renderers\LineChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\LineFormatRenderer.cs" />
-    <Compile Include="Charting.Renderers\LinePlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\MarkerRenderer.cs" />
-    <Compile Include="Charting.Renderers\PieChartRenderer.cs" />
-    <Compile Include="Charting.Renderers\PieClosedPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\PieDataLabelRenderer.cs" />
-    <Compile Include="Charting.Renderers\PieExplodedPlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\PieLegendRenderer.cs" />
-    <Compile Include="Charting.Renderers\PiePlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\PlotAreaBorderRenderer.cs" />
-    <Compile Include="Charting.Renderers\PlotAreaRenderer.cs" />
-    <Compile Include="Charting.Renderers\Renderer.cs" />
-    <Compile Include="Charting.Renderers\RendererInfo.cs" />
-    <Compile Include="Charting.Renderers\RendererParameters.cs" />
-    <Compile Include="Charting.Renderers\VerticalStackedYAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\VerticalXAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\VerticalYAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\WallRenderer.cs" />
-    <Compile Include="Charting.Renderers\XAxisRenderer.cs" />
-    <Compile Include="Charting.Renderers\YAxisRenderer.cs" />
-    <Compile Include="Charting\Axis.cs" />
-    <Compile Include="Charting\AxisTitle.cs" />
-    <Compile Include="Charting\Chart.cs" />
-    <Compile Include="Charting\ChartFrame.cs" />
-    <Compile Include="Charting\ChartObject.cs" />
-    <Compile Include="Charting\DataLabel.cs" />
-    <Compile Include="Charting\DocumentObject.cs" />
-    <Compile Include="Charting\DocumentObjectCollection.cs" />
-    <Compile Include="Charting\enums\BlankType.cs" />
-    <Compile Include="Charting\enums\ChartType.cs" />
-    <Compile Include="Charting\enums\DataLabelPosition.cs" />
-    <Compile Include="Charting\enums\DataLabelType.cs" />
-    <Compile Include="Charting\enums\DockingType.cs" />
-    <Compile Include="Charting\enums\FontProperties.cs" />
-    <Compile Include="Charting\enums\HorizontalAlignment.cs" />
-    <Compile Include="Charting\enums\LineStyle.cs" />
-    <Compile Include="Charting\enums\MarkerStyle.cs" />
-    <Compile Include="Charting\enums\TickMarkType.cs" />
-    <Compile Include="Charting\enums\Underline.cs" />
-    <Compile Include="Charting\enums\VerticalAlignment.cs" />
-    <Compile Include="Charting\FillFormat.cs" />
-    <Compile Include="Charting\Font.cs" />
-    <Compile Include="Charting\Gridlines.cs" />
-    <Compile Include="Charting\Legend.cs" />
-    <Compile Include="Charting\LineFormat.cs" />
-    <Compile Include="Charting\PlotArea.cs" />
-    <Compile Include="Charting\Point.cs" />
-    <Compile Include="Charting\PSCSR.cs" />
-    <Compile Include="Charting\Series.cs" />
-    <Compile Include="Charting\SeriesCollection.cs" />
-    <Compile Include="Charting\SeriesElements.cs" />
-    <Compile Include="Charting\TickLabels.cs" />
-    <Compile Include="Charting\XSeries.cs" />
-    <Compile Include="Charting\XSeriesElements.cs" />
-    <Compile Include="Charting\XValue.cs" />
-    <Compile Include="Charting\XValues.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Messages.de.restext" />
@@ -147,17 +28,6 @@
     <None Include="StrongnameKey.snk" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PdfSharp\PdfSharp.csproj">
-      <Project>{5a6055bc-bf86-4fdd-9f62-0109db7a303b}</Project>
-      <Name>PdfSharp</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\PdfSharp\PdfSharp.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/PdfSharp/PdfSharp.csproj b/src/PdfSharp/PdfSharp.csproj
index cdae9caf..cb11eb65 100644
--- a/src/PdfSharp/PdfSharp.csproj
+++ b/src/PdfSharp/PdfSharp.csproj
@@ -1,414 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5A6055BC-BF86-4FDD-9F62-0109DB7A303B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfSharp</RootNamespace>
     <AssemblyName>PdfSharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CORE;CORE_WITH_GDI</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TargetFramework>net35</TargetFramework>
+    <DefineConstants>$(DefineConstants);CORE;CORE_WITH_GDI</DefineConstants>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;CORE;CORE_WITH_GDI</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
     <DocumentationFile>bin\Release\PdfSharp.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="SilverlightInternals\**" />
+    <Compile Remove="Silverlight\**" />
+    <Compile Remove="Windows\**" />
+    <EmbeddedResource Remove="SilverlightInternals\**" />
+    <EmbeddedResource Remove="Silverlight\**" />
+    <EmbeddedResource Remove="Windows\**" />
+    <None Remove="SilverlightInternals\**" />
+    <None Remove="Silverlight\**" />
+    <None Remove="Windows\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Drawing.BarCodes\DataMatrixImage.opensource.cs" />
+    <Compile Remove="Forms\PagePreview.cs" />
+    <Compile Remove="Forms\PagePreviewCanvas.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="Forms\PagePreview.resx" />
+    <EmbeddedResource Remove="Forms\PagePreviewCanvas.resx" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="!internal\Directives.cs" />
-    <Compile Include="!internal\Configuration.cs" />
-    <Compile Include="!internal\TargetContext.cs" />
-    <Compile Include="!JetBrains\Annotations.cs" />
-    <Compile Include="Drawing.BarCodes\BarCode.cs" />
-    <Compile Include="Drawing.BarCodes\BarCodeRenderInfo.cs" />
-    <Compile Include="Drawing.BarCodes\BcgSR.cs" />
-    <Compile Include="Drawing.BarCodes\Code2of5Interleaved.cs" />
-    <Compile Include="Drawing.BarCodes\Code3of9Standard.cs" />
-    <Compile Include="Drawing.BarCodes\CodeBase.cs" />
-    <Compile Include="Drawing.BarCodes\CodeDataMatrix.cs" />
-    <Compile Include="Drawing.BarCodes\CodeOmr.cs" />
-    <Compile Include="Drawing.BarCodes\DataMatrixImage.cs" />
-    <Compile Include="Drawing.BarCodes\enums\AnchorType.cs" />
-    <Compile Include="Drawing.BarCodes\enums\CodeDirection.cs" />
-    <Compile Include="Drawing.BarCodes\enums\CodeType.cs" />
-    <Compile Include="Drawing.BarCodes\enums\DataMatrixEncoding.cs" />
-    <Compile Include="Drawing.BarCodes\enums\MarkDistance.cs" />
-    <Compile Include="Drawing.BarCodes\enums\TextLocation.cs" />
-    <Compile Include="Drawing.BarCodes\MatrixCode.cs" />
-    <Compile Include="Drawing.BarCodes\OmrData.cs" />
-    <Compile Include="Drawing.BarCodes\ThickThinBarcodeRenderer.cs" />
-    <Compile Include="Drawing.Layout\enums\XParagraphAlignment.cs" />
-    <Compile Include="Drawing.Layout\XTextFormatter.cs" />
-    <Compile Include="Drawing.Pdf\enums\DirtyFlags.cs" />
-    <Compile Include="Drawing.Pdf\enums\StreamMode.cs" />
-    <Compile Include="Drawing.Pdf\PdfGraphicsState.cs" />
-    <Compile Include="Drawing.Pdf\XGraphicsPdfRenderer.cs" />
-    <Compile Include="Drawing\CoreGraphicsPath.cs" />
-    <Compile Include="Drawing\enums\XSweepDirection.cs" />
-    <Compile Include="Drawing\enums\XStyleSimulations.cs" />
-    <Compile Include="Drawing\enums\PathStart.cs" />
-    <Compile Include="Drawing\enums\XColorSpace.cs" />
-    <Compile Include="Drawing\enums\XCombineMode.cs" />
-    <Compile Include="Drawing\enums\XDashStyle.cs" />
-    <Compile Include="Drawing\enums\XFillMode.cs" />
-    <Compile Include="Drawing\enums\XFontStyle.cs" />
-    <Compile Include="Drawing\enums\XGdiFontStyle.cs" />
-    <Compile Include="Drawing\enums\XGraphicRenderTarget.cs" />
-    <Compile Include="Drawing\enums\XGraphicsPathItemType.cs" />
-    <Compile Include="Drawing\enums\XGraphicsPdfPageOptions.cs" />
-    <Compile Include="Drawing\enums\XGraphicsUnit.cs" />
-    <Compile Include="Drawing\enums\XKnownColor.cs" />
-    <Compile Include="Drawing\enums\XLineAlignment.cs" />
-    <Compile Include="Drawing\enums\XLinearGradientMode.cs" />
-    <Compile Include="Drawing\enums\XLineCap.cs" />
-    <Compile Include="Drawing\enums\XLineJoin.cs" />
-    <Compile Include="Drawing\enums\XMatrixOrder.cs" />
-    <Compile Include="Drawing\enums\XPageDirection.cs" />
-    <Compile Include="Drawing\enums\XSmoothingMode.cs" />
-    <Compile Include="Drawing\enums\XStringAlignment.cs" />
-    <Compile Include="Drawing\FontFamilyInternal.cs" />
-    <Compile Include="Drawing\FontHelper.cs" />
-    <Compile Include="Drawing\GeometryHelper.cs" />
-    <Compile Include="Drawing\GraphicsStateStack.cs" />
-    <Compile Include="Drawing\ImageHelper.cs" />
-    <Compile Include="Drawing\InternalGraphicsState.cs" />
-    <Compile Include="Drawing.Internal\IImageImporter.cs" />
-    <Compile Include="Drawing.Internal\ImageImporterBmp.cs" />
-    <Compile Include="Drawing.Internal\ImageImporterJpeg.cs" />
-    <Compile Include="Drawing.Internal\ImageImporter.cs" />
-    <Compile Include="Drawing.Internal\ImageImporterRoot.cs" />
-    <Compile Include="Drawing\IXGraphicsRenderer.cs" />
-    <Compile Include="Drawing\PdfFontOptions.cs" />
-    <Compile Include="Drawing\XBitmapDecoder.cs" />
-    <Compile Include="Drawing\XBitmapEncoder.cs" />
-    <Compile Include="Drawing\XBitmapImage.cs" />
-    <Compile Include="Drawing\XBrush.cs" />
-    <Compile Include="Drawing\XBrushes.cs" />
-    <Compile Include="Drawing\XColor.cs" />
-    <Compile Include="Drawing\XColorResourceManager.cs" />
-    <Compile Include="Drawing\XColors.cs" />
-    <Compile Include="Drawing\XConvert.cs" />
-    <Compile Include="Drawing\XFont.cs" />
-    <Compile Include="Drawing\FontFamilyCache.cs" />
-    <Compile Include="Drawing\XFontFamily.cs" />
-    <Compile Include="Drawing\XFontMetrics.cs" />
-    <Compile Include="Drawing\XFontStretch.cs" />
-    <Compile Include="Drawing\XFontWeight.cs" />
-    <Compile Include="Drawing\XFontWeights.cs" />
-    <Compile Include="Drawing\XForm.cs" />
-    <Compile Include="Drawing\XFontSource.cs" />
-    <Compile Include="Drawing\XGradientBrush.cs" />
-    <Compile Include="Drawing\XRadialGradientBrush.cs" />
-    <Compile Include="Drawing\XTypeface.cs" />
-    <Compile Include="Drawing\XGlyphTypeface.cs" />
-    <Compile Include="Drawing\XGraphics.cs" />
-    <Compile Include="Drawing\XGraphicsContainer.cs" />
-    <Compile Include="Drawing\XGraphicsPath.cs" />
-    <Compile Include="Drawing\XGraphicsPathInternals.cs" />
-    <Compile Include="Drawing\XGraphicsPathItem.cs" />
-    <Compile Include="Drawing\XGraphicsState.cs" />
-    <Compile Include="Drawing\XBitmapSource.cs" />
-    <Compile Include="Drawing\XImage.cs" />
-    <Compile Include="Drawing\XImageFormat.cs" />
-    <Compile Include="Drawing\XKnownColorTable.cs" />
-    <Compile Include="Drawing\XLinearGradientBrush.cs" />
-    <Compile Include="Drawing\XMatrix.cs" />
-    <Compile Include="Drawing\XPdfForm.cs" />
-    <Compile Include="Drawing\XPen.cs" />
-    <Compile Include="Drawing\XPens.cs" />
-    <Compile Include="Drawing\XPoint.cs" />
-    <Compile Include="Drawing\XPrivateFontCollection.cs" />
-    <Compile Include="Drawing\XRect.cs" />
-    <Compile Include="Drawing\XSize.cs" />
-    <Compile Include="Drawing\XSolidBrush.cs" />
-    <Compile Include="Drawing\XStringFormat.cs" />
-    <Compile Include="Drawing\XStringFormats.cs" />
-    <Compile Include="Drawing\XUnit.cs" />
-    <Compile Include="Drawing\XVector.cs" />
-    <Compile Include="Events\DocumentEvents.cs" />
-    <Compile Include="Fonts.OpenType\enums\FontTechnology.cs" />
-    <Compile Include="Fonts.OpenType\enums\TableTagNames.cs" />
-    <Compile Include="Fonts.OpenType\FontDescriptor.cs" />
-    <Compile Include="Fonts.OpenType\GenericFontTable.cs" />
-    <Compile Include="Fonts.OpenType\GlyphDataTable.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeFontfaceCache.cs" />
-    <Compile Include="Fonts.OpenType\GlyphTypefaceCache.cs" />
-    <Compile Include="Fonts.OpenType\IndexToLocationTable.cs" />
-    <Compile Include="Fonts.OpenType\IRefFontTable.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeDescriptor.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeFontface.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeFontTable.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeFontTables.cs" />
-    <Compile Include="Fonts.OpenType\OpenTypeFontWriter.cs" />
-    <Compile Include="Fonts.OpenType\TableDirectoryEntry.cs" />
-    <Compile Include="Fonts\AdobeGlyphList20.cs" />
-    <Compile Include="Fonts\AdobeGlyphListForNewFonts.cs" />
-    <Compile Include="Fonts\CMapInfo.cs" />
-    <Compile Include="Fonts\FontResolvingOptions.cs" />
-    <Compile Include="Fonts\PlatformFontResolverInfo.cs" />
-    <Compile Include="Fonts\PlatformFontResolver.cs" />
-    <Compile Include="Fonts\FontResolverInfo.cs" />
-    <Compile Include="Fonts\IFontResolver.cs" />
-    <Compile Include="Fonts\GlobalFontSettings.cs" />
-    <Compile Include="Fonts\FontDescriptorCache.cs" />
-    <Compile Include="Fonts\FontFactory.cs" />
-    <Compile Include="Fonts\FontWriter.cs" />
-    <Compile Include="Internal\Lock.cs" />
-    <Compile Include="Internal\Diagnostics.cs" />
-    <Compile Include="Internal\DiagnosticsHelper.cs" />
-    <Compile Include="Internal\Calc.cs" />
-    <Compile Include="Internal\ColorHelper.cs" />
-    <Compile Include="Internal\DoubleUtil.cs" />
-    <Compile Include="Internal\NativeMethods.cs" />
-    <Compile Include="Internal\TokenizerHelper.cs" />
-    <Compile Include="Pdf.AcroForms\enums\PdfAcroFieldFlags.cs" />
-    <Compile Include="Pdf.AcroForms\PdfAcroField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfAcroForm.cs" />
-    <Compile Include="Pdf.AcroForms\PdfButtonField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfCheckBoxField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfChoiceField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfComboBoxField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfGenericField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfListBoxField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfPushButtonField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfRadioButtonField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfSignatureField.cs" />
-    <Compile Include="Pdf.AcroForms\PdfTextField.cs" />
-    <Compile Include="Pdf.Actions\enums\PdfNamedActionNames.cs" />
-    <Compile Include="Pdf.Actions\PdfEmbeddedGoToAction.cs" />
-    <Compile Include="Pdf.Actions\PdfRemoteGoToAction.cs" />
-    <Compile Include="Pdf.Actions\PdfGoToAction.cs" />
-    <Compile Include="Pdf.Actions\PdfAction.cs" />
-    <Compile Include="Pdf.Advanced\IContentStream.cs" />
-    <Compile Include="Pdf.Advanced\PdfCatalog.cs" />
-    <Compile Include="Pdf.Advanced\PdfCIDFont.cs" />
-    <Compile Include="Pdf.Advanced\PdfContent.cs" />
-    <Compile Include="Pdf.Advanced\PdfContents.cs" />
-    <Compile Include="Pdf.Advanced\PdfCrossReferenceStream.cs" />
-    <Compile Include="Pdf.Advanced\PdfCrossReferenceTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfDictionaryWithContentStream.cs" />
-    <Compile Include="Pdf.Advanced\PdfEmbeddedFileStream.cs" />
-    <Compile Include="Pdf.Advanced\PdfExtGState.cs" />
-    <Compile Include="Pdf.Advanced\PdfExtGStateTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfFileSpecification.cs" />
-    <Compile Include="Pdf.Advanced\PdfFont.cs" />
-    <Compile Include="Pdf.Advanced\PdfFontDescriptor.cs" />
-    <Compile Include="Pdf.Advanced\PdfFontTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfFormXObject.cs" />
-    <Compile Include="Pdf.Advanced\PdfFormXObjectTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfGroupAttributes.cs" />
-    <Compile Include="Pdf.Advanced\PdfImage.cs" />
-    <Compile Include="Pdf.Advanced\PdfImage.FaxEncode.cs" />
-    <Compile Include="Pdf.Advanced\PdfImageTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfImportedObjectTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfInternals.cs" />
-    <Compile Include="Pdf.Advanced\PdfNamedDestinationParameters.cs" />
-    <Compile Include="Pdf.Advanced\PdfNameDictionary.cs" />
-    <Compile Include="Pdf.Advanced\PdfObjectInternals.cs" />
-    <Compile Include="Pdf.Advanced\PdfObjectStream.cs" />
-    <Compile Include="Pdf.Advanced\PdfPageInheritableObjects.cs" />
-    <Compile Include="Pdf.Advanced\PdfPageInterals.cs" />
-    <Compile Include="Pdf.Advanced\PdfReference.cs" />
-    <Compile Include="Pdf.Advanced\PdfResourceMap.cs" />
-    <Compile Include="Pdf.Advanced\PdfResources.cs" />
-    <Compile Include="Pdf.Advanced\PdfResourceTable.cs" />
-    <Compile Include="Pdf.Advanced\PdfShading.cs" />
-    <Compile Include="Pdf.Advanced\PdfShadingPattern.cs" />
-    <Compile Include="Pdf.Advanced\PdfSoftMask.cs" />
-    <Compile Include="Pdf.Advanced\PdfTilingPattern.cs" />
-    <Compile Include="Pdf.Advanced\PdfToUnicodeMap.cs" />
-    <Compile Include="Pdf.Advanced\PdfTrailer.cs" />
-    <Compile Include="Pdf.Advanced\PdfTransparencyGroupAttributes.cs" />
-    <Compile Include="Pdf.Advanced\PdfTrueTypeFont.cs" />
-    <Compile Include="Pdf.Advanced\PdfType0Font.cs" />
-    <Compile Include="Pdf.Advanced\PdfType1Font.cs" />
-    <Compile Include="Pdf.Advanced\PdfXObject.cs" />
-    <Compile Include="Pdf.Annotations\enums\PdfAnnotationFlags.cs" />
-    <Compile Include="Pdf.Annotations\enums\PdfRubberStampAnnotationIcon.cs" />
-    <Compile Include="Pdf.Annotations\enums\PdfTextAnnotationIcon.cs" />
-    <Compile Include="Pdf.Annotations\PdfAnnotation.cs" />
-    <Compile Include="Pdf.Annotations\PdfAnnotations.cs" />
-    <Compile Include="Pdf.Annotations\PdfGenericAnnotation.cs" />
-    <Compile Include="Pdf.Annotations\PdfLinkAnnotation.cs" />
-    <Compile Include="Pdf.Annotations\PdfRubberStampAnnotation.cs" />
-    <Compile Include="Pdf.Annotations\PdfTextAnnotation.cs" />
-    <Compile Include="Pdf.Annotations\PdfWidgetAnnotation.cs" />
-    <Compile Include="Pdf.Content.Objects\CObjects.cs" />
-    <Compile Include="Pdf.Content.Objects\enum\OpCodeFlags.cs" />
-    <Compile Include="Pdf.Content.Objects\enum\OpCodeName.cs" />
-    <Compile Include="Pdf.Content.Objects\Operators.cs" />
-    <Compile Include="Pdf.Content\Chars.cs" />
-    <Compile Include="Pdf.Content\CLexer.cs" />
-    <Compile Include="Pdf.Content\ContentReader.cs" />
-    <Compile Include="Pdf.Content\ContentReaderException.cs" />
-    <Compile Include="Pdf.Content\ContentWriter.cs" />
-    <Compile Include="Pdf.Content\CParser.cs" />
-    <Compile Include="Pdf.Content\enums\Symbol.cs" />
-    <Compile Include="Pdf.Filters\Ascii85Decode.cs" />
-    <Compile Include="Pdf.Filters\AsciiHexDecode.cs" />
-    <Compile Include="Pdf.Filters\Filter.cs" />
-    <Compile Include="Pdf.Filters\Filtering.cs" />
-    <Compile Include="Pdf.Filters\FlateDecode.cs" />
-    <Compile Include="Pdf.Filters\LzwDecode.cs" />
-    <Compile Include="Pdf.Internal\AnsiEncoding.cs" />
-    <Compile Include="Pdf.Internal\ColorSpaceHelper.cs" />
-    <Compile Include="Pdf.Internal\PdfDiagnostics.cs" />
-    <Compile Include="Pdf.Internal\DocEncoding.cs" />
-    <Compile Include="Pdf.Internal\GlobalObjectTable.cs" />
-    <Compile Include="Pdf.Internal\PdfEncoders.cs" />
-    <Compile Include="Pdf.Internal\RawEncoding.cs" />
-    <Compile Include="Pdf.Internal\RawUnicodeEncoding.cs" />
-    <Compile Include="Pdf.Internal\ThreadLocalStorage.cs" />
-    <Compile Include="Pdf.IO\Chars.cs" />
-    <Compile Include="Pdf.IO\enums\PasswordValidity.cs" />
-    <Compile Include="Pdf.IO\enums\PdfDocumentOpenMode.cs" />
-    <Compile Include="Pdf.IO\enums\PdfWriterLayout.cs" />
-    <Compile Include="Pdf.IO\enums\PdfWriterOptions.cs" />
-    <Compile Include="Pdf.IO\enums\Symbol.cs" />
-    <Compile Include="Pdf.IO\Lexer.cs" />
-    <Compile Include="Pdf.IO\Parser.cs" />
-    <Compile Include="Pdf.IO\PdfReader.cs" />
-    <Compile Include="Pdf.IO\PdfReaderException.cs" />
-    <Compile Include="Pdf.IO\PdfWriter.cs" />
-    <Compile Include="Pdf.IO\ShiftStack.cs" />
-    <Compile Include="Pdf.Printing\PdfFilePrinter.cs" />
-    <Compile Include="Pdf.Security\enums\PdfDocumentSecurity.cs" />
-    <Compile Include="Pdf.Security\enums\PdfUserAccessPermission.cs" />
-    <Compile Include="Pdf.Security\MD5Managed.cs" />
-    <Compile Include="Pdf.Security\PdfSecurityHandler.cs" />
-    <Compile Include="Pdf.Security\PdfSecuritySettings.cs" />
-    <Compile Include="Pdf.Security\PdfStandardSecurityHandler.cs" />
-    <Compile Include="Pdf.Structure\PdfAttributesBase.cs" />
-    <Compile Include="Pdf.Structure\PdfLayoutAttributes.cs" />
-    <Compile Include="Pdf.Structure\PdfObjectReference.cs" />
-    <Compile Include="Pdf.Structure\PdfMarkedContentReference.cs" />
-    <Compile Include="Pdf.Structure\PdfStructureElement.cs" />
-    <Compile Include="Pdf.Structure\PdfStructureTreeRoot.cs" />
-    <Compile Include="Pdf.Structure\PdfMarkInformation.cs" />
-    <Compile Include="Pdf.Structure\PdfTableAttributes.cs" />
-    <Compile Include="Pdf\EntryInfoAttribute.cs" />
-    <Compile Include="Pdf\enums\DocumentState.cs" />
-    <Compile Include="Pdf\enums\PdfFlateEncodeMode.cs" />
-    <Compile Include="Pdf\enums\PdfUseFlateDecoderForJpegImages.cs" />
-    <Compile Include="Pdf\enums\PdfColorMode.cs" />
-    <Compile Include="Pdf\enums\PdfCustomValueCompression.cs" />
-    <Compile Include="Pdf\enums\PdfFontEmbedding.cs" />
-    <Compile Include="Pdf\enums\PdfFontEncoding.cs" />
-    <Compile Include="Pdf\enums\PdfPageDestinationType.cs" />
-    <Compile Include="Pdf\enums\PdfOutlineStyle.cs" />
-    <Compile Include="Pdf\enums\PdfPageLayout.cs" />
-    <Compile Include="Pdf\enums\PdfPageMode.cs" />
-    <Compile Include="Pdf\enums\PdfReadingDirection.cs" />
-    <Compile Include="Pdf\enums\PdfTextStringEncoding.cs" />
-    <Compile Include="Pdf\KeysBase.cs" />
-    <Compile Include="Pdf\KeysMeta.cs" />
-    <Compile Include="Pdf\PdfArray.cs" />
-    <Compile Include="Pdf\PdfBoolean.cs" />
-    <Compile Include="Pdf\PdfBooleanObject.cs" />
-    <Compile Include="Pdf\PdfCustomValue.cs" />
-    <Compile Include="Pdf\PdfCustomValues.cs" />
-    <Compile Include="Pdf\PdfMetadata.cs" />
-    <Compile Include="Pdf\PdfNumberTreeNode.cs" />
-    <Compile Include="Pdf\PdfNameTreeNode.cs" />
-    <Compile Include="Pdf\PdfDate.cs" />
-    <Compile Include="Pdf\PdfDictionary.cs" />
-    <Compile Include="Pdf\PdfDocument.cs" />
-    <Compile Include="Pdf\PdfDocumentInformation.cs" />
-    <Compile Include="Pdf\PdfDocumentOptions.cs" />
-    <Compile Include="Pdf\PdfDocumentSettings.cs" />
-    <Compile Include="Pdf\PdfInteger.cs" />
-    <Compile Include="Pdf\PdfIntegerObject.cs" />
-    <Compile Include="Pdf\PdfItem.cs" />
-    <Compile Include="Pdf\PdfLiteral.cs" />
-    <Compile Include="Pdf\PdfName.cs" />
-    <Compile Include="Pdf\PdfNameObject.cs" />
-    <Compile Include="Pdf\PdfNull.cs" />
-    <Compile Include="Pdf\PdfNullObject.cs" />
-    <Compile Include="Pdf\PdfNumber.cs" />
-    <Compile Include="Pdf\PdfNumberObject.cs" />
-    <Compile Include="Pdf\PdfObject.cs" />
-    <Compile Include="Pdf\PdfObjectID.cs" />
-    <Compile Include="Pdf\PdfOutline.cs" />
-    <Compile Include="Pdf\PdfOutlineCollection.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Pdf\PdfPage.cs" />
-    <Compile Include="Pdf\PdfPages.cs" />
-    <Compile Include="Pdf\PdfReal.cs" />
-    <Compile Include="Pdf\PdfRealObject.cs" />
-    <Compile Include="Pdf\PdfRectangle.cs" />
-    <Compile Include="Pdf\PdfReferenceTable.cs" />
-    <Compile Include="Pdf\PdfString.cs" />
-    <Compile Include="Pdf\PdfStringObject.cs" />
-    <Compile Include="Pdf\PdfUInteger.cs" />
-    <Compile Include="Pdf\PdfUIntegerObject.cs" />
-    <Compile Include="Pdf\PdfViewerPreferences.cs" />
-    <Compile Include="Pdf\TrimMargins.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="root\enums\PageOrientation.cs" />
-    <Compile Include="root\enums\PageSize.cs" />
-    <Compile Include="root\enums\PSMsgID.cs" />
-    <Compile Include="root\PageSizeConverter.cs" />
-    <Compile Include="root\PdfSharpException.cs" />
-    <Compile Include="root\ProductVersionInfo.cs" />
-    <Compile Include="root\PSSR.cs" />
-    <Compile Include="root\VersionInfo.cs" />
-    <Compile Include="SharpZipLib\Checksums\Adler32.cs" />
-    <Compile Include="SharpZipLib\Checksums\CRC32.cs" />
-    <Compile Include="SharpZipLib\Checksums\IChecksum.cs" />
-    <Compile Include="SharpZipLib\SharpZipBaseException.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Deflater.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\DeflaterConstants.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\DeflaterEngine.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\DeflaterHuffman.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\DeflaterPending.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Inflater.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\InflaterDynHeader.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\InflaterHuffmanTree.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\PendingBuffer.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Streams\DeflaterOutputStream.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Streams\InflaterInputStream.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Streams\OutputWindow.cs" />
-    <Compile Include="SharpZipLib\Zip\Compression\Streams\StreamManipulator.cs" />
-    <Compile Include="SharpZipLib\Zip\ZipConstants.cs" />
-    <Compile Include="SharpZipLib\Zip\ZipException.cs" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Messages.de.restext">
       <Generator>ResGen</Generator>
@@ -416,20 +43,4 @@
     <EmbeddedResource Include="Resources\Messages.restext" />
     <None Include="StrongnameKey.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="SharpZipLib\ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Drawing\internal\" />
-    <Folder Include="Resources\images\" />
-    <Folder Include="SharpZipLib\SharpZip\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file