From 77949bc0afb3bff68a145d88d83b17ea5776168a Mon Sep 17 00:00:00 2001
From: Arvind Shyamsundar <arvindsh@microsoft.com>
Date: Sat, 9 May 2020 21:32:54 -0700
Subject: [PATCH] Update to current DacFx + misc. cleanup

---
 .gitignore                                    | 11 ++++
 1_BasicUsage/1_BasicUsage.csproj              | 47 ++++++++++-----
 1_BasicUsage/Program.cs                       | 32 ++++------
 1_BasicUsage/app.config                       |  3 +
 1_BasicUsage/packages.config                  |  4 ++
 2_VisitorPattern/2_VisitorPattern.csproj      | 54 +++++++++++------
 2_VisitorPattern/Program.cs                   | 41 +++++++------
 2_VisitorPattern/app.config                   |  3 +
 2_VisitorPattern/packages.config              |  4 ++
 2_VisitorPattern/solution.txt                 |  6 --
 3_ScriptTokens/3_ScriptTokens.csproj          | 47 ++++++++++-----
 3_ScriptTokens/Program.cs                     | 33 +++++------
 3_ScriptTokens/app.config                     |  3 +
 3_ScriptTokens/packages.config                |  4 ++
 4_TSQLValidation/4_TSQLValidation.csproj      | 58 +++++++++++++------
 4_TSQLValidation/Form1.cs                     | 54 ++++++++---------
 4_TSQLValidation/Program.cs                   |  6 +-
 .../Properties/Resources.Designer.cs          | 46 ++++++---------
 .../Properties/Settings.Designer.cs           | 24 ++++----
 4_TSQLValidation/app.config                   |  3 +
 4_TSQLValidation/packages.config              |  4 ++
 5_TSQLFormatter/5_TSQLFormatter.csproj        | 49 +++++++++++-----
 5_TSQLFormatter/Form1.cs                      | 40 +++++--------
 5_TSQLFormatter/Program.cs                    |  6 +-
 .../Properties/Resources.Designer.cs          | 46 ++++++---------
 .../Properties/Settings.Designer.cs           | 24 ++++----
 5_TSQLFormatter/app.config                    |  3 +
 5_TSQLFormatter/packages.config               |  4 ++
 5_TSQLFormatter/solution.txt                  |  5 --
 6_TSQLVisualizer/6_TSQLVisualizer.csproj      | 47 ++++++++++-----
 6_TSQLVisualizer/Program.cs                   | 19 +++---
 6_TSQLVisualizer/app.config                   |  3 +
 6_TSQLVisualizer/packages.config              |  4 ++
 LICENSE                                       | 22 +++++++
 README.md                                     |  2 +
 ScriptDOMSamples.sln                          | 33 ++++++++++-
 36 files changed, 472 insertions(+), 322 deletions(-)
 create mode 100644 1_BasicUsage/app.config
 create mode 100644 1_BasicUsage/packages.config
 create mode 100644 2_VisitorPattern/app.config
 create mode 100644 2_VisitorPattern/packages.config
 delete mode 100644 2_VisitorPattern/solution.txt
 create mode 100644 3_ScriptTokens/app.config
 create mode 100644 3_ScriptTokens/packages.config
 create mode 100644 4_TSQLValidation/app.config
 create mode 100644 4_TSQLValidation/packages.config
 create mode 100644 5_TSQLFormatter/app.config
 create mode 100644 5_TSQLFormatter/packages.config
 delete mode 100644 5_TSQLFormatter/solution.txt
 create mode 100644 6_TSQLVisualizer/app.config
 create mode 100644 6_TSQLVisualizer/packages.config
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
index 451ae56..2972a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,14 @@
 /4_TSQLValidation/obj/x86/Debug
 /5_TSQLFormatter/obj/x86/Debug
 /6_TSQLVisualizer/obj/x86/Debug
+/1_BasicUsage/obj/Debug
+/2_VisitorPattern/bin/Debug
+/2_VisitorPattern/obj/Debug
+/3_ScriptTokens/obj/Debug
+/4_TSQLValidation/bin/Debug
+/4_TSQLValidation/obj/Debug/TempPE
+/4_TSQLValidation/obj/Debug
+/5_TSQLFormatter/obj/Debug
+/6_TSQLVisualizer/bin/Debug
+/6_TSQLVisualizer/obj/Debug
+/packages
diff --git a/1_BasicUsage/1_BasicUsage.csproj b/1_BasicUsage/1_BasicUsage.csproj
index caa3585..ec7d982 100644
--- a/1_BasicUsage/1_BasicUsage.csproj
+++ b/1_BasicUsage/1_BasicUsage.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BasicUsage</RootNamespace>
     <AssemblyName>BasicUsage</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,24 +34,43 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </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.
diff --git a/1_BasicUsage/Program.cs b/1_BasicUsage/Program.cs
index f08db09..4c731d1 100644
--- a/1_BasicUsage/Program.cs
+++ b/1_BasicUsage/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,15 +27,12 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
+using Microsoft.SqlServer.TransactSql.ScriptDom;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace BasicUsage
 {
@@ -44,23 +40,19 @@ class Program
     {
         static void Main(string[] args)
         {
-            // before proceeding, add a reference to the ScriptDom assembly
-
-            IList<ParseError> errors = null;
-
-            TextReader rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql");
+            using (var rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql"))
+            {
+                IList<ParseError> errors = null;
 
-            // pass the reader to the scriptdom
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
+                // pass the reader to the scriptdom
+                var parser = new TSql150Parser(true, SqlEngineType.All);
+                var tree = parser.Parse(rdr, out errors);
 
-            // some placeholders to avoid typing!
-            foreach (ParseError err in errors)
-            {
-                Console.WriteLine(err.Message);
+                foreach (ParseError err in errors)
+                {
+                    Console.WriteLine(err.Message);
+                }
             }
-
-            rdr.Dispose();
         }
     }
 }
diff --git a/1_BasicUsage/app.config b/1_BasicUsage/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/1_BasicUsage/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/1_BasicUsage/packages.config b/1_BasicUsage/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/1_BasicUsage/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/2_VisitorPattern/2_VisitorPattern.csproj b/2_VisitorPattern/2_VisitorPattern.csproj
index a7236da..0e1b9bf 100644
--- a/2_VisitorPattern/2_VisitorPattern.csproj
+++ b/2_VisitorPattern/2_VisitorPattern.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,12 +10,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BasicUsage</RootNamespace>
     <AssemblyName>BasicUsage</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,20 +34,29 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -53,6 +64,15 @@
   <ItemGroup>
     <Content Include="solution.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
+  </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.
diff --git a/2_VisitorPattern/Program.cs b/2_VisitorPattern/Program.cs
index 3ae3aaa..ba31fec 100644
--- a/2_VisitorPattern/Program.cs
+++ b/2_VisitorPattern/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,15 +27,12 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
+using Microsoft.SqlServer.TransactSql.ScriptDom;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace BasicUsage
 {
@@ -44,34 +40,37 @@ class Program
     {
         static void Main(string[] args)
         {
-            TextReader rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql");
-
-            IList<ParseError> errors = null;
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
-
-            foreach (ParseError err in errors)
+            using (var rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql"))
             {
-                Console.WriteLine(err.Message);
-            }
+                IList<ParseError> errors = null;
+                var parser = new TSql150Parser(true, SqlEngineType.All);
+                var tree = parser.Parse(rdr, out errors);
 
-            // TODO walk the tree now
-            tree.Accept(new myVisitor());
+                foreach (ParseError err in errors)
+                {
+                    Console.WriteLine(err.Message);
+                }
 
-            rdr.Dispose();
+                // walk the tree now
+                tree.Accept(new myVisitor());
+            }
         }
     }
 
     class myVisitor : TSqlFragmentVisitor
     {
+        public override void ExplicitVisit(NamedTableReference table)
+        {
+            var schemaName = table.SchemaObject.SchemaIdentifier != null ? table.SchemaObject.SchemaIdentifier.Value : "dbo";
+            Console.WriteLine(string.Concat(schemaName, ".", table.SchemaObject.BaseIdentifier.Value));
+
+            base.ExplicitVisit(table);
+        }
         public override void ExplicitVisit(ExecuteStatement node)
         {
             Console.WriteLine((node.ExecuteSpecification.ExecutableEntity as ExecutableProcedureReference).ProcedureReference.ProcedureReference.Name.BaseIdentifier.Value);
 
             base.ExplicitVisit(node);
         }
-
     }
-        
-
 }
diff --git a/2_VisitorPattern/app.config b/2_VisitorPattern/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/2_VisitorPattern/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/2_VisitorPattern/packages.config b/2_VisitorPattern/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/2_VisitorPattern/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/2_VisitorPattern/solution.txt b/2_VisitorPattern/solution.txt
deleted file mode 100644
index e7226e1..0000000
--- a/2_VisitorPattern/solution.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-        public override void ExplicitVisit(ExecuteStatement node)
-        {
-            Console.WriteLine((node.ExecuteSpecification.ExecutableEntity as ExecutableProcedureReference).ProcedureReference.ProcedureReference.Name.BaseIdentifier.Value);
-
-            base.ExplicitVisit(node);
-        }
diff --git a/3_ScriptTokens/3_ScriptTokens.csproj b/3_ScriptTokens/3_ScriptTokens.csproj
index 8ea6d1d..dd7c2cb 100644
--- a/3_ScriptTokens/3_ScriptTokens.csproj
+++ b/3_ScriptTokens/3_ScriptTokens.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BasicUsage</RootNamespace>
     <AssemblyName>BasicUsage</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,24 +34,43 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </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.
diff --git a/3_ScriptTokens/Program.cs b/3_ScriptTokens/Program.cs
index 8f6624b..3c61bc8 100644
--- a/3_ScriptTokens/Program.cs
+++ b/3_ScriptTokens/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,15 +27,12 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
+using Microsoft.SqlServer.TransactSql.ScriptDom;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace BasicUsage
 {
@@ -44,20 +40,19 @@ class Program
     {
         static void Main(string[] args)
         {
-            TextReader rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql");
-
-            IList<ParseError> errors = null;
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
-
-            foreach (ParseError err in errors)
+            using (var rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql"))
             {
-                Console.WriteLine(err.Message);
-            }
+                IList<ParseError> errors = null;
+                var parser = new TSql150Parser(true, SqlEngineType.All);
+                var tree = parser.Parse(rdr, out errors);
 
-            tree.Accept(new MyVisitor());
+                foreach (ParseError err in errors)
+                {
+                    Console.WriteLine(err.Message);
+                }
 
-            rdr.Dispose();
+                tree.Accept(new MyVisitor());
+            }
         }
     }
 
@@ -78,13 +73,11 @@ public override void ExplicitVisit(ExecuteStatement node)
                     // breakpoint here and examine the token types.
                     // of special interest would be the semicolons
 
-                    Console.WriteLine (string.Format("Token {0} is a semicolon", tmpLoop));
+                    Console.WriteLine(string.Format("Token {0} is a semicolon", tmpLoop));
                 }
             }
 
             base.ExplicitVisit(node);
         }
-
     }
-
 }
diff --git a/3_ScriptTokens/app.config b/3_ScriptTokens/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/3_ScriptTokens/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/3_ScriptTokens/packages.config b/3_ScriptTokens/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/3_ScriptTokens/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/4_TSQLValidation/4_TSQLValidation.csproj b/4_TSQLValidation/4_TSQLValidation.csproj
index 1bcd5ac..6bdc727 100644
--- a/4_TSQLValidation/4_TSQLValidation.csproj
+++ b/4_TSQLValidation/4_TSQLValidation.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TSQLFormatter</RootNamespace>
     <AssemblyName>TSQLFormatter</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,23 +34,30 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
@@ -69,7 +78,10 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -80,6 +92,14 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </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.
diff --git a/4_TSQLValidation/Form1.cs b/4_TSQLValidation/Form1.cs
index d298442..0765aa3 100644
--- a/4_TSQLValidation/Form1.cs
+++ b/4_TSQLValidation/Form1.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,19 +27,13 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
+using Microsoft.SqlServer.TransactSql.ScriptDom;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using Microsoft.SqlServer.TransactSql.ScriptDom;
+using System.Windows.Forms;
 
 namespace TSQLFormatter
 {
@@ -53,30 +46,29 @@ public Form1()
 
         private void button1_Click(object sender, EventArgs e)
         {
-            TextReader rdr = new StringReader(textBox1.Text);
-
-            IList<ParseError> errors = null;
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
-
-            foreach (ParseError err in errors)
+            using (var rdr = new StringReader(textBox1.Text))
             {
-                Console.WriteLine(err.Message);
-            }
+                IList<ParseError> errors = null;
+                var parser = new TSql150Parser(true, SqlEngineType.All);
+                var tree = parser.Parse(rdr, out errors);
 
-            MyVisitor checker = new MyVisitor();
+                foreach (ParseError err in errors)
+                {
+                    Console.WriteLine(err.Message);
+                }
 
-            tree.Accept(checker);
-            if (false == checker.containsOnlySelects)
-            {
-                MessageBox.Show("The code contains something other than SELECT statements!");
-            }
-            else
-            {
-                MessageBox.Show("Looks ok!");
-            }
+                MyVisitor checker = new MyVisitor();
 
-            rdr.Dispose();
+                tree.Accept(checker);
+                if (checker.containsOnlySelects)
+                {
+                    MessageBox.Show("Looks ok!");
+                }
+                else
+                {
+                    MessageBox.Show("The code contains something other than SELECT statements!");
+                }
+            }
         }
     }
 
@@ -86,7 +78,7 @@ class MyVisitor : TSqlFragmentVisitor
 
         public override void Visit(TSqlStatement node)
         {
-            if ((node as SelectStatement) == null)
+            if ((node as SelectStatement) is null)
             {
                 containsOnlySelects = false;
             }
diff --git a/4_TSQLValidation/Program.cs b/4_TSQLValidation/Program.cs
index c7174af..34cddf1 100644
--- a/4_TSQLValidation/Program.cs
+++ b/4_TSQLValidation/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,12 +27,9 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 
 namespace TSQLFormatter
diff --git a/4_TSQLValidation/Properties/Resources.Designer.cs b/4_TSQLValidation/Properties/Resources.Designer.cs
index ca8f0fb..04e1170 100644
--- a/4_TSQLValidation/Properties/Resources.Designer.cs
+++ b/4_TSQLValidation/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TSQLFormatter.Properties
-{
-
-
+namespace TSQLFormatter.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace TSQLFormatter.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TSQLFormatter.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/4_TSQLValidation/Properties/Settings.Designer.cs b/4_TSQLValidation/Properties/Settings.Designer.cs
index 9cc9533..efab29f 100644
--- a/4_TSQLValidation/Properties/Settings.Designer.cs
+++ b/4_TSQLValidation/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TSQLFormatter.Properties
-{
-
-
+namespace TSQLFormatter.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/4_TSQLValidation/app.config b/4_TSQLValidation/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/4_TSQLValidation/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/4_TSQLValidation/packages.config b/4_TSQLValidation/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/4_TSQLValidation/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/5_TSQLFormatter/5_TSQLFormatter.csproj b/5_TSQLFormatter/5_TSQLFormatter.csproj
index fac9cf1..1b810a7 100644
--- a/5_TSQLFormatter/5_TSQLFormatter.csproj
+++ b/5_TSQLFormatter/5_TSQLFormatter.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TSQLFormatter</RootNamespace>
     <AssemblyName>TSQLFormatter</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,22 +34,37 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Form1.cs">
@@ -69,7 +86,10 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -80,9 +100,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="solution.txt" />
-  </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.
diff --git a/5_TSQLFormatter/Form1.cs b/5_TSQLFormatter/Form1.cs
index 2993dd3..38bba89 100644
--- a/5_TSQLFormatter/Form1.cs
+++ b/5_TSQLFormatter/Form1.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,19 +27,13 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
+using Microsoft.SqlServer.TransactSql.ScriptDom;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using Microsoft.SqlServer.TransactSql.ScriptDom;
+using System.Windows.Forms;
 
 namespace TSQLFormatter
 {
@@ -53,24 +46,23 @@ public Form1()
 
         private void button1_Click(object sender, EventArgs e)
         {
-            TextReader rdr = new StringReader(textBox1.Text);
-
-            IList<ParseError> errors = null;
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
-
-            foreach (ParseError err in errors)
+            using (var rdr = new StringReader(textBox1.Text))
             {
-                Console.WriteLine(err.Message);
-            }
+                IList<ParseError> errors = null;
+                var parser = new TSql150Parser(true, SqlEngineType.All);
+                var tree = parser.Parse(rdr, out errors);
 
-            Sql110ScriptGenerator scrGen = new Sql110ScriptGenerator();
-            string formattedSQL = null;
-            scrGen.GenerateScript(tree, out formattedSQL);
+                foreach (ParseError err in errors)
+                {
+                    Console.WriteLine(err.Message);
+                }
 
-            textBox2.Text = formattedSQL;
+                var scrGen = new Sql150ScriptGenerator();
+                string formattedSQL = null;
+                scrGen.GenerateScript(tree, out formattedSQL);
 
-            rdr.Dispose();
+                textBox2.Text = formattedSQL;
+            }
         }
     }
 }
diff --git a/5_TSQLFormatter/Program.cs b/5_TSQLFormatter/Program.cs
index c7174af..34cddf1 100644
--- a/5_TSQLFormatter/Program.cs
+++ b/5_TSQLFormatter/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,12 +27,9 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 
 namespace TSQLFormatter
diff --git a/5_TSQLFormatter/Properties/Resources.Designer.cs b/5_TSQLFormatter/Properties/Resources.Designer.cs
index ca8f0fb..04e1170 100644
--- a/5_TSQLFormatter/Properties/Resources.Designer.cs
+++ b/5_TSQLFormatter/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TSQLFormatter.Properties
-{
-
-
+namespace TSQLFormatter.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace TSQLFormatter.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TSQLFormatter.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/5_TSQLFormatter/Properties/Settings.Designer.cs b/5_TSQLFormatter/Properties/Settings.Designer.cs
index 9cc9533..efab29f 100644
--- a/5_TSQLFormatter/Properties/Settings.Designer.cs
+++ b/5_TSQLFormatter/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TSQLFormatter.Properties
-{
-
-
+namespace TSQLFormatter.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/5_TSQLFormatter/app.config b/5_TSQLFormatter/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/5_TSQLFormatter/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/5_TSQLFormatter/packages.config b/5_TSQLFormatter/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/5_TSQLFormatter/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/5_TSQLFormatter/solution.txt b/5_TSQLFormatter/solution.txt
deleted file mode 100644
index e90f378..0000000
--- a/5_TSQLFormatter/solution.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-            Sql110ScriptGenerator scrGen = new Sql110ScriptGenerator();
-            string formattedSQL = null;
-            scrGen.GenerateScript(tree, out formattedSQL);
-
-            textBox2.Text = formattedSQL;
\ No newline at end of file
diff --git a/6_TSQLVisualizer/6_TSQLVisualizer.csproj b/6_TSQLVisualizer/6_TSQLVisualizer.csproj
index 6bf2a40..d4aaa87 100644
--- a/6_TSQLVisualizer/6_TSQLVisualizer.csproj
+++ b/6_TSQLVisualizer/6_TSQLVisualizer.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TSQLVisualizer</RootNamespace>
     <AssemblyName>TSQLVisualizer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,24 +34,43 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\110\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.SqlServer.DacFx.150.4769.1\lib\net46\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </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.
diff --git a/6_TSQLVisualizer/Program.cs b/6_TSQLVisualizer/Program.cs
index 9fdf526..68c63e7 100644
--- a/6_TSQLVisualizer/Program.cs
+++ b/6_TSQLVisualizer/Program.cs
@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
-//<copyright company="Microsoft">
 //    The MIT License (MIT)
 //    
-//    Copyright (c) 2017 Microsoft
+//    Copyright (c) 2020 Arvind Shyamsundar
 //    
 //    Permission is hereby granted, free of charge, to any person obtaining a copy
 //    of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +27,6 @@
 //    be liable for any damages whatsoever (including, without limitation, damages for loss of business profits,
 //    business interruption, loss of business information, or other pecuniary loss) arising out of the use of or inability
 //    to use the sample scripts or documentation, even if Microsoft has been advised of the possibility of such damages.
-//</copyright>
 //------------------------------------------------------------------------------
 
 using System;
@@ -47,11 +45,11 @@ class Program
         static StringBuilder result = new StringBuilder();
         static void Main(string[] args)
         {
-            TextReader rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql");
+            var rdr = new StreamReader(@"c:\ScriptDom\sampleproc.sql");
 
             IList<ParseError> errors = null;
-            TSql110Parser parser = new TSql110Parser(true);
-            TSqlFragment tree = parser.Parse(rdr, out errors);
+            var parser = new TSql150Parser(true, SqlEngineType.All);
+            var tree = parser.Parse(rdr, out errors);
 
             foreach (ParseError err in errors)
             {
@@ -60,10 +58,11 @@ static void Main(string[] args)
 
             ScriptDomWalk(tree, "root");
 
-            TextWriter wr = new StreamWriter(@"c:\temp\scrdom.xml");
-            wr.Write(result);
-            wr.Flush();
-            wr.Dispose();
+            using (var wr = new StreamWriter(@"c:\temp\scrdom.xml"))
+            {
+                wr.Write(result);
+                wr.Flush();
+            }
         }
 
         private static void ScriptDomWalk(object fragment, string memberName)
diff --git a/6_TSQLVisualizer/app.config b/6_TSQLVisualizer/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/6_TSQLVisualizer/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/6_TSQLVisualizer/packages.config b/6_TSQLVisualizer/packages.config
new file mode 100644
index 0000000..5ad8014
--- /dev/null
+++ b/6_TSQLVisualizer/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.SqlServer.DacFx" version="150.4769.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..2186590
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2020 Arvind Shyamsundar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..17739b5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# SQLScriptDomSamples
+These samples are a quick set of scenarios showing how to use Microsoft.SqlServer.TransactSql.ScriptDom classes. They were originally created to support a PASS AppDev virtual chapter meeting - [video recording](https://www.youtube.com/watch?v=CciVxRFXgH8).
diff --git a/ScriptDOMSamples.sln b/ScriptDOMSamples.sln
index 0fe051f..3167d0d 100644
--- a/ScriptDOMSamples.sln
+++ b/ScriptDOMSamples.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "1_BasicUsage", "1_BasicUsage\1_BasicUsage.csproj", "{88301D6F-7C0B-4950-891D-999F991133A6}"
 EndProject
@@ -17,36 +17,65 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "6_TSQLVisualizer", "6_TSQLV
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{88301D6F-7C0B-4950-891D-999F991133A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88301D6F-7C0B-4950-891D-999F991133A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88301D6F-7C0B-4950-891D-999F991133A6}.Debug|x86.ActiveCfg = Debug|x86
 		{88301D6F-7C0B-4950-891D-999F991133A6}.Debug|x86.Build.0 = Debug|x86
+		{88301D6F-7C0B-4950-891D-999F991133A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88301D6F-7C0B-4950-891D-999F991133A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88301D6F-7C0B-4950-891D-999F991133A6}.Release|x86.ActiveCfg = Release|x86
 		{88301D6F-7C0B-4950-891D-999F991133A6}.Release|x86.Build.0 = Release|x86
+		{46DADD69-CF9A-410D-805C-A24A8000327C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46DADD69-CF9A-410D-805C-A24A8000327C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{46DADD69-CF9A-410D-805C-A24A8000327C}.Debug|x86.ActiveCfg = Debug|x86
 		{46DADD69-CF9A-410D-805C-A24A8000327C}.Debug|x86.Build.0 = Debug|x86
+		{46DADD69-CF9A-410D-805C-A24A8000327C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46DADD69-CF9A-410D-805C-A24A8000327C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{46DADD69-CF9A-410D-805C-A24A8000327C}.Release|x86.ActiveCfg = Release|x86
 		{46DADD69-CF9A-410D-805C-A24A8000327C}.Release|x86.Build.0 = Release|x86
+		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Debug|x86.ActiveCfg = Debug|x86
 		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Debug|x86.Build.0 = Debug|x86
+		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Release|x86.ActiveCfg = Release|x86
 		{3C51886E-96B8-4037-8D69-DED60EE1D557}.Release|x86.Build.0 = Release|x86
+		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Debug|x86.ActiveCfg = Debug|x86
 		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Debug|x86.Build.0 = Debug|x86
+		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Release|x86.ActiveCfg = Release|x86
 		{34808131-3AA3-4D50-A2C0-B47F93651A6E}.Release|x86.Build.0 = Release|x86
+		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Debug|x86.ActiveCfg = Debug|x86
 		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Debug|x86.Build.0 = Debug|x86
+		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Release|x86.ActiveCfg = Release|x86
 		{D45AB243-99C3-4DD0-B692-835D3BF4E0C0}.Release|x86.Build.0 = Release|x86
+		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Debug|x86.ActiveCfg = Debug|x86
 		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Debug|x86.Build.0 = Debug|x86
+		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Release|x86.ActiveCfg = Release|x86
 		{51E8719C-0ACA-4C79-AE31-7DE0DC0D5BE7}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {939348C3-B244-4160-B9C0-66DFE32ED9B2}
+	EndGlobalSection
 EndGlobal