nickhodge · nickhodge · Jul 7, 2017 · Jul 6, 2017 · Jul 6, 2017
diff --git a/SharpSimpleNLG.sln b/SharpSimpleNLG.sln
@@ -1,22 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGTests", "SharpSimpleNLGTests\SharpSimpleNLGTests.csproj", "{D786FBFE-CFBC-4DDA-B408-60ADD0731B6C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsole", "SharpSimpleNLGConsole\SharpSimpleNLGConsole.csproj", "{3F729462-5264-49B1-8043-EAA050A2B3ED}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{B3B6ECC4-364C-462E-ACEB-EA8304C04F1F}"
 	ProjectSection(SolutionItems) = preProject
 		JavaToCsharpLearnings.md = JavaToCsharpLearnings.md
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGTests", "SharpSimpleNLGTests\SharpSimpleNLGTests.csproj", "{D786FBFE-CFBC-4DDA-B408-60ADD0731B6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsole", "SharpSimpleNLGConsole\SharpSimpleNLGConsole.csproj", "{3F729462-5264-49B1-8043-EAA050A2B3ED}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGDotNet45", "SharpSimpleNLGDotNet\SharpSimpleNLGDotNet45.csproj", "{FD418A41-A46E-4FD7-A6DB-FF3EBB4AFA29}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SharpSimpleNLG", "SharpSimpleNLG\SharpSimpleNLG.xproj", "{16F344A8-B688-4D95-8DA6-2E207D47AECB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSimpleNLG", "SharpSimpleNLG\SharpSimpleNLG.csproj", "{16F344A8-B688-4D95-8DA6-2E207D47AECB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsoleNetCore", "SharpSimpleNLGConsoleNetCore\SharpSimpleNLGConsoleNetCore.csproj", "{3E619416-20EC-429F-A467-9F7BFE8BACB1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -40,6 +42,10 @@ Global
 		{16F344A8-B688-4D95-8DA6-2E207D47AECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16F344A8-B688-4D95-8DA6-2E207D47AECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16F344A8-B688-4D95-8DA6-2E207D47AECB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E619416-20EC-429F-A467-9F7BFE8BACB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E619416-20EC-429F-A467-9F7BFE8BACB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E619416-20EC-429F-A467-9F7BFE8BACB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E619416-20EC-429F-A467-9F7BFE8BACB1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SharpSimpleNLG/SharpSimpleNLG.csproj b/SharpSimpleNLG/SharpSimpleNLG.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <TargetFrameworks>net462;netstandard1.6</TargetFrameworks>
+    <AssemblyName>SharpSimpleNLG</AssemblyName>
+    <PackageId>SharpSimpleNLG</PackageId>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
+    <OutputPath>bin\$(Configuration)\$(Framework)</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <DefineConstants>FULLNET</DefineConstants>
+    <OutputPath>bin\$(Configuration)\$(Framework)</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="lexicon\default-lexicon.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/SharpSimpleNLG/SharpSimpleNLG.xproj b/SharpSimpleNLG/SharpSimpleNLG.xproj
diff --git a/SharpSimpleNLG/project.json b/SharpSimpleNLG/project.json
diff --git a/SharpSimpleNLGConsole/App.config b/SharpSimpleNLGConsole/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/SharpSimpleNLGConsole/SharpSimpleNLGConsole.csproj b/SharpSimpleNLGConsole/SharpSimpleNLGConsole.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpSimpleNLGConsole</RootNamespace>
     <AssemblyName>SharpSimpleNLGConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/SharpSimpleNLGConsoleNetCore/Program.cs b/SharpSimpleNLGConsoleNetCore/Program.cs
@@ -0,0 +1,46 @@
+using SimpleNLG;
+using System;
+using System.Collections.Generic;
+
+namespace SharpSimpleNLGConsoleNetCore
+{
+    class Program
+    {
+        public static void Main(string[] args)
+        {
+            var ss = new XMLLexicon();
+            var Factory = new NLGFactory(ss);
+            var Realiser = new Realiser(ss);
+
+            // Instructions will be given to you by the director.
+
+            var verbp = Factory.createVerbPhrase("be given");
+            verbp.setFeature(Feature.TENSE.ToString(), Tense.FUTURE);
+            var subj = Factory.createNounPhrase("The Director");
+            var oobj = Factory.createNounPhrase("Instruction");
+            var ioobj = Factory.createNounPhrase("you");
+            subj.setPlural(false);
+            oobj.setPlural(true);
+
+            var s = new List<INLGElement>() { verbp, subj, oobj, ioobj };
+
+            var clause = Factory.createClause();
+
+            clause.setVerb(verbp);
+            clause.setSubject(subj);
+            clause.setObject(oobj);
+            clause.setIndirectObject(ioobj);
+
+
+            var sentence = Factory.createSentence(clause);
+            sentence.setFeature(Feature.TENSE.ToString(), Tense.FUTURE);
+
+            var active = Realiser.realise(sentence).ToString();
+
+            Console.WriteLine($"{active}");
+
+            Console.WriteLine("done");
+            Console.ReadLine();
+        }
+    }
+}
diff --git a/SharpSimpleNLGConsoleNetCore/SharpSimpleNLGConsoleNetCore.csproj b/SharpSimpleNLGConsoleNetCore/SharpSimpleNLGConsoleNetCore.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SharpSimpleNLG\SharpSimpleNLG.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SharpSimpleNLGDotNet/SharpSimpleNLGDotNet45.csproj b/SharpSimpleNLGDotNet/SharpSimpleNLGDotNet45.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpSimpleNLG</RootNamespace>
     <AssemblyName>SharpSimpleNLG</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj b/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj
@@ -8,14 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpSimpleNLGTests</RootNamespace>
     <AssemblyName>SharpSimpleNLGTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,21 +36,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.9.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions, Version=4.19.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.9.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FluentAssertions.Core, Version=4.19.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Shouldly, Version=2.7.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\packages\Shouldly.2.7.0\lib\net40\Shouldly.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Shouldly, Version=2.8.3.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
+      <HintPath>..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

diff --git a/SharpSimpleNLGTests/packages.config b/SharpSimpleNLGTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.9.0" targetFramework="net452" />
-  <package id="NUnit" version="3.2.1" targetFramework="net452" />
-  <package id="Shouldly" version="2.7.0" targetFramework="net452" />
+  <package id="FluentAssertions" version="4.19.3" targetFramework="net462" />
+  <package id="NUnit" version="3.7.1" targetFramework="net462" />
+  <package id="Shouldly" version="2.8.3" targetFramework="net462" />
 </packages>
diff --git a/UpgradeLog.htm b/UpgradeLog.htm