diff --git a/GPPG.csproj b/GPPG.csproj
index 91c896e..14f1ade 100644
--- a/GPPG.csproj
+++ b/GPPG.csproj
@@ -1,121 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AF1F8BCF-34FC-4A5E-9D45-BCC6031720BC}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>Gppg</AssemblyName>
-    <RootNamespace>QUT.Gppg</RootNamespace>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>.\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="GPPGcopyright.rtf" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ParserGenerator\CharUtils.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\CodeGenerator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\ErrorHandler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\GplexBuffers.cs" />
-    <Compile Include="ParserGenerator\Grammar.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\LALRGenerator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\ListUtilities.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\LR0Generator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Main.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\ParseHelper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Parser.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\ParserAction.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Precedence.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Production.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\ProductionItem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\scanaction.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\scanhelper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Scanner.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\SemanticAction.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Set.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\State.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Symbol.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ParserGenerator\Transition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ShiftReduceParser\ShiftReduceParserCode.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <ProjectExtensions>
-    <VisualStudio AllowExistingFolder="true" />
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net20;netcoreapp2.0</TargetFrameworks>
+    <AssemblyName>Gppg</AssemblyName>
+    <RootNamespace>QUT.Gppg</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <!-- Pack settings -->
+  <PropertyGroup>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NuspecFile>MSBuild/Gppg.nuspec</NuspecFile>
+    <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
+    <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
+    <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
+  </PropertyGroup>
+  
+  <!-- Executes /t:Publish for all target frameworks before packing -->
+  <Target Name="NugetCrossTarget" AfterTargets="Build" Condition="'$(TargetFrameworks)' != ''">
+    <ItemGroup>
+      <_TargetFramework Include="$(TargetFrameworks)" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
+  </Target>
+
+  <Target Name="NugetSingleTarget" AfterTargets="Build" Condition="'$(TargetFrameworks)' == ''">
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" />
+  </Target>
+
+  <ItemGroup>
+    <GplexFile Include="ParserGenerator\SpecFiles\ScanAction.lex">
+      <OutputFile>ScanAction.cs</OutputFile>
+    </GplexFile>
+    <GplexFile Include="ParserGenerator\SpecFiles\gppg.lex">
+      <OutputFile>Scanner.cs</OutputFile>
+    </GplexFile>
+    <GppgFile Include="ParserGenerator\SpecFiles\gppg.y">
+      <OutputFile>Parser.cs</OutputFile>
+      <Arguments>/gplex /nolines</Arguments>
+    </GppgFile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Gplex.Tool" Version="0.0.1-preview1" PrivateAssets="All" />
+    <PackageReference Include="Gppg.Tool" Version="0.0.1-preview1" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/MSBuild/Gppg.nuspec b/MSBuild/Gppg.nuspec
new file mode 100644
index 0000000..bec12af
--- /dev/null
+++ b/MSBuild/Gppg.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>Gppg.Tool</id>
+    <version>0.0.1-preview1</version>
+    <authors>GPPG developers</authors>
+    <description>Gardens Point Parser Generator (GPPG) binary and MSBuild targets for SDK-style projects</description>
+  </metadata>
+  <files>
+    <!-- Placeholders indicating host project compatibility. The tools can be used in any .NET Framework and .NET Standard projects -->
+    <file src="_._" target="lib/netstandard1.0/" />
+    <file src="_._" target="lib/net20/" />
+
+    <!-- Framework specific target that runs the real run target below on single target builds -->
+    <file src="build/Gppg.Tool.targets" target="build/netstandard1.0/Gppg.Tool.targets" />
+    <file src="build/Gppg.Tool.targets" target="build/net20/Gppg.Tool.targets" />
+
+    <!-- Outer build target that runs the real run target below once on cross targeting builds -->
+    <file src="buildCrossTargeting\Gppg.Tool.targets" target="buildCrossTargeting/Gppg.Tool.targets" />
+
+    <!-- The target that actually runs the custom tool -->
+    <file src="RunGppg.targets" target="tools" />
+
+    <!-- The tool binaries. Note that the net20 binaries are included purely for distribution, they are not used by the build targets -->
+    <file src="$publishdir$\net20\**\*" target="tools/net20/" />
+    <file src="$publishdir$\netcoreapp2.0\**\*" target="tools/netcoreapp2.0/" />
+
+    <file src="..\GPPGcopyright.rtf" target="tools/netcoreapp2.0/" />
+    <file src="..\GPPGcopyright.rtf" target="tools/net20/" />
+  </files>
+</package>
diff --git a/MSBuild/RunGppg.targets b/MSBuild/RunGppg.targets
new file mode 100644
index 0000000..4f5b867
--- /dev/null
+++ b/MSBuild/RunGppg.targets
@@ -0,0 +1,40 @@
+<Project>
+  <PropertyGroup>
+    <_GppgTool>dotnet "$(MSBuildThisFileDirectory)/netcoreapp2.0/Gppg.dll"</_GppgTool>
+  </PropertyGroup>
+
+  <!-- Defaults for GppgFile items -->
+  <ItemDefinitionGroup>
+    <GppgFile>
+      <OutputFile>%(Identity).cs</OutputFile>
+      <Arguments></Arguments>
+    </GppgFile>
+  </ItemDefinitionGroup>
+
+  <!-- Run once from outer build in cross targeting projects. Imported and called from crossTargetingBuild/*.targets -->
+  <Target Name="GppgToolCrossTarget" BeforeTargets="DispatchToInnerBuilds" Condition="'$(IsCrossTargetingBuild)' != ''" Inputs="@(GppgFile)" Outputs="@(GppgFile->'%(OutputFile)')">
+    <CallTarget Targets="GppgTool" />
+  </Target>
+
+  <!-- Run once in single targeting projects. Imported and called from build/[framework]/*.targets -->
+  <!-- Don't run in VS design time builds. Otherwise VS compiles eagerly and discards the output -->
+  <Target Name="GppgToolSingleTarget" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' == '' AND '$(IsCrossTargetingBuild)' == ''" Inputs="@(GppgFile)" Outputs="@(GppgFile->'%(OutputFile)')">
+    <CallTarget Targets="GppgTool" />
+  </Target>
+
+  <Target Name="GppgTool" >
+    <Exec Command="$(_GppgTool) %(GppgFile.Arguments) /out:&quot;./%(GppgFile.OutputFile)&quot; %(GppgFile.Identity)" />
+
+    <!-- Ensure the generated files are included in the build. Otherwise first build fails because the source files are collected already -->
+    <ItemGroup>
+      <Compile Remove="@(GppgFile->'%(OutputFile)')" />
+      <Compile Include="@(GppgFile->'%(OutputFile)')" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Make it work with VS' FastUpToDateCheck -->
+  <ItemGroup>
+    <UpToDateCheckInput Include="@(GppgFile)" />
+  </ItemGroup>
+
+</Project>
diff --git a/MSBuild/_._ b/MSBuild/_._
new file mode 100644
index 0000000..e69de29
diff --git a/MSBuild/build/Gppg.Tool.targets b/MSBuild/build/Gppg.Tool.targets
new file mode 100644
index 0000000..243ba6b
--- /dev/null
+++ b/MSBuild/build/Gppg.Tool.targets
@@ -0,0 +1,4 @@
+<!-- CustomTool.targets -->
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)/../../tools/RunGppg.targets" />
+</Project>
diff --git a/MSBuild/buildCrossTargeting/Gppg.Tool.targets b/MSBuild/buildCrossTargeting/Gppg.Tool.targets
new file mode 100644
index 0000000..4cf501b
--- /dev/null
+++ b/MSBuild/buildCrossTargeting/Gppg.Tool.targets
@@ -0,0 +1,4 @@
+<!-- CustomTool.targets -->
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)/../tools/RunGppg.targets" />
+</Project>
diff --git a/ParserGenerator/SpecFiles/GenerateAll.bat b/ParserGenerator/SpecFiles/GenerateAll.bat
deleted file mode 100644
index 14ae62d..0000000
--- a/ParserGenerator/SpecFiles/GenerateAll.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-
-REM generate a fresh copy of parser.cs
-gppg /gplex /nolines gppg.y
-move parser.cs ..
-
-REM generate a fresh copy of Scanner.cs
-gplex gppg.lex
-move Scanner.cs ..
-
-REM generate a fresh copy of ScanAction.cs
-gplex ScanAction.lex
-move ScanAction.cs ..
-
-if not exist GplexBuffers.cs goto finish
-move GplexBuffers.cs ..
-
-:finish
-REM Ended
-