diff --git a/NOpenType/NOpenType.csproj b/NOpenType/NOpenType.csproj
new file mode 100644
index 0000000..b10251c
--- /dev/null
+++ b/NOpenType/NOpenType.csproj
@@ -0,0 +1,33 @@
+
+
+
+ Simple and clean TrueType font loader and renderer written purely in c#.
+ Copyright 2016 Samuel Carlsson
+ NOpenType
+ 0.0.1
+ Samuel Carlsson, WinterDev
+ netstandard2.0
+ NOpenType
+ NOpenType
+ font;truetype;true-type
+ https://github.com/vidstige/NRasterizer/raw/master/icon.png
+ https://github.com/vidstige/NRasterizer
+ https://github.com/vidstige/NRasterizer/blob/master/LICENSE.md
+ git
+ https://github.com/vidstige/NRasterizer
+ 1.6.0
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
diff --git a/NOpenType/NOpenType.xproj b/NOpenType/NOpenType.xproj
deleted file mode 100644
index 7f6ea60..0000000
--- a/NOpenType/NOpenType.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 4f74a90e-c244-4b7c-98e4-72c1622517fc
- NRasterizer
- .\obj
- .\bin\
- v4.5.1
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/NOpenType/project.json b/NOpenType/project.json
deleted file mode 100644
index addbb9d..0000000
--- a/NOpenType/project.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "NOpenType",
- "title": "NOpenType",
- "version": "0.0.1-*",
- "description": "Simple and clean TrueType font loader and renderer written purely in c#.",
- "copyright": "Copyright 2016 Samuel Carlsson",
- "authors": [
- "Samuel Carlsson, WinterDev"
- ],
- "packOptions": {
- "owners": [ "vidstige" ],
- "licenseUrl": "https://github.com/vidstige/NRasterizer/blob/master/LICENSE.md",
- "projectUrl": "https://github.com/vidstige/NRasterizer",
- "iconUrl": "https://github.com/vidstige/NRasterizer/raw/master/icon.png",
- "requireLicenseAcceptance": false,
- "repository": {
- "type": "git",
- "url": "https://github.com/vidstige/NRasterizer"
- },
- "tags": [
- "font",
- "truetype",
- "true-type"
- ]
- },
- "configurations": {
- "Release": {
- "buildOptions": {
- "optimize": true
- }
- }
- },
- "dependencies": {
- "NETStandard.Library": "1.6.0"
- },
- "tools": {
- "dotnet-version": "1.1.0"
- },
- "frameworks": {
- "netstandard1.1": {}
- }
-}
\ No newline at end of file
diff --git a/NRasterizer.CLI/NRasterizer.CLI.csproj b/NRasterizer.CLI/NRasterizer.CLI.csproj
new file mode 100644
index 0000000..516f638
--- /dev/null
+++ b/NRasterizer.CLI/NRasterizer.CLI.csproj
@@ -0,0 +1,32 @@
+
+
+
+ net471
+ portable
+ NRasterizer.CLI
+ Exe
+ NRasterizer.CLI
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NRasterizer.CLI/NRasterizer.CLI.xproj b/NRasterizer.CLI/NRasterizer.CLI.xproj
deleted file mode 100644
index 33dcdeb..0000000
--- a/NRasterizer.CLI/NRasterizer.CLI.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 8fd65b63-92a2-4868-ac93-19e385df76c6
- NRasterizer.CLI
- .\obj
- .\bin\
- v4.5.1
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/NRasterizer.CLI/Properties/AssemblyInfo.cs b/NRasterizer.CLI/Properties/AssemblyInfo.cs
index 5b9ac71..c5bb6c9 100644
--- a/NRasterizer.CLI/Properties/AssemblyInfo.cs
+++ b/NRasterizer.CLI/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/NRasterizer.CLI/project.json b/NRasterizer.CLI/project.json
deleted file mode 100755
index dc4d434..0000000
--- a/NRasterizer.CLI/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "debugType": "portable",
- "emitEntryPoint": true
- },
- "dependencies": {
- "NOpenType": {
- "target": "project"
- }
- },
- "frameworks": {
- "net45": {
- "frameworkAssemblies": {
- "System.Drawing": ""
- }
- }
- }
-}
diff --git a/NRasterizer.Tests/NRasterizer.Tests.csproj b/NRasterizer.Tests/NRasterizer.Tests.csproj
new file mode 100644
index 0000000..5660681
--- /dev/null
+++ b/NRasterizer.Tests/NRasterizer.Tests.csproj
@@ -0,0 +1,33 @@
+
+
+
+ netcoreapp2.0
+ portable
+ NRasterizer.Tests
+ NRasterizer.Tests
+ true
+ $(PackageTargetFallback);dotnet5.4;portable-net451+win8
+ 1.0.4
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NRasterizer.Tests/NRasterizer.Tests.xproj b/NRasterizer.Tests/NRasterizer.Tests.xproj
deleted file mode 100644
index 0a0121e..0000000
--- a/NRasterizer.Tests/NRasterizer.Tests.xproj
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- fc36d8cb-3b6c-4078-aae0-68a4223bb2c4
- NRasterizer.Tests
- .\obj
- .\bin\
- v4.5.1
-
-
- 2.0
-
-
- True
-
-
-
-
-
-
\ No newline at end of file
diff --git a/NRasterizer.Tests/project.json b/NRasterizer.Tests/project.json
deleted file mode 100755
index aa9b53e..0000000
--- a/NRasterizer.Tests/project.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "debugType": "portable"
- },
- "dependencies": {
- "System.Runtime.Serialization.Primitives": "4.1.1",
- "xunit": "2.1.0",
- "dotnet-test-xunit": "1.0.0-rc2-build10015",
- "moq": "4.6.38-alpha",
- "NOpenType": {
- "target": "project"
- }
- },
- "testRunner": "xunit",
- "frameworks": {
- "netcoreapp1.0": {
- "dependencies": {
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.0"
- }
- },
- "imports": [
- "dotnet5.4",
- "portable-net451+win8"
- ]
- }
- }
-}
diff --git a/NRasterizer.sln b/NRasterizer.sln
index 25b0a95..299f4cb 100644
--- a/NRasterizer.sln
+++ b/NRasterizer.sln
@@ -1,14 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NRasterizer.Tests", "NRasterizer.Tests\NRasterizer.Tests.xproj", "{FC36D8CB-3B6C-4078-AAE0-68A4223BB2C4}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NRasterizer.CLI", "NRasterizer.CLI\NRasterizer.CLI.xproj", "{8FD65B63-92A2-4868-AC93-19E385DF76C6}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NOpenType", "NOpenType\NOpenType.xproj", "{4F74A90E-C244-4B7C-98E4-72C1622517FC}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{4DDB15E9-E21C-4043-AE71-F0DEB9F14BED}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
@@ -18,6 +12,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
README.md = README.md
EndProjectSection
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRasterizer.Tests", "NRasterizer.Tests\NRasterizer.Tests.csproj", "{FC36D8CB-3B6C-4078-AAE0-68A4223BB2C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRasterizer.CLI", "NRasterizer.CLI\NRasterizer.CLI.csproj", "{8FD65B63-92A2-4868-AC93-19E385DF76C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NOpenType", "NOpenType\NOpenType.csproj", "{4F74A90E-C244-4B7C-98E4-72C1622517FC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -40,4 +40,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {16653EFD-6AF4-48BC-BDB5-23EA1D819E6F}
+ EndGlobalSection
EndGlobal
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000..05cb082
Binary files /dev/null and b/UpgradeLog.htm differ