diff --git a/FileTypeChecker.Tests/Directory.Build.props b/FileTypeChecker.Tests/Directory.Build.props
new file mode 100644
index 0000000..65f9707
--- /dev/null
+++ b/FileTypeChecker.Tests/Directory.Build.props
@@ -0,0 +1,7 @@
+
+
+ true
+ ..\artifacts\obj\FileTypeChecker.Tests\
+ ..\artifacts\bin\
+
+
diff --git a/FileTypeChecker.Tests/FileTypeChecker.Tests.csproj b/FileTypeChecker.Tests/FileTypeChecker.Tests.csproj
index 45c110c..9c52d25 100644
--- a/FileTypeChecker.Tests/FileTypeChecker.Tests.csproj
+++ b/FileTypeChecker.Tests/FileTypeChecker.Tests.csproj
@@ -1,81 +1,36 @@
-
-
+
+
- Debug
- AnyCPU
- {716D0AB2-5088-4A22-A6E8-24B8D2F2039B}
+
+
+ net35;net40;
+ net45;net451;net452;
+ net46;net461;net462;
+ net47;net471;net472;
+
Library
- Properties
FileTypeChecker.Tests
FileTypeChecker.Tests
- v4.5
- 512
+
+ C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client
-
- true
- full
- false
- bin\Debug\
+
+
DEBUG;TRACE
- prompt
- 4
-
- pdbonly
- true
- bin\Release\
+
+
TRACE
- prompt
- 4
+
-
- ..\packages\NUnit.2.6.4\lib\nunit.framework.dll
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- True
- True
- Resources.resx
-
+
-
-
- {0ae201d3-ce5b-404f-8c25-36bd929e1d19}
- FileTypeChecker
-
-
-
-
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/FileTypeChecker.Tests/FileTypeCheckerTests.cs b/FileTypeChecker.Tests/FileTypeCheckerTests.cs
index 211f9f7..8436c28 100644
--- a/FileTypeChecker.Tests/FileTypeCheckerTests.cs
+++ b/FileTypeChecker.Tests/FileTypeCheckerTests.cs
@@ -20,7 +20,7 @@ public class WhenTheFileIsKnown
private FileTypeChecker checker;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void SetUp()
{
bitmap = new MemoryStream();
@@ -59,7 +59,7 @@ public class WhenTheFileIsUnknown
private FileTypeChecker checker;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void SetUp()
{
bitmap = new MemoryStream();
@@ -124,7 +124,7 @@ public class WhenTheFileIsUnknownList
private FileTypeChecker checker;
- [TestFixtureSetUp]
+ [OneTimeSetUp]
public void SetUp()
{
bitmap = new MemoryStream();
diff --git a/FileTypeChecker.Tests/Properties/AssemblyInfo.cs b/FileTypeChecker.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5192f74..0000000
--- a/FileTypeChecker.Tests/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("FileTypeChecker.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
-[assembly: AssemblyProduct("FileTypeChecker.Tests")]
-[assembly: AssemblyCopyright("Copyright © HP 2015")]
-[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("da4da584-b4a8-4766-a0fc-81ba5b7ea1b6")]
-
-// 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/FileTypeChecker.Tests/packages.config b/FileTypeChecker.Tests/packages.config
deleted file mode 100644
index c714ef3..0000000
--- a/FileTypeChecker.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/FileTypeChecker.sln b/FileTypeChecker.sln
index 9b56ac8..c2505f9 100644
--- a/FileTypeChecker.sln
+++ b/FileTypeChecker.sln
@@ -3,13 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTypeChecker", "FileTypeChecker\FileTypeChecker.csproj", "{0AE201D3-CE5B-404F-8C25-36BD929E1D19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileTypeChecker", "FileTypeChecker\FileTypeChecker.csproj", "{0AE201D3-CE5B-404F-8C25-36BD929E1D19}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileTypeChecker.Tests", "FileTypeChecker.Tests\FileTypeChecker.Tests.csproj", "{716D0AB2-5088-4A22-A6E8-24B8D2F2039B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1019EF17-64B8-4C70-BB39-A12DBFB30A16}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
+ LICENSE.md = LICENSE.md
README.md = README.md
EndProjectSection
EndProject
diff --git a/FileTypeChecker/App.config b/FileTypeChecker/App.config
deleted file mode 100644
index 8e15646..0000000
--- a/FileTypeChecker/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/FileTypeChecker/Directory.Build.props b/FileTypeChecker/Directory.Build.props
new file mode 100644
index 0000000..d1a500a
--- /dev/null
+++ b/FileTypeChecker/Directory.Build.props
@@ -0,0 +1,7 @@
+
+
+ true
+ ..\artifacts\obj\FileTypeChecker\
+ ..\artifacts\bin\
+
+
diff --git a/FileTypeChecker/FileTypeChecker.csproj b/FileTypeChecker/FileTypeChecker.csproj
index 7d22b0f..ec6994e 100644
--- a/FileTypeChecker/FileTypeChecker.csproj
+++ b/FileTypeChecker/FileTypeChecker.csproj
@@ -1,66 +1,51 @@
-
-
+
+
- Debug
- AnyCPU
- {0AE201D3-CE5B-404F-8C25-36BD929E1D19}
+
+
+ netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;
+ netstandard2.0;
+
+ netcoreapp1.0;netcoreapp1.1;
+ netcoreapp2.0;netcoreapp2.1;
+
+ net35;net40;
+ net45;net451;net452;
+ net46;net461;net462;
+ net47;net471;net472;
+
Library
- Properties
+ true
FileTypeChecker
FileTypeChecker
- v4.5
- 512
+
+ C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client
-
- AnyCPU
- true
- full
- false
- bin\Debug\
+
+
+
+ 1.1.0
+ FileTypeChecker
+
+ 0xbrock
+ File type checker that checks the file's magic numbers/Identifying bytes. Useful for verifying uploaded files in web applications. NuGet package of code originally written by https://github.com/mjolka and extended to allow for dependency injecting the known file types.
+ https://github.com/0xbrock/FileTypeChecker/blob/master/LICENSE.md
+
+ https://github.com/0xbrock/FileTypeChecker
+ Copyright © 2017-2018 0xbrock
+ File Type, Validator, Checker, Magic Numbers, Identifying Bytes
+ en-US
+
+
+
+
+
DEBUG;TRACE
- prompt
- 4
-
- AnyCPU
- pdbonly
- true
- bin\Release\
+
+
TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/FileTypeChecker/FileTypeChecker.nuspec b/FileTypeChecker/FileTypeChecker.nuspec
deleted file mode 100644
index 2c0901e..0000000
--- a/FileTypeChecker/FileTypeChecker.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- FileTypeChecker
- 1.0.0
- File Type Checker
- 0xbrock
- https://github.com/0xbrock/FileTypeChecker
- false
- File type checker that checks the file's magic numbers/Identifying bytes. Useful for verifying uploaded files in web applications.
-NuGet package of code originally written by https://github.com/mjolka and extended to allow for dependency injecting the known file types.
- 2017
- File Type, Validator, Checker, Magic Numbers, Identifying Bytes
-
-
-
-
-
\ No newline at end of file
diff --git a/FileTypeChecker/Properties/AssemblyInfo.cs b/FileTypeChecker/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4dad373..0000000
--- a/FileTypeChecker/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("FileTypeChecker")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HP")]
-[assembly: AssemblyProduct("FileTypeChecker")]
-[assembly: AssemblyCopyright("Copyright © HP 2015")]
-[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("8f5ab3ff-cefb-4575-bbda-58ca0dc9b369")]
-
-// 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")]