diff --git a/LibMpc.sln b/LibMpc.sln
index 6f7d4f0..2f9db1b 100644
--- a/LibMpc.sln
+++ b/LibMpc.sln
@@ -1,19 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.3
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibMpc", "LibMpc\LibMpc.xproj", "{8994C820-7BA9-4BB8-B9EA-C608B07C4A11}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibMpcApp", "LibMpcApp\LibMpcApp.xproj", "{FF176AD5-D6DA-41EE-B27D-1DBEF0CE462F}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibMpcTest", "LibMpcTest\LibMpcTest.xproj", "{69F1D68F-9CD5-4EA6-9B47-2A7A9BF8CED9}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Utilities", "Solution Utilities", "{83D06F7C-1336-4AC3-82BB-FDE7940D3C10}"
ProjectSection(SolutionItems) = preProject
.travis.yml = .travis.yml
EndProjectSection
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibMpc", "LibMpc\LibMpc.csproj", "{8994C820-7BA9-4BB8-B9EA-C608B07C4A11}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibMpcApp", "LibMpcApp\LibMpcApp.csproj", "{FF176AD5-D6DA-41EE-B27D-1DBEF0CE462F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibMpcTest", "LibMpcTest\LibMpcTest.csproj", "{69F1D68F-9CD5-4EA6-9B47-2A7A9BF8CED9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/LibMpc/LibMpc.csproj b/LibMpc/LibMpc.csproj
new file mode 100644
index 0000000..90079b2
--- /dev/null
+++ b/LibMpc/LibMpc.csproj
@@ -0,0 +1,18 @@
+
+
+
+ netstandard1.6
+ LibMpc
+ LibMpc
+ 1.6.0
+ $(PackageTargetFallback);dnxcore50
+ false
+ false
+ false
+
+
+
+
+
+
+
diff --git a/LibMpc/LibMpc.xproj b/LibMpc/LibMpc.xproj
deleted file mode 100644
index d2e8a1e..0000000
--- a/LibMpc/LibMpc.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- 8994c820-7ba9-4bb8-b9ea-c608b07c4a11
- LibMpc
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/LibMpc/project.json b/LibMpc/project.json
deleted file mode 100644
index ba4e60a..0000000
--- a/LibMpc/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "version": "1.0.0-*",
-
- "dependencies": {
- "NETStandard.Library": "1.6.0",
- "Newtonsoft.Json": "9.0.1"
- },
-
- "frameworks": {
- "netstandard1.6": {
- "imports": "dnxcore50"
- }
- }
-}
diff --git a/LibMpcApp/LibMpcApp.csproj b/LibMpcApp/LibMpcApp.csproj
new file mode 100644
index 0000000..663a741
--- /dev/null
+++ b/LibMpcApp/LibMpcApp.csproj
@@ -0,0 +1,19 @@
+
+
+
+ netcoreapp1.0
+ LibMpcApp
+ Exe
+ LibMpcApp
+ 1.0.4
+ $(PackageTargetFallback);dnxcore50
+ false
+ false
+ false
+
+
+
+
+
+
+
diff --git a/LibMpcApp/LibMpcApp.xproj b/LibMpcApp/LibMpcApp.xproj
deleted file mode 100644
index b0a483b..0000000
--- a/LibMpcApp/LibMpcApp.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
-
- ff176ad5-d6da-41ee-b27d-1dbef0ce462f
- LibMpcApp
- .\obj
- .\bin\
- v4.5.2
-
-
-
- 2.0
-
-
-
diff --git a/LibMpcApp/project.json b/LibMpcApp/project.json
deleted file mode 100644
index b24b498..0000000
--- a/LibMpcApp/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "LibMpc": "1.0.0-*",
- "Microsoft.NETCore.App": {
- "type": "platform",
- "version": "1.0.1"
- }
- },
-
- "frameworks": {
- "netcoreapp1.0": {
- "imports": "dnxcore50"
- }
- }
-}
diff --git a/LibMpcTest/LibMpcTest.csproj b/LibMpcTest/LibMpcTest.csproj
new file mode 100644
index 0000000..81b29b9
--- /dev/null
+++ b/LibMpcTest/LibMpcTest.csproj
@@ -0,0 +1,30 @@
+
+
+
+ netcoreapp1.0
+ LibMpcTest
+ LibMpcTest
+ true
+ 1.0.4
+ false
+ false
+ false
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LibMpcTest/LibMpcTest.xproj b/LibMpcTest/LibMpcTest.xproj
deleted file mode 100644
index 14fbe0b..0000000
--- a/LibMpcTest/LibMpcTest.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 69f1d68f-9cd5-4ea6-9b47-2a7a9bf8ced9
- LibMpcTest
- .\obj
- .\bin\
- v4.5.2
-
-
- 2.0
-
-
-
-
-
-
\ No newline at end of file
diff --git a/LibMpcTest/project.json b/LibMpcTest/project.json
deleted file mode 100644
index bae6daf..0000000
--- a/LibMpcTest/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "buildOptions":
- {
- "copyToOutput": "Server\\"
- },
-
- "version": "1.0.0-*",
-
- "testRunner": "xunit",
-
- "dependencies":
- {
- "xunit": "2.2.0-beta2-build3300",
- "LibMpc": "1.0.0-*",
- "dotnet-test-xunit": "2.2.0-preview2-build1029"
- },
-
- "frameworks":
- {
- "netcoreapp1.0":
- {
- "dependencies":
- {
- "Microsoft.NETCore.App":
- {
- "type": "platform",
- "version": "1.0.0"
- }
- }
- }
- }
-}