Skip to content

.NET Standard support #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthidinger wants to merge 3 commits into
base: master
Choose a base branch
from
Open

.NET Standard support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86e378d
corex fx compiling but not working yet
matthidinger May 27, 2016
e7ade8e
project compiling with .net 3.5, .net 4; and netstandard 1.5; added e…
matthidinger May 31, 2016
f47e4e2
updated to netstandard 2.0 and it's semi-working.
matthidinger Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"projects": [
"src",
"test"
]
}
143 changes: 14 additions & 129 deletions src/DoddleReport.AbcPdf/DoddleReport.AbcPdf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,135 +1,20 @@
<?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>{355CAFF3-F806-4194-BE54-2F7640463CED}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DoddleReport.AbcPdf</RootNamespace>
<AssemblyName>DoddleReport.AbcPdf</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<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>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>2.0</Version>
<Description>Adds ABCpdf support to DoddleReport. Requires an ABCpdf license to work properly</Description>
<Tags>doddle.report doddle.reporting doddle reporting pdf excel csv abcpdf</Tags>
<ProjectUrl>https://github.com/matthidinger/DoddleReport</ProjectUrl>
<Authors>Matt Hidinger</Authors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\DoddleReport.AbcPdf.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ABCpdf, Version=9.0.0.5, Culture=neutral, PublicKeyToken=a7a0b3f5184f2169, processorArchitecture=MSIL">
<HintPath>..\packages\ABCpdf.9.0.0.5\lib\net20\ABCpdf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="PdfDocument.cs" />
<Compile Include="PDFTable.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PdfReportWriter.cs" />
</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="packages.config" />
<None Include="DoddleReport.AbcPdf.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="web.config.transform" />
<PackageReference Include="ABCpdf" Version="10.1.2.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DoddleReport\DoddleReport.csproj">
<Project>{F08B2994-4D05-423E-A8FE-7D1E8A63472B}</Project>
<Name>DoddleReport</Name>
</ProjectReference>
<ProjectReference Include="..\DoddleReport\DoddleReport.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>

</Project>
20 changes: 0 additions & 20 deletions src/DoddleReport.AbcPdf/DoddleReport.AbcPdf.nuspec
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/DoddleReport.AbcPdf/PDFTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Drawing;
using System.Collections;
using System.Globalization;
using WebSupergoo.ABCpdf7;
using WebSupergoo.ABCpdf10;

namespace DoddleReport.AbcPdf
{
Expand Down Expand Up @@ -742,7 +742,7 @@ public int AddImage(XImage inImage, bool inStretch)
mDoc.Rect.Bottom = mDoc.Rect.Top - inImage.Height * scale;

PagePos thePos = new PagePos(this);
id = mDoc.AddImage(inImage);
id = mDoc.AddImageObject(inImage);
thePos -= inImage.Height * scale;
if (thePos < RowBottom) RowBottom = thePos;
SaveRowObject(id, inImage);
Expand Down
2 changes: 1 addition & 1 deletion src/DoddleReport.AbcPdf/PdfDocument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.IO;
using WebSupergoo.ABCpdf7;
using WebSupergoo.ABCpdf10;

namespace DoddleReport.AbcPdf
{
Expand Down
2 changes: 1 addition & 1 deletion src/DoddleReport.AbcPdf/PdfReportWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using System.IO;
using WebSupergoo.ABCpdf7;
using WebSupergoo.ABCpdf10;

namespace DoddleReport.AbcPdf
{
Expand Down
35 changes: 0 additions & 35 deletions src/DoddleReport.AbcPdf/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/DoddleReport.AbcPdf/packages.config
View file
Open in desktop

This file was deleted.

97 changes: 14 additions & 83 deletions src/DoddleReport.OpenXml/DoddleReport.OpenXml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,20 @@
<?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>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0646C575-0EA6-4331-809C-10DC000929F3}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DoddleReport.OpenXml</RootNamespace>
<AssemblyName>DoddleReport.OpenXml</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>2.0</Version>
<Description>Adds OpenXML support to DoddleReport. The currently supported format is Excel and is more robust than the default ExcelReportWriter in DoddleReport.</Description>
<Tags>doddle.report doddle.reporting doddle reporting pdf excel csv openxml</Tags>
<ProjectUrl>https://github.com/matthidinger/DoddleReport</ProjectUrl>
<Authors>Matt Hidinger</Authors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\DoddleReport.OpenXml.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClosedXML, Version=0.68.1.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClosedXML.0.68.1\lib\net40-client\ClosedXML.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ExcelReportWriter.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="PaperSize.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="DoddleReport.OpenXml.nuspec" />
<None Include="web.config.transform" />
<PackageReference Include="ClosedXML" Version="0.90.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DoddleReport\DoddleReport.csproj">
<Project>{F08B2994-4D05-423E-A8FE-7D1E8A63472B}</Project>
<Name>DoddleReport</Name>
</ProjectReference>
<ProjectReference Include="..\DoddleReport\DoddleReport.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>

</Project>
20 changes: 0 additions & 20 deletions src/DoddleReport.OpenXml/DoddleReport.OpenXml.nuspec
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/DoddleReport.OpenXml/ExcelReportWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using ClosedXML.Excel;

namespace DoddleReport.OpenXml
Expand Down Expand Up @@ -179,7 +180,7 @@ protected virtual void RenderRow(int rowCount, ReportRow reportRow, IXLRow dataR
cell.SetDataType(XLCellValues.Boolean);
cell.Value = reportRow[field];
}
else if (field.DataType.IsNumericType())
else if (field.DataType.GetTypeInfo().IsNumber())
{
cell.SetDataType(XLCellValues.Number);
if (!string.Equals("{0}", field.DataFormatString))
Expand Down
Loading