diff --git a/Antlr3.Runtime.Visualizer/Antlr3.Runtime.Visualizer.csproj b/Antlr3.Runtime.Visualizer/Antlr3.Runtime.Visualizer.csproj
index 969f36f..813ed8f 100644
--- a/Antlr3.Runtime.Visualizer/Antlr3.Runtime.Visualizer.csproj
+++ b/Antlr3.Runtime.Visualizer/Antlr3.Runtime.Visualizer.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net35-client</TargetFrameworks>
@@ -12,19 +12,8 @@
     <InformationalVersion>$(ANTLRInformationalVersion)</InformationalVersion>
   </PropertyGroup>
 
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'net35-client'">
-      <PropertyGroup>
-        <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
-        <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-        <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
   <PropertyGroup>
-    <!-- Workaround for lack of XAML support in the new project system -->
-    <LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
@@ -84,11 +73,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Include="BaseTreeVisualizerViewControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Antlr4.StringTemplate.Visualizer/Antlr4.StringTemplate.Visualizer.csproj b/Antlr4.StringTemplate.Visualizer/Antlr4.StringTemplate.Visualizer.csproj
index 6f08c16..1c20e52 100644
--- a/Antlr4.StringTemplate.Visualizer/Antlr4.StringTemplate.Visualizer.csproj
+++ b/Antlr4.StringTemplate.Visualizer/Antlr4.StringTemplate.Visualizer.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net35-client;net40-client</TargetFrameworks>
@@ -30,30 +30,8 @@
     </PropertyGroup>
   </Target>
 
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'net35-client'">
-      <PropertyGroup>
-        <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
-        <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-        <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(TargetFramework)' == 'net40-client'">
-      <PropertyGroup>
-        <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
-        <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-        <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System.Xaml" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
   <PropertyGroup>
-    <!-- Workaround for lack of XAML support in the new project system -->
-    <LanguageTargets Condition="Exists('$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets')">$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
@@ -101,15 +79,4 @@
     <None Include="Resources\Templates\AttributeRendererTemplates.stg" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Include="TemplateVisualizerFrame.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TemplateVisualizerWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj b/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj
index ec781b8..3fc561a 100644
--- a/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj
+++ b/Antlr4.StringTemplate/Antlr4.StringTemplate.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net35-client;net40-client;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net35-client;net40-client;netstandard1.3;netstandard2.0</TargetFrameworks>
 
     <Description>The C# port of StringTemplate 4.</Description>
     <Version>$(STVersion)</Version>
diff --git a/Antlr4.StringTemplate/Debug/AddAttributeEvent.cs b/Antlr4.StringTemplate/Debug/AddAttributeEvent.cs
index 31663ff..a643ce9 100644
--- a/Antlr4.StringTemplate/Debug/AddAttributeEvent.cs
+++ b/Antlr4.StringTemplate/Debug/AddAttributeEvent.cs
@@ -64,7 +64,7 @@ public override string ToString()
             return "addEvent{" +
                 ", name='" + name + '\'' +
                 ", value=" + value +
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
                 ", location=" + GetFileName() + ":" + GetLine() +
 #endif
                 '}';
diff --git a/Antlr4.StringTemplate/Debug/ConstructionEvent.cs b/Antlr4.StringTemplate/Debug/ConstructionEvent.cs
index 30acbca..c4623c7 100644
--- a/Antlr4.StringTemplate/Debug/ConstructionEvent.cs
+++ b/Antlr4.StringTemplate/Debug/ConstructionEvent.cs
@@ -32,25 +32,25 @@
 
 namespace Antlr4.StringTemplate.Debug
 {
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
     using System.Diagnostics;
 #endif
 
     /** An event that happens when building Template trees, adding attributes etc... */
     public class ConstructionEvent
     {
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
         private readonly StackTrace stack;
 #endif
 
         public ConstructionEvent()
         {
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
             stack = new StackTrace(true);
 #endif
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
         public virtual string GetFileName()
         {
             return GetTemplateEntryPoint().GetFileName();
diff --git a/Antlr4.StringTemplate/Extensions/ExceptionExtensions.cs b/Antlr4.StringTemplate/Extensions/ExceptionExtensions.cs
index 64c6427..829ae69 100644
--- a/Antlr4.StringTemplate/Extensions/ExceptionExtensions.cs
+++ b/Antlr4.StringTemplate/Extensions/ExceptionExtensions.cs
@@ -33,14 +33,14 @@
 namespace Antlr4.StringTemplate.Extensions
 {
     using System;
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
     using BindingFlags = System.Reflection.BindingFlags;
     using MethodInfo = System.Reflection.MethodInfo;
 #endif
 
     public static class ExceptionExtensions
     {
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
         private static readonly Action<Exception> _internalPreserveStackTrace = GetInternalPreserveStackTraceDelegate();
 
         private static Action<Exception> GetInternalPreserveStackTraceDelegate()
@@ -62,7 +62,7 @@ public static bool IsCritical(this Exception e)
                 return true;
             }
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
             switch (e.GetType().FullName)
             {
             case "System.AccessViolationException":
@@ -90,7 +90,7 @@ public static bool IsCritical(this Exception e)
 
         public static void PreserveStackTrace(this Exception e)
         {
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
             if (_internalPreserveStackTrace != null)
                 _internalPreserveStackTrace(e);
 #endif
diff --git a/Antlr4.StringTemplate/Extensions/PropertyInfoExtensions.cs b/Antlr4.StringTemplate/Extensions/PropertyInfoExtensions.cs
index 9d11c07..d2c6cfd 100644
--- a/Antlr4.StringTemplate/Extensions/PropertyInfoExtensions.cs
+++ b/Antlr4.StringTemplate/Extensions/PropertyInfoExtensions.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD1_3
 
 namespace Antlr4.StringTemplate.Extensions
 {
diff --git a/Antlr4.StringTemplate/Extensions/TypeExtensions.cs b/Antlr4.StringTemplate/Extensions/TypeExtensions.cs
index 9def018..6183672 100644
--- a/Antlr4.StringTemplate/Extensions/TypeExtensions.cs
+++ b/Antlr4.StringTemplate/Extensions/TypeExtensions.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD1_3
 
 namespace Antlr4.StringTemplate.Extensions
 {
diff --git a/Antlr4.StringTemplate/StringRenderer.cs b/Antlr4.StringTemplate/StringRenderer.cs
index f02d870..0e10bd7 100644
--- a/Antlr4.StringTemplate/StringRenderer.cs
+++ b/Antlr4.StringTemplate/StringRenderer.cs
@@ -35,7 +35,7 @@ namespace Antlr4.StringTemplate
     using CultureInfo = System.Globalization.CultureInfo;
     using Encoding = System.Text.Encoding;
     using HttpUtility = Antlr4.StringTemplate.Misc.HttpUtility;
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
     using SecurityElement = System.Security.SecurityElement;
 #endif
 
@@ -65,7 +65,7 @@ public virtual string ToString(object o, string formatString, CultureInfo cultur
 
             if (formatString.Equals("xml-encode"))
             {
-#if NETSTANDARD
+#if NETSTANDARD1_3
                 return s.Replace("&", "&amp;")
                     .Replace("<", "&lt;")
                     .Replace(">", "&gt;")
diff --git a/Runtime/Antlr3.Runtime/ANTLRFileStream.cs b/Runtime/Antlr3.Runtime/ANTLRFileStream.cs
index 6f09208..0474b69 100644
--- a/Runtime/Antlr3.Runtime/ANTLRFileStream.cs
+++ b/Runtime/Antlr3.Runtime/ANTLRFileStream.cs
@@ -46,7 +46,9 @@ namespace Antlr.Runtime
      *  </summary>
      */
     [System.Serializable]
+#if !NETSTANDARD
     [System.Security.Permissions.FileIOPermission(System.Security.Permissions.SecurityAction.Demand, Unrestricted = true)]
+#endif
     public class ANTLRFileStream : ANTLRStringStream
     {
         protected string fileName;
diff --git a/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj b/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj
index b0bff0a..cef9c32 100644
--- a/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj
+++ b/Runtime/Antlr3.Runtime/Antlr3.Runtime.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net20;net40-client;portable-net40+sl5+win8+wp8+wpa81;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net20;net40-client;portable-net40+sl5+win8+wp8+wpa81;netstandard1.1;netstandard2.0</TargetFrameworks>
     <RootNamespace>Antlr.Runtime</RootNamespace>
 
     <Description>The runtime library for parsers generated by the C# target of ANTLR 3. This package supports projects targeting .NET 2.0 or newer, and built using Visual Studio 2008 or newer.</Description>
diff --git a/Runtime/Antlr3.Runtime/System/OnSerializingAttribute.cs b/Runtime/Antlr3.Runtime/System/OnSerializingAttribute.cs
index e6a913c..7af598b 100644
--- a/Runtime/Antlr3.Runtime/System/OnSerializingAttribute.cs
+++ b/Runtime/Antlr3.Runtime/System/OnSerializingAttribute.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD1_1
 
 namespace System.Runtime.Serialization
 {
diff --git a/Runtime/Antlr3.Runtime/System/StreamingContext.cs b/Runtime/Antlr3.Runtime/System/StreamingContext.cs
index 8bb3234..2d3891a 100644
--- a/Runtime/Antlr3.Runtime/System/StreamingContext.cs
+++ b/Runtime/Antlr3.Runtime/System/StreamingContext.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD1_1
 
 namespace System.Runtime.Serialization
 {
diff --git a/global.json b/global.json
index 2b02857..7dcd35a 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.6.55"
+    "MSBuild.Sdk.Extras": "2.0.54"
   }
 }