From 099debfba7c6322081b781e3350bb1e7570aba60 Mon Sep 17 00:00:00 2001 From: "hafnium@hafniumlabs.com" Date: Fri, 17 Nov 2017 06:48:40 +0100 Subject: [PATCH] Port libraries to .NET Standard 2.0 --- .gitignore | 2 + .../FlatFile.Benchmark.csproj | 3 +- .../Entities/PropertyDescription.cs | 2 +- .../Extensions/AttributeUtil.cs | 2 +- .../Extensions/TypeExtensions.cs | 2 +- .../FlatFile.Core.Attributes.csproj | 123 +--------------- .../Properties/AssemblyInfo.cs | 39 ----- .../Base/LayoutDescriptorBase.cs | 2 +- .../Extensions/ExpressionExtensions.cs | 2 +- src/FlatFile.Core/FlatFile.Core.csproj | 137 +----------------- src/FlatFile.Core/Properties/AssemblyInfo.cs | 43 ------ .../FlatFile.Delimited.Attributes.csproj | 129 ++--------------- .../Properties/AssemblyInfo.cs | 36 ----- .../FlatFile.Delimited.csproj | 135 +---------------- .../Implementation/DelimitedFileEngine.cs | 2 +- .../Properties/AssemblyInfo.cs | 37 ----- .../FlatFile.FixedLength.Attributes.csproj | 129 ++--------------- .../Properties/AssemblyInfo.cs | 36 ----- .../FlatFile.FixedLength.csproj | 135 +---------------- .../Implementation/FixedLengthFileEngine.cs | 2 +- .../FixedLengthFileMultiEngine.cs | 2 +- .../Properties/AssemblyInfo.cs | 41 ------ src/FlatFile.Tests/App.config | 14 +- src/FlatFile.Tests/FlatFile.Tests.csproj | 67 ++++++--- src/FlatFile.Tests/packages.config | 28 ++-- 25 files changed, 128 insertions(+), 1022 deletions(-) delete mode 100644 src/FlatFile.Core.Attributes/Properties/AssemblyInfo.cs delete mode 100644 src/FlatFile.Core/Properties/AssemblyInfo.cs delete mode 100644 src/FlatFile.Delimited.Attributes/Properties/AssemblyInfo.cs delete mode 100644 src/FlatFile.Delimited/Properties/AssemblyInfo.cs delete mode 100644 src/FlatFile.FixedLength.Attributes/Properties/AssemblyInfo.cs delete mode 100644 src/FlatFile.FixedLength/Properties/AssemblyInfo.cs diff --git a/.gitignore b/.gitignore index 6feb516..839e02d 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/src/FlatFile.Benchmark/FlatFile.Benchmark.csproj b/src/FlatFile.Benchmark/FlatFile.Benchmark.csproj index caa3588..0958d12 100644 --- a/src/FlatFile.Benchmark/FlatFile.Benchmark.csproj +++ b/src/FlatFile.Benchmark/FlatFile.Benchmark.csproj @@ -9,10 +9,11 @@ Properties FlatFile.Benchmark FlatFile.Benchmark - v4.5 + v4.6.2 512 ..\ true + true diff --git a/src/FlatFile.Core.Attributes/Entities/PropertyDescription.cs b/src/FlatFile.Core.Attributes/Entities/PropertyDescription.cs index 29fef84..e8053da 100644 --- a/src/FlatFile.Core.Attributes/Entities/PropertyDescription.cs +++ b/src/FlatFile.Core.Attributes/Entities/PropertyDescription.cs @@ -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; } diff --git a/src/FlatFile.Core.Attributes/Extensions/AttributeUtil.cs b/src/FlatFile.Core.Attributes/Extensions/AttributeUtil.cs index cc90abc..2d16082 100644 --- a/src/FlatFile.Core.Attributes/Extensions/AttributeUtil.cs +++ b/src/FlatFile.Core.Attributes/Extensions/AttributeUtil.cs @@ -5,7 +5,7 @@ namespace FlatFile.Core.Attributes.Extensions { - internal static class AttributeUtil + public static class AttributeUtil { public static T GetAttribute(this FieldInfo field, bool inherited = true) where T : Attribute { diff --git a/src/FlatFile.Core.Attributes/Extensions/TypeExtensions.cs b/src/FlatFile.Core.Attributes/Extensions/TypeExtensions.cs index e2451f9..51e9c05 100644 --- a/src/FlatFile.Core.Attributes/Extensions/TypeExtensions.cs +++ b/src/FlatFile.Core.Attributes/Extensions/TypeExtensions.cs @@ -5,7 +5,7 @@ using System.Linq; using FlatFile.Core.Attributes.Entities; - internal static class TypeExtensions + public static class TypeExtensions { public static IEnumerable GetTypeDescription(this Type targetType) where TAttribute : Attribute { diff --git a/src/FlatFile.Core.Attributes/FlatFile.Core.Attributes.csproj b/src/FlatFile.Core.Attributes/FlatFile.Core.Attributes.csproj index 87f339c..59c15f8 100644 --- a/src/FlatFile.Core.Attributes/FlatFile.Core.Attributes.csproj +++ b/src/FlatFile.Core.Attributes/FlatFile.Core.Attributes.csproj @@ -1,120 +1,11 @@ - - - + + - Debug - AnyCPU - {5849B415-6CC1-4615-A94F-265F5BD6F234} - Library - Properties - FlatFile.Core.Attributes - FlatFile.Core.Attributes - v3.5 - 512 - - NET35 - ..\ - true + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - - - - - - - - - - - - - - + - - {1cb90052-b97a-4ad4-b9fd-20a22914d129} - FlatFile.Core - + - - - \ No newline at end of file + + diff --git a/src/FlatFile.Core.Attributes/Properties/AssemblyInfo.cs b/src/FlatFile.Core.Attributes/Properties/AssemblyInfo.cs deleted file mode 100644 index fb2042a..0000000 --- a/src/FlatFile.Core.Attributes/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("FlatFile.Core.Attributes")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("FlatFile.Core.Attributes")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3825eaff-28bf-4e11-bce8-5fcb63273c03")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("FlatFile.Tests")] -[assembly: InternalsVisibleTo("FlatFile.Delimited.Attributes")] -[assembly: InternalsVisibleTo("FlatFile.FixedLength.Attributes")] diff --git a/src/FlatFile.Core/Base/LayoutDescriptorBase.cs b/src/FlatFile.Core/Base/LayoutDescriptorBase.cs index 5dbfc48..62f3377 100644 --- a/src/FlatFile.Core/Base/LayoutDescriptorBase.cs +++ b/src/FlatFile.Core/Base/LayoutDescriptorBase.cs @@ -22,6 +22,6 @@ public IEnumerable Fields get { return FieldsContainer.OrderedFields; } } - public bool HasHeader { get; protected internal set; } + public bool HasHeader { get; set; } } } \ No newline at end of file diff --git a/src/FlatFile.Core/Extensions/ExpressionExtensions.cs b/src/FlatFile.Core/Extensions/ExpressionExtensions.cs index e3b978f..ba07275 100644 --- a/src/FlatFile.Core/Extensions/ExpressionExtensions.cs +++ b/src/FlatFile.Core/Extensions/ExpressionExtensions.cs @@ -4,7 +4,7 @@ namespace FlatFile.Core.Extensions using System.Linq.Expressions; using System.Reflection; - internal static class ExpressionExtensions + public static class ExpressionExtensions { /// /// Gets the name of the member specified diff --git a/src/FlatFile.Core/FlatFile.Core.csproj b/src/FlatFile.Core/FlatFile.Core.csproj index 08ab631..9f5c4f4 100644 --- a/src/FlatFile.Core/FlatFile.Core.csproj +++ b/src/FlatFile.Core/FlatFile.Core.csproj @@ -1,134 +1,7 @@ - - - + + - Debug - AnyCPU - {1CB90052-B97A-4AD4-B9FD-20A22914D129} - Library - Properties - FlatFile.Core - FlatFile.Core - v3.5 - 512 - - NET35 - ..\ - true + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Core.XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Core.XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Core.XML - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/src/FlatFile.Core/Properties/AssemblyInfo.cs b/src/FlatFile.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index 83270f1..0000000 --- a/src/FlatFile.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("FlatFile.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("EPAM Systems")] -[assembly: AssemblyProduct("FlatFile.Core")] -[assembly: AssemblyCopyright("Copyright © EPAM Systems 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f2c28e66-9e85-4264-a4c5-95a6a5f772a1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("FlatFile.Tests")] -[assembly: InternalsVisibleTo("FlatFile.FixedLength.Attributes")] -[assembly: InternalsVisibleTo("FlatFile.FixedLength")] -[assembly: InternalsVisibleTo("FlatFile.Delimited.Attributes")] -[assembly: InternalsVisibleTo("FlatFile.Delimited")] -[assembly: InternalsVisibleTo("FlatFile.Core.Attributes")] diff --git a/src/FlatFile.Delimited.Attributes/FlatFile.Delimited.Attributes.csproj b/src/FlatFile.Delimited.Attributes/FlatFile.Delimited.Attributes.csproj index 8c89756..2abdad9 100644 --- a/src/FlatFile.Delimited.Attributes/FlatFile.Delimited.Attributes.csproj +++ b/src/FlatFile.Delimited.Attributes/FlatFile.Delimited.Attributes.csproj @@ -1,124 +1,13 @@ - - - + + - Debug - AnyCPU - {0313AD85-3109-4E8D-999C-D016943E83D5} - Library - Properties - FlatFile.Delimited.Attributes - FlatFile.Delimited.Attributes - v3.5 - 512 - - NET35 + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - - - - - - - - - - - - + - - {5849B415-6CC1-4615-A94F-265F5BD6F234} - FlatFile.Core.Attributes - - - {1CB90052-B97A-4AD4-B9FD-20A22914D129} - FlatFile.Core - - - {F0478B76-5190-4B51-AA3A-C02D3A4109CA} - FlatFile.Delimited - + + + - - - \ No newline at end of file + + diff --git a/src/FlatFile.Delimited.Attributes/Properties/AssemblyInfo.cs b/src/FlatFile.Delimited.Attributes/Properties/AssemblyInfo.cs deleted file mode 100644 index 6420c3c..0000000 --- a/src/FlatFile.Delimited.Attributes/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("FlatFile.Delimited.Attributes")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("FlatFile.Delimited.Attributes")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6d2ff0a0-9c37-4179-a59f-304f44d79d69")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/FlatFile.Delimited/FlatFile.Delimited.csproj b/src/FlatFile.Delimited/FlatFile.Delimited.csproj index 1523482..7bc03dc 100644 --- a/src/FlatFile.Delimited/FlatFile.Delimited.csproj +++ b/src/FlatFile.Delimited/FlatFile.Delimited.csproj @@ -1,132 +1,11 @@ - - - + + - Debug - AnyCPU - {F0478B76-5190-4B51-AA3A-C02D3A4109CA} - Library - Properties - FlatFile.Delimited - FlatFile.Delimited - v3.5 - 512 - - NET35 + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Delimited.XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Delimited.XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.Delimited.XML - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {1CB90052-B97A-4AD4-B9FD-20A22914D129} - FlatFile.Core - + - - - \ No newline at end of file + + diff --git a/src/FlatFile.Delimited/Implementation/DelimitedFileEngine.cs b/src/FlatFile.Delimited/Implementation/DelimitedFileEngine.cs index cccbd39..52f3e7b 100644 --- a/src/FlatFile.Delimited/Implementation/DelimitedFileEngine.cs +++ b/src/FlatFile.Delimited/Implementation/DelimitedFileEngine.cs @@ -34,7 +34,7 @@ public class DelimitedFileEngine : /// The builder factory. /// The parser factory. /// The handle entry read error. - internal DelimitedFileEngine( + public DelimitedFileEngine( IDelimitedLayoutDescriptor layoutDescriptor, IDelimitedLineBuilderFactory builderFactory, IDelimitedLineParserFactory parserFactory, diff --git a/src/FlatFile.Delimited/Properties/AssemblyInfo.cs b/src/FlatFile.Delimited/Properties/AssemblyInfo.cs deleted file mode 100644 index 190f054..0000000 --- a/src/FlatFile.Delimited/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("FlatFile.Delimited")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("EPAM Systems")] -[assembly: AssemblyProduct("FlatFile.Delimited")] -[assembly: AssemblyCopyright("Copyright © EPAM Systems 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d4d0ebc5-db19-42f6-b89b-13eb214ffcdf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("FlatFile.Tests")] diff --git a/src/FlatFile.FixedLength.Attributes/FlatFile.FixedLength.Attributes.csproj b/src/FlatFile.FixedLength.Attributes/FlatFile.FixedLength.Attributes.csproj index 5289115..2301878 100644 --- a/src/FlatFile.FixedLength.Attributes/FlatFile.FixedLength.Attributes.csproj +++ b/src/FlatFile.FixedLength.Attributes/FlatFile.FixedLength.Attributes.csproj @@ -1,124 +1,13 @@ - - - + + - Debug - AnyCPU - {65154587-18F2-45DC-8E86-B2177309A479} - Library - Properties - FlatFile.FixedLength.Attributes - FlatFile.FixedLength.Attributes - v3.5 - 512 - - NET35 + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\$(AssemblyName).XML - - - - - - - - - - - - - - - - + - - {5849B415-6CC1-4615-A94F-265F5BD6F234} - FlatFile.Core.Attributes - - - {1CB90052-B97A-4AD4-B9FD-20A22914D129} - FlatFile.Core - - - {2D38BA1D-8D0C-4DC2-A7B1-7BA330D1DDCD} - FlatFile.FixedLength - + + + - - - \ No newline at end of file + + diff --git a/src/FlatFile.FixedLength.Attributes/Properties/AssemblyInfo.cs b/src/FlatFile.FixedLength.Attributes/Properties/AssemblyInfo.cs deleted file mode 100644 index 044735b..0000000 --- a/src/FlatFile.FixedLength.Attributes/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("FlatFile.FixedLength.Attributes")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("FlatFile.FixedLength.Attributes")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f41f342b-68ca-4b29-b095-a8bbdae59ba0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/FlatFile.FixedLength/FlatFile.FixedLength.csproj b/src/FlatFile.FixedLength/FlatFile.FixedLength.csproj index f0090b9..59c15f8 100644 --- a/src/FlatFile.FixedLength/FlatFile.FixedLength.csproj +++ b/src/FlatFile.FixedLength/FlatFile.FixedLength.csproj @@ -1,132 +1,11 @@ - - - + + - Debug - AnyCPU - {2D38BA1D-8D0C-4DC2-A7B1-7BA330D1DDCD} - Library - Properties - FlatFile.FixedLength - FlatFile.FixedLength - v3.5 - 512 - - NET35 + netstandard2.0 - - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.FixedLength.XML - - - - - v4.0 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.0 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.FixedLength.XML - - - - - v4.5 - AnyCPU - true - full - false - bin\$(Configuration)\$(Framework)\ - DEBUG;TRACE - prompt - 4 - - - - - v4.5 - AnyCPU - pdbonly - true - bin\$(Configuration)\$(Framework)\ - TRACE - prompt - 4 - bin\$(Configuration)\$(Framework)\FlatFile.FixedLength.XML - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {1cb90052-b97a-4ad4-b9fd-20a22914d129} - FlatFile.Core - + - - - \ No newline at end of file + + diff --git a/src/FlatFile.FixedLength/Implementation/FixedLengthFileEngine.cs b/src/FlatFile.FixedLength/Implementation/FixedLengthFileEngine.cs index 22686c9..1b7dc9c 100644 --- a/src/FlatFile.FixedLength/Implementation/FixedLengthFileEngine.cs +++ b/src/FlatFile.FixedLength/Implementation/FixedLengthFileEngine.cs @@ -29,7 +29,7 @@ public class FixedLengthFileEngine : FlatFileEngineThe line builder factory. /// The line parser factory. /// The handle entry read error. - internal FixedLengthFileEngine( + public FixedLengthFileEngine( ILayoutDescriptor layoutDescriptor, IFixedLengthLineBuilderFactory lineBuilderFactory, IFixedLengthLineParserFactory lineParserFactory, diff --git a/src/FlatFile.FixedLength/Implementation/FixedLengthFileMultiEngine.cs b/src/FlatFile.FixedLength/Implementation/FixedLengthFileMultiEngine.cs index 9226d09..2a3d946 100644 --- a/src/FlatFile.FixedLength/Implementation/FixedLengthFileMultiEngine.cs +++ b/src/FlatFile.FixedLength/Implementation/FixedLengthFileMultiEngine.cs @@ -53,7 +53,7 @@ public class FixedLengthFileMultiEngine : FlatFileEngineThe line parser factory. /// The handle entry read error. /// typeSelectorFunc - internal FixedLengthFileMultiEngine( + public FixedLengthFileMultiEngine( IEnumerable> layoutDescriptors, Func typeSelectorFunc, IFixedLengthLineBuilderFactory lineBuilderFactory, diff --git a/src/FlatFile.FixedLength/Properties/AssemblyInfo.cs b/src/FlatFile.FixedLength/Properties/AssemblyInfo.cs deleted file mode 100644 index e5ac8c4..0000000 --- a/src/FlatFile.FixedLength/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("FlatFile.FixedLength")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("EPAM Systems")] -[assembly: AssemblyProduct("FlatFile.FixedLength")] -[assembly: AssemblyCopyright("Copyright © EPAM Systems 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("4f911ba4-3051-4146-a688-e11653eebc33")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] - -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("FlatFile.Tests")] \ No newline at end of file diff --git a/src/FlatFile.Tests/App.config b/src/FlatFile.Tests/App.config index bc90ce8..385864c 100644 --- a/src/FlatFile.Tests/App.config +++ b/src/FlatFile.Tests/App.config @@ -5,6 +5,16 @@ - + + - \ No newline at end of file + + + + + + + + + + diff --git a/src/FlatFile.Tests/FlatFile.Tests.csproj b/src/FlatFile.Tests/FlatFile.Tests.csproj index 57f98f9..cad80d5 100644 --- a/src/FlatFile.Tests/FlatFile.Tests.csproj +++ b/src/FlatFile.Tests/FlatFile.Tests.csproj @@ -1,5 +1,8 @@  + + + Debug @@ -9,10 +12,13 @@ Properties FlatFile.Tests FlatFile.Tests - v4.5 + v4.6.2 512 ..\ true + + + true @@ -32,44 +38,44 @@ 4 - - ..\packages\FakeItEasy.2.2.0\lib\net40\FakeItEasy.dll - True + + ..\packages\FakeItEasy.4.2.0\lib\net45\FakeItEasy.dll - - ..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.dll - True + + ..\packages\FluentAssertions.4.19.4\lib\net45\FluentAssertions.dll - - ..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.Core.dll - True + + ..\packages\FluentAssertions.4.19.4\lib\net45\FluentAssertions.Core.dll + + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\System.Configuration.ConfigurationManager.4.5.0-preview1-25914-04\lib\net461\System.Configuration.ConfigurationManager.dll + + - - ..\packages\SpecFlow.2.1.0\lib\net45\TechTalk.SpecFlow.dll - True + + ..\packages\SpecFlow.2.2.1\lib\net45\TechTalk.SpecFlow.dll - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True + ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - - ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll - True + + ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - - ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - True + + ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - - ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - True + + ..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll @@ -137,7 +143,20 @@ + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + +