Merge branch 'master'

FreeImage-dotnet-core.sln

@@ -7,7 +7,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FreeImage-dotnet-core", "sr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B03B4CBD-B223-4F9B-BC26-274A5FDB660D}"
 	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
 		global.json = global.json
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32568241-B63B-4E05-A92D-C46C50EECFB9}"

README.md

@@ -6,6 +6,12 @@ nuget package: https://www.nuget.org/packages/FreeImage-dotnet-core
 
 `Install-Package FreeImage-dotnet-core`
 
+#### FreeImage Version
+
+This is for FreeImage version 3.17.0 
+
+##### The version number of this package no longer matches the FreeImage native library version!
+
 #### License
 
 The license is the same as the FreeImage license available at the link above

src/UnitTest/NUnit.txt

@@ -1,14 +1,5 @@
-NUnit 2.x is needed for FreeImage .NET wrapper unit tests. It can be
-downloaded from http://www.nunit.org/
+The tests can be run by invoking "dotnet test" from the UnitTest project folder
 
-After installing NUnit, double click on the NUnit project file
-FreeImage.NET.nunit located in the FreeImage .NET wrapper Source folder
-to load the project.
+Alternatively, the test explorer can be used in Visual Studio
 
-The FreeImage .NET wrapper unit test project UnitTest.csproj, located
-under Source\UnitTest, must be compiled in 'Debug' mode prior to opening
-the NUnit project.
-
-The FreeImage .NET wrapper unit test project UnitTest.csproj currently
-relies on the FreeImage .NET wrapper single source file, created by the
-Source File Merger, located in the Source\SourceFileMerger folder.
+If either of these don't work, please open an issue!