Skip to content

Port libraries to .NET Standard 2.0 #57

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
bmmogensen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port libraries to .NET Standard 2.0 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,5 @@ $RECYCLE.BIN/
assets/FlatFile.Core.Compiled.nuspec
assets/FlatFile.Delimited.Compiled.nuspec
assets/FlatFile.FixedLength.Compiled.nuspec
/.vs
/src/.vs/FlatFile/v15/Server/sqlite3
3 changes: 2 additions & 1 deletion src/FlatFile.Benchmark/FlatFile.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlatFile.Benchmark</RootNamespace>
<AssemblyName>FlatFile.Benchmark</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
2 changes: 1 addition & 1 deletion src/FlatFile.Core.Attributes/Entities/PropertyDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using System.Reflection;

internal class PropertyDescription
public class PropertyDescription
{
public PropertyInfo Property { get; set; }
public Attribute[] Attributes { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/FlatFile.Core.Attributes/Extensions/AttributeUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace FlatFile.Core.Attributes.Extensions
{
internal static class AttributeUtil
public static class AttributeUtil
{
public static T GetAttribute<T>(this FieldInfo field, bool inherited = true) where T : Attribute
{
Expand Down
2 changes: 1 addition & 1 deletion src/FlatFile.Core.Attributes/Extensions/TypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using FlatFile.Core.Attributes.Entities;

internal static class TypeExtensions
public static class TypeExtensions
{
public static IEnumerable<PropertyDescription> GetTypeDescription<TAttribute>(this Type targetType) where TAttribute : Attribute
{
Expand Down
123 changes: 7 additions & 116 deletions src/FlatFile.Core.Attributes/FlatFile.Core.Attributes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,120 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.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>{5849B415-6CC1-4615-A94F-265F5BD6F234}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlatFile.Core.Attributes</RootNamespace>
<AssemblyName>FlatFile.Core.Attributes</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<!-- This establishes a new variable called 'Framework'. Don't confuse this with the actual .net TargetFrameworkVersion. It is just variable we can use in our conditions. We might as well set it to the main or current target framework if it is ''.-->
<Framework Condition=" '$(Framework)' == '' ">NET35</Framework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</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\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\$(AssemblyName).XML</DocumentationFile>
</PropertyGroup>
<!-- Here is our debug 4.0 group keep reading to see where this is set -->
<PropertyGroup Condition=" '$(Framework)' == 'NET40' And '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Here is the release 4.0 group -->
<PropertyGroup Condition=" '$(Framework)' == 'NET40' And '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\$(AssemblyName).XML</DocumentationFile>
</PropertyGroup>
<!-- Here is our debug 4.5 group keep reading to see where this is set -->
<PropertyGroup Condition=" '$(Framework)' == 'NET45' And '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Here is the release 4.0 group -->
<PropertyGroup Condition=" '$(Framework)' == 'NET45' And '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\$(AssemblyName).XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Base\FieldSettingsBaseAttribute.cs" />
<Compile Include="Base\LayoutBaseAttribute.cs" />
<Compile Include="Entities\PropertyDescription.cs" />
<Compile Include="Extensions\AttributeUtil.cs" />
<Compile Include="Extensions\TypeExtensions.cs" />
<Compile Include="Infrastructure\ILayoutDescriptorProvider.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FlatFile.Core\FlatFile.Core.csproj">
<Project>{1cb90052-b97a-4ad4-b9fd-20a22914d129}</Project>
<Name>FlatFile.Core</Name>
</ProjectReference>
<ProjectReference Include="..\FlatFile.Core\FlatFile.Core.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>
39 changes: 0 additions & 39 deletions src/FlatFile.Core.Attributes/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/FlatFile.Core/Base/LayoutDescriptorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ public IEnumerable<TFieldSettings> Fields
get { return FieldsContainer.OrderedFields; }
}

public bool HasHeader { get; protected internal set; }
public bool HasHeader { get; set; }
}
}
2 changes: 1 addition & 1 deletion src/FlatFile.Core/Extensions/ExpressionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace FlatFile.Core.Extensions
using System.Linq.Expressions;
using System.Reflection;

internal static class ExpressionExtensions
public static class ExpressionExtensions
{
/// <summary>
/// Gets the name of the member specified
Expand Down
137 changes: 5 additions & 132 deletions src/FlatFile.Core/FlatFile.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.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>{1CB90052-B97A-4AD4-B9FD-20A22914D129}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FlatFile.Core</RootNamespace>
<AssemblyName>FlatFile.Core</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<!-- This establishes a new variable called 'Framework'. Don't confuse this with the actual .net TargetFrameworkVersion. It is just variable we can use in our conditions. We might as well set it to the main or current target framework if it is ''.-->
<Framework Condition=" '$(Framework)' == '' ">NET35</Framework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</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\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\FlatFile.Core.XML</DocumentationFile>
</PropertyGroup>
<!-- Here is our debug 4.0 group keep reading to see where this is set -->
<PropertyGroup Condition=" '$(Framework)' == 'NET40' And '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Here is the release 4.0 group -->
<PropertyGroup Condition=" '$(Framework)' == 'NET40' And '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\FlatFile.Core.XML</DocumentationFile>
</PropertyGroup>
<!-- Here is our debug 4.5 group keep reading to see where this is set -->
<PropertyGroup Condition=" '$(Framework)' == 'NET45' And '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Here is the release 4.0 group -->
<PropertyGroup Condition=" '$(Framework)' == 'NET45' And '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<!-- Set the TargetFrameworkVersion here. This is the variable to tell ms build what .net framework to target.-->
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\$(Configuration)\$(Framework)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\$(Configuration)\$(Framework)\FlatFile.Core.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Base\FieldsContainer.cs" />
<Compile Include="Base\FieldSettingsBase.cs" />
<Compile Include="Base\FlatFileEngine.cs" />
<Compile Include="Base\LayoutBase.cs" />
<Compile Include="Base\LayoutDescriptorBase.cs" />
<Compile Include="Base\LineBulderBase.cs" />
<Compile Include="Base\LineParserBase.cs" />
<Compile Include="Exceptions\ParseLineException.cs" />
<Compile Include="Extensions\ExpressionExtensions.cs" />
<Compile Include="Extensions\FieldsSettingsExtensions.cs" />
<Compile Include="Extensions\ReflectionHelper.cs" />
<Compile Include="Extensions\TypeChangeExtensions.cs" />
<Compile Include="Extensions\TypeExtensions.cs" />
<Compile Include="IFieldsContainer.cs" />
<Compile Include="IFlatFileEngine.cs" />
<Compile Include="IFieldSettingsConstructor.cs" />
<Compile Include="IFieldSettingsFactory.cs" />
<Compile Include="IFlatFileEngineFactory.cs" />
<Compile Include="IFlatFileMultiEngine.cs" />
<Compile Include="ILayout.cs" />
<Compile Include="ILayoutDescriptor.cs" />
<Compile Include="ILineBuilderFactory.cs" />
<Compile Include="ILineBulder.cs" />
<Compile Include="ILineParser.cs" />
<Compile Include="ILineParserFactory.cs" />
<Compile Include="ITypeConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</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>
Loading