diff --git a/LearnositySDK-VS2010.sln b/LearnositySDK-VS2010.sln
deleted file mode 100644
index 50f530e..0000000
--- a/LearnositySDK-VS2010.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{4A1F8BE2-02A2-424D-AE33-11F742E18EED}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/LearnositySDK.sln b/LearnositySDK.sln
index 3eda81b..ad5affa 100755
--- a/LearnositySDK.sln
+++ b/LearnositySDK.sln
@@ -1,11 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2009
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{4A1F8BE2-02A2-424D-AE33-11F742E18EED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDK", "LearnositySDK\LearnositySDK.csproj", "{DC1B295A-F21E-4A3C-A4DA-76130D281546}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LearnositySDKUnitTests", "UnitTestProject1\LearnositySDKUnitTests.csproj", "{1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LearnositySDKUnitTests", "LearnositySDKUnitTests\LearnositySDKUnitTests.csproj", "{29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {DC1B295A-F21E-4A3C-A4DA-76130D281546} = {DC1B295A-F21E-4A3C-A4DA-76130D281546}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +16,19 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}.Release|Any CPU.Build.0 = Release|Any CPU
- {1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+ {DC1B295A-F21E-4A3C-A4DA-76130D281546}.Debug|Any CPU.Build.0 = Release|Any CPU
+ {DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC1B295A-F21E-4A3C-A4DA-76130D281546}.Release|Any CPU.Build.0 = Release|Any CPU
+ {29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {29D6AB6C-C34D-4FAE-A433-E59C0B990DB6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {3C8708D7-B4D7-4294-A8EE-854A68D6CDA4}
+ EndGlobalSection
EndGlobal
diff --git a/LearnositySDK/LearnositySDK.csproj b/LearnositySDK/LearnositySDK.csproj
index 26e32c5..f8af2fc 100755
--- a/LearnositySDK/LearnositySDK.csproj
+++ b/LearnositySDK/LearnositySDK.csproj
@@ -1,83 +1,31 @@
-
-
+
+
- Debug
- AnyCPU
- 8.0.30703
- 2.0
- {4A1F8BE2-02A2-424D-AE33-11F742E18EED}
- Library
- Properties
- LearnositySDK
+ netstandard2.0
LearnositySDK
- v4.5.2
- 512
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
+ LearnositySDK
+ LearnositySDK
+ 0.8.0
+ Learnosity
+ Learnosity SDK for ASP.NET / C#
+ false
+ Update to .Net Standard
+ Copyright Learnosity 2017 (c)
+ learnosity sdk asp .net
+ 0.8.0
+ https://github.com/Learnosity/learnosity-sdk-asp.net/blob/master/LICENSE.md
+ https://github.com/Learnosity/learnosity-sdk-asp.net
+ https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg
+ https://www.learnosity.com/static/img/logos/learnositylogoforfacebook.jpg
+ true
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
+
+
+ bin\Release\netstandard2.0\LearnositySDK.xml
+
-
- False
- ..\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
\ No newline at end of file
+
+
diff --git a/LearnositySDK/Properties/AssemblyInfo.cs b/LearnositySDK/Properties/AssemblyInfo.cs
deleted file mode 100755
index 425bc72..0000000
--- a/LearnositySDK/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("LearnositySDK")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("LearnositySDK")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 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("add2acfb-b928-4f80-873a-cb7c5192d5e5")]
-
-// 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/LearnositySDK/packages.config b/LearnositySDK/packages.config
deleted file mode 100644
index 64b5d8e..0000000
--- a/LearnositySDK/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/UnitTestProject1/CheckingEqualityUnitTests.cs b/LearnositySDKUnitTests/CheckingEqualityUnitTests.cs
similarity index 99%
rename from UnitTestProject1/CheckingEqualityUnitTests.cs
rename to LearnositySDKUnitTests/CheckingEqualityUnitTests.cs
index d9e448d..e833e6c 100644
--- a/UnitTestProject1/CheckingEqualityUnitTests.cs
+++ b/LearnositySDKUnitTests/CheckingEqualityUnitTests.cs
@@ -3,7 +3,7 @@
using LearnositySDK.Utils;
using Newtonsoft.Json.Linq;
-namespace UnitTestProject1
+namespace LearnositySDKUnitTests
{
///
/// Summary description for CheckingEqualityUnitTests
diff --git a/UnitTestProject1/LearnositySDKUnitTests.cs b/LearnositySDKUnitTests/LearnositySDKUnitTests.cs
similarity index 84%
rename from UnitTestProject1/LearnositySDKUnitTests.cs
rename to LearnositySDKUnitTests/LearnositySDKUnitTests.cs
index de800eb..8c365d2 100644
--- a/UnitTestProject1/LearnositySDKUnitTests.cs
+++ b/LearnositySDKUnitTests/LearnositySDKUnitTests.cs
@@ -2,7 +2,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using LearnositySDK.Utils;
-namespace UnitTestProject1
+namespace LearnositySDKUnitTests
{
[TestClass]
public class LearnositySDKUnitTests
diff --git a/LearnositySDKUnitTests/LearnositySDKUnitTests.csproj b/LearnositySDKUnitTests/LearnositySDKUnitTests.csproj
new file mode 100644
index 0000000..5bedb12
--- /dev/null
+++ b/LearnositySDKUnitTests/LearnositySDKUnitTests.csproj
@@ -0,0 +1,23 @@
+
+
+
+ netcoreapp2.0
+
+ false
+
+ LearnositySDKUnitTests
+
+ LearnositySDKUnitTests
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/UnitTestProject1/MergingObjectsUnitTests.cs b/LearnositySDKUnitTests/MergingObjectsUnitTests.cs
similarity index 99%
rename from UnitTestProject1/MergingObjectsUnitTests.cs
rename to LearnositySDKUnitTests/MergingObjectsUnitTests.cs
index bb8e809..2d3ae5d 100644
--- a/UnitTestProject1/MergingObjectsUnitTests.cs
+++ b/LearnositySDKUnitTests/MergingObjectsUnitTests.cs
@@ -3,7 +3,7 @@
using LearnositySDK.Utils;
using Newtonsoft.Json.Linq;
-namespace UnitTestProject1
+namespace LearnositySDKUnitTests
{
///
/// Summary description for MergingObjectsUnitTests
diff --git a/UnitTestProject1/ToolIsEmptyUnitTests.cs b/LearnositySDKUnitTests/ToolIsEmptyUnitTests.cs
similarity index 97%
rename from UnitTestProject1/ToolIsEmptyUnitTests.cs
rename to LearnositySDKUnitTests/ToolIsEmptyUnitTests.cs
index 1ccdc6e..2879385 100644
--- a/UnitTestProject1/ToolIsEmptyUnitTests.cs
+++ b/LearnositySDKUnitTests/ToolIsEmptyUnitTests.cs
@@ -5,7 +5,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using LearnositySDK.Utils;
-namespace UnitTestProject1
+namespace LearnositySDKUnitTests
{
///
/// Summary description for ToolIsEmptyUnitTests
diff --git a/UnitTestProject1/LearnositySDKUnitTests.csproj b/UnitTestProject1/LearnositySDKUnitTests.csproj
deleted file mode 100644
index 3809b86..0000000
--- a/UnitTestProject1/LearnositySDKUnitTests.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {1A1FFC7A-6BBA-4B37-8734-25A4AB46E0C2}
- Library
- Properties
- UnitTestProject1
- UnitTestProject1
- v4.5.2
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
-
-
-
- False
- ..\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {4a1f8be2-02a2-424d-ae33-11f742e18eed}
- LearnositySDK
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/UnitTestProject1/Properties/AssemblyInfo.cs b/UnitTestProject1/Properties/AssemblyInfo.cs
deleted file mode 100644
index 74562f4..0000000
--- a/UnitTestProject1/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("UnitTestProject1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UnitTestProject1")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[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("55ef8f41-ee3e-4ff0-b221-4bfa674126f0")]
-
-// 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")]