diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.Portable.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.Portable.csproj
index abcc076b4..32bc1111d 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.Portable.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.Portable.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\Portable\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,6 +73,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.Portable.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -90,13 +96,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj
index d6e680bda..afc9f4a5d 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\v2.0\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,6 +72,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.v2.0.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -89,13 +95,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj
index 9af288655..14d7ea9e7 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\v3.0\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,6 +72,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.v3.0.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -89,13 +95,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj
index d844311a0..218161c53 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\v3.5\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,6 +72,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.v3.5.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -89,13 +95,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj
index 917f4b034..49eb9547d 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\v4.0\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,6 +73,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.v4.0.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -90,13 +96,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj
index f144b690f..4196f94bb 100644
--- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj
+++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <BaseIntermediateOutputPath>obj\v4.5\</BaseIntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,6 +73,9 @@
     <EmbeddedResource Include="Java.g4" />
     <Antlr4 Include="Java.g4" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.Antlr4.Runtime.Test.v4.5.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -90,13 +96,16 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <!-- Folder containing Antlr4BuildTasks.dll -->
-    <Antlr4BuildTaskPath>$(ProjectDir)..\build</Antlr4BuildTaskPath>
-    <!-- Path to the ANTLR Tool itself. -->
-    <Antlr4ToolPath>$(ProjectDir)..\build\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolPath>
-  </PropertyGroup>
-  <Import Project="$(ProjectDir)..\build\Antlr4.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.props'))" />
+    <Error Condition="!Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets'))" />
+  </Target>
+  <Import Project="..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.1.0-alpha003\build\Antlr4.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.
   <Target Name="BeforeBuild">
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.Portable.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.Portable.config
new file mode 100644
index 000000000..6b942d6d8
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.Portable.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="portable-net40" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="portable-net40" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config
new file mode 100644
index 000000000..70ad41a9b
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="net20" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="net20" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config
new file mode 100644
index 000000000..1c9f395e1
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="net30" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="net30" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config
new file mode 100644
index 000000000..e92bc7912
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="net35" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="net35" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config
new file mode 100644
index 000000000..064ff33e1
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="net40" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config
new file mode 100644
index 000000000..d4a90487f
--- /dev/null
+++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Antlr4" version="4.1.0-alpha003" targetFramework="net45" />
+  <package id="Antlr4.Runtime" version="4.1.0-alpha003" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/runtime/CSharp/build/Antlr4.targets b/runtime/CSharp/build/Antlr4.targets
deleted file mode 100644
index 0a5ab447c..000000000
--- a/runtime/CSharp/build/Antlr4.targets
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-   [The "BSD licence"]
-   Copyright (c) 2013 Sam Harwell
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-   IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <BuildSystem>MSBuild</BuildSystem>
-    <TaskVersion>4.0.0.0</TaskVersion>
-    <TaskKeyToken>eb42632606e9261f</TaskKeyToken>
-    <Antlr4BuildTaskAssemblyName Condition="'$(Antlr4BuildTaskAssemblyName)'==''">Antlr4BuildTasks, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken)</Antlr4BuildTaskAssemblyName>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <LoadTimeSensitiveTargets>
-      $(LoadTimeSensitiveTargets);
-      Antlr4Compile;
-    </LoadTimeSensitiveTargets>
-    <LoadTimeSensitiveProperties>
-      $(LoadTimeSensitiveProperties);
-      Antlr4CompileDependsOn;
-    </LoadTimeSensitiveProperties>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'==''">$(MSBuildBinPath)</Antlr4BuildTaskLocation>
-    <Antlr4BuildTaskLocation Condition="'$(Antlr4BuildTaskPath)'!=''">$(Antlr4BuildTaskPath)</Antlr4BuildTaskLocation>
-    <Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'==''">$(MSBuildBinPath)\Antlr4\antlr4-csharp-4.0.1-SNAPSHOT-complete.jar</Antlr4ToolLocation>
-    <Antlr4ToolLocation Condition="'$(Antlr4ToolPath)'!=''">$(Antlr4ToolPath)</Antlr4ToolLocation>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Antlr4GenCodeFileNames Condition="'$(Antlr4GenCodeFileNames)'==''">$(MSBuildProjectFile).Antlr4GeneratedCodeFileListAbsolute.txt</Antlr4GenCodeFileNames>
-  </PropertyGroup>
-
-  <UsingTask Condition="'$(Antlr4BuildTaskPath)'==''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyName="$(Antlr4BuildTaskAssemblyName)" />
-  <UsingTask Condition="'$(Antlr4BuildTaskPath)'!=''" TaskName="Antlr4.Build.Tasks.Antlr4ClassGenerationTask" AssemblyFile="$(Antlr4BuildTaskPath)\Antlr4BuildTasks.dll" />
-
-  <PropertyGroup>
-    <PrepareResourcesDependsOn>
-      Antlr4Compile;
-      Antlr4CompileAddFilesGenerated;
-      $(PrepareResourcesDependsOn)
-    </PrepareResourcesDependsOn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Antlr4CompileDependsOn>
-      Antlr4CompileReadGeneratedFileList
-    </Antlr4CompileDependsOn>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(BuildingInsideVisualStudio)'=='true'">
-    <AvailableItemName Include="Antlr4" />
-    <AvailableItemName Include="Antlr4Tokens" />
-    <AvailableItemName Include="Antlr4AbstractGrammar" />
-  </ItemGroup>
-
-  <ItemDefinitionGroup>
-    <Antlr4>
-      <Generator>MSBuild:Compile</Generator>
-      <CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
-      <TargetLanguage>CSharp</TargetLanguage>
-      <Listener>true</Listener>
-      <Visitor>true</Visitor>
-      <Abstract>false</Abstract>
-      <ForceAtn>false</ForceAtn>
-    </Antlr4>
-  </ItemDefinitionGroup>
-
-  <Target Name="Antlr4CompileReadGeneratedFileList">
-    <ReadLinesFromFile File="$(IntermediateOutputPath)$(Antlr4GenCodeFileNames)">
-      <Output TaskParameter="Lines" ItemName="Antlr4OutputCodeFilesList"/>
-    </ReadLinesFromFile>
-  </Target>
-
-  <PropertyGroup>
-    <!-- Add grammar compilation to the CoreCompileDependsOn so that the IDE inproc compilers (particularly VB)
-         can "see" the generated source files. -->
-    <CoreCompileDependsOn Condition="'$(BuildingInsideVisualStudio)' == 'true' ">
-      DesignTimeGrammarCompilation;
-      $(CoreCompileDependsOn)
-    </CoreCompileDependsOn>
-  </PropertyGroup>
-
-  <Target Name="DesignTimeGrammarCompilation">
-    <!-- Only if we are not actually performing a compile i.e. we are in design mode -->
-    <CallTarget Condition="'$(BuildingProject)' != 'true'"
-                Targets="Antlr4Compile" />
-  </Target>
-
-  <Target Name="Antlr4Compile"
-          DependsOnTargets="$(Antlr4CompileDependsOn)"
-          Condition="'@(Antlr4)' != ''"
-          Inputs="@(Antlr4);@(Antlr4Tokens);@(Antlr4AbstractGrammar)"
-          Outputs="@(Antlr4OutputCodeFilesList);
-                  $(IntermediateOutputPath)$(Antlr4GenCodeFileNames);">
-
-    <ItemGroup>
-      <Antlr4GeneratedCodeFiles Remove="@(Antlr4GeneratedCodeFiles)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_IntellisenseOnlyCompile>false</_IntellisenseOnlyCompile>
-      <_IntellisenseOnlyCompile Condition="'$(BuildingProject)' != 'true'">true</_IntellisenseOnlyCompile>
-    </PropertyGroup>
-    <Antlr4ClassGenerationTask
-      ToolPath="$(Antlr4ToolLocation)"
-      BuildTaskPath="$(Antlr4BuildTaskLocation)"
-      OutputPath="$(IntermediateOutputPath)"
-      TargetLanguage="%(Antlr4.TargetLanguage)"
-      TargetFrameworkVersion="$(TargetFrameworkVersion)"
-      TargetNamespace="%(Antlr4.CustomToolNamespace)"
-      SourceCodeFiles="@(Antlr4)"
-      ContinueOnError="$(_IntellisenseOnlyCompile)"
-      TokensFiles="@(Antlr4Tokens)"
-      AbstractGrammarFiles="@(Antlr4AbstractGrammar)"
-      LanguageSourceExtensions="$(DefaultLanguageSourceExtension)"
-      GenerateListener="%(Antlr4.Listener)"
-      GenerateVisitor="%(Antlr4.Visitor)"
-      ForceAtn="%(Antlr4.ForceAtn)"
-      AbstractGrammar="%(Antlr4.Abstract)">
-
-      <Output ItemName="Antlr4GeneratedCodeFiles" TaskParameter="GeneratedCodeFiles" />
-    </Antlr4ClassGenerationTask>
-
-    <WriteLinesToFile
-      Condition="'$(_IntellisenseOnlyCompile)' != 'true'"
-      File="$(IntermediateOutputPath)$(Antlr4GenCodeFileNames)"
-      Lines="@(Antlr4GeneratedCodeFiles)"
-      Overwrite="true"/>
-  </Target>
-
-  <Target Name="Antlr4CompileAddFilesGenerated"
-          AfterTargets="Antlr4Compile"
-          Condition="'@(Antlr4)' != ''">
-
-    <ItemGroup>
-      <Antlr4GeneratedCodeFiles Condition="'@(Antlr4GeneratedCodeFiles)' == ''" Include="@(Antlr4OutputCodeFilesList)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <FileWrites Include="@(Antlr4GeneratedCodeFiles);
-                           $(IntermediateOutputPath)$(Antlr4GenCodeFileNames);" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Include="@(Antlr4GeneratedCodeFiles)" />
-      <!-- The WinFX "GenerateTemporaryTargetAssembly" target requires generated code files be added here. -->
-      <_GeneratedCodeFiles Include="@(Antlr4GeneratedCodeFiles)" />
-    </ItemGroup>
-
-  </Target>
-</Project>
diff --git a/runtime/CSharp/build/Antlr4BuildTasks.dll b/runtime/CSharp/build/Antlr4BuildTasks.dll
deleted file mode 100644
index 613ed605e..000000000
Binary files a/runtime/CSharp/build/Antlr4BuildTasks.dll and /dev/null differ
diff --git a/runtime/CSharp/build/antlr4-csharp-4.0.1-SNAPSHOT-complete.jar b/runtime/CSharp/build/antlr4-csharp-4.0.1-SNAPSHOT-complete.jar
deleted file mode 100644
index 0a349602c..000000000
Binary files a/runtime/CSharp/build/antlr4-csharp-4.0.1-SNAPSHOT-complete.jar and /dev/null differ