Completed .NET Core integration

.gitignore

@@ -10,4 +10,5 @@ Debug*
 *.aps
 .vs
 *.VC*
-packages
+packages
+obj

LsapiSharp/LsapiSharp.csproj

@@ -59,13 +59,22 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>LsapiSharp.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NativeMethods.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="LsapiSharp.pfx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

LsapiSharpCore/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyDescription(".NET Core Interop for Litestep")]
+[assembly: AssemblyCopyright("Copyright © 2016 LiteStep Development Team")]
+[assembly: ComVisible(false)]

LsapiSharpCore/LsapiSharpCore.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>LsapiSharp</RootNamespace>
+    <Version>1.0.0.0</Version>
+    <Authors>Donelle Sanders Jr</Authors>
+    <PackageTags>Lsapi , LsapiSharp-Core, Litestep</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/lsdev/LiteStep/master/litestep/litestep.bmp</PackageIconUrl>
+    <RepositoryUrl>"https://github.com/Donelle/LiteStep.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>http://www.lsdev.org</PackageProjectUrl>
+    <PackageLicenseUrl>ttps://github.com/Donelle/LiteStep/blob/master/docs/0.24.7/license.txt</PackageLicenseUrl>
+    <PackageReleaseNotes>Version 1.0.0.0</PackageReleaseNotes>
+    <Product>LsapiSharp Core</Product>
+    <Company />
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>LsapiSharp.snk</AssemblyOriginatorKeyFile>
+    <Platforms>AnyCPU;x86;x64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>bin\Debug\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\LsapiSharp\NativeMethods.cs" />
+  </ItemGroup>
+</Project>

README.md

@@ -13,14 +13,22 @@ Please refer to the official [installation guide](http://litestep.info/overview/
 
 As mentioned above this version of Litestep is focused on the .NET Framework and the following are descriptions of the configurations that should be present in the `step.rc` in order to use .NET.
 
-    ; Set the version of the .NET Runtime that Litestep will use to load modules
+    ; Set the version of the .NET Runtime that Litestep will use to load modules. This version represents
+    ; the actual folder name on the file system located in %WINDIR%\Microsoft.NET\Framework64
     ; If the setting is omitted the default runtime is v2.0.50727
     LSCLRVersion v4.0.30319 
 
     ; Loading modules are the same as described in the Litestep manual
     ; To load a module built using the .NET Framework append the "clr" token after the module path 
     LoadModule $LiteStepDir$HelloCLR.dll clr
-
+
+    ; OR to set the version of the .NET Core Runtime. This version represents
+    ; the actual folder name on the file system located in %PROGRAMFILES%\dotnet\shared\Microsoft.NETCore.App
+    LSCLRVersion 2.0.0
+
+    ; Loading modules are the same as described in the Litestep manual
+    ; To load a module built using the .NET Framework append the "coreclr" token after the module path 
+    LoadModule $LiteStepDir$HelloCoreCLR.dll coreclr
 
 #### .NET Module
 

litestep.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2026
 MinimumVisualStudioVersion = 14.0.22310.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "litestep", "litestep\litestep.vcxproj", "{994556EE-2F21-4811-A85D-6925F7F84B0D}"
 EndProject
@@ -111,6 +111,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DEC29FCD-9
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LsapiSharp", "LsapiSharp\LsapiSharp.csproj", "{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA} = {2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LsapiSharp.Test", "LsapiSharp.Test\LsapiSharp.Test.csproj", "{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -119,70 +122,113 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LsapiSharp.Test", "LsapiSha
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLR", "CLR", "{757E055D-EC8C-4038-B2F3-E6C978057563}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LsapiSharpCore", "LsapiSharpCore\LsapiSharpCore.csproj", "{038BF1B5-7B36-4A20-8F10-E8F427A0C561}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA} = {2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|Win32.Build.0 = Debug|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|x64.ActiveCfg = Debug|x64
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|x64.Build.0 = Debug|x64
+		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|x86.ActiveCfg = Debug|Win32
+		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Debug|x86.Build.0 = Debug|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|Win32.ActiveCfg = Release|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|Win32.Build.0 = Release|Win32
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|x64.ActiveCfg = Release|x64
 		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|x64.Build.0 = Release|x64
+		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|x86.ActiveCfg = Release|Win32
+		{994556EE-2F21-4811-A85D-6925F7F84B0D}.Release|x86.Build.0 = Release|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|Win32.Build.0 = Debug|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|x64.ActiveCfg = Debug|x64
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|x64.Build.0 = Debug|x64
+		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|x86.ActiveCfg = Debug|Win32
+		{2213036F-018C-416A-8A6A-7934C936CFFC}.Debug|x86.Build.0 = Debug|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|Win32.ActiveCfg = Release|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|Win32.Build.0 = Release|Win32
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|x64.ActiveCfg = Release|x64
 		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|x64.Build.0 = Release|x64
+		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|x86.ActiveCfg = Release|Win32
+		{2213036F-018C-416A-8A6A-7934C936CFFC}.Release|x86.Build.0 = Release|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|Win32.Build.0 = Debug|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|x64.ActiveCfg = Debug|x64
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|x64.Build.0 = Debug|x64
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|x86.ActiveCfg = Debug|Win32
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Debug|x86.Build.0 = Debug|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|Win32.ActiveCfg = Release|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|Win32.Build.0 = Release|Win32
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|x64.ActiveCfg = Release|x64
 		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|x64.Build.0 = Release|x64
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|x86.ActiveCfg = Release|Win32
+		{2FECA0A4-CB2F-44CA-97AB-DE78EBBDECFA}.Release|x86.Build.0 = Release|Win32
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|Win32.ActiveCfg = Debug|x86
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|Win32.Build.0 = Debug|x86
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|x64.ActiveCfg = Debug|x64
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|x64.Build.0 = Debug|x64
+		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|x86.ActiveCfg = Debug|x86
+		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Debug|x86.Build.0 = Debug|x86
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|Win32.ActiveCfg = Release|x86
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|Win32.Build.0 = Release|x86
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|x64.ActiveCfg = Release|x64
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|x64.Build.0 = Release|x64
+		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|x86.ActiveCfg = Release|x86
+		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A}.Release|x86.Build.0 = Release|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|Win32.ActiveCfg = Debug|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|Win32.Build.0 = Debug|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|x64.ActiveCfg = Debug|x64
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|x64.Build.0 = Debug|x64
+		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|x86.ActiveCfg = Debug|x86
+		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Debug|x86.Build.0 = Debug|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|Any CPU.Build.0 = Release|Any CPU
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|Win32.ActiveCfg = Release|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|Win32.Build.0 = Release|x86
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|x64.ActiveCfg = Release|x64
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|x64.Build.0 = Release|x64
+		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|x86.ActiveCfg = Release|x86
+		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527}.Release|x86.Build.0 = Release|x86
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|Win32.Build.0 = Debug|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|x64.ActiveCfg = Debug|x64
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|x64.Build.0 = Debug|x64
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|x86.ActiveCfg = Debug|x86
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Debug|x86.Build.0 = Debug|x86
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|Any CPU.Build.0 = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|Win32.ActiveCfg = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|Win32.Build.0 = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|x64.ActiveCfg = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|x64.Build.0 = Release|Any CPU
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|x86.ActiveCfg = Release|x86
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -191,5 +237,9 @@ Global
 		{DEC29FCD-986F-4AAB-A697-AE091EFEF71A} = {0CB7B995-8934-4494-8EB9-968D5407C6E5}
 		{7F8140DC-7815-4368-94F8-A7ED7CF04A2A} = {757E055D-EC8C-4038-B2F3-E6C978057563}
 		{580B3CBE-9E12-41A2-B723-6CE9BBCB7527} = {757E055D-EC8C-4038-B2F3-E6C978057563}
+		{038BF1B5-7B36-4A20-8F10-E8F427A0C561} = {757E055D-EC8C-4038-B2F3-E6C978057563}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {443E0FE0-A28C-4AD6-A341-1B587E63BA20}
 	EndGlobalSection
 EndGlobal