Upgrade the samples to 8.17.0

2022-12-20 10:56:49 +00:00 · 2022-12-20 10:56:49 +00:00 · 892a85f8e4
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- Intentionally here to turn off centrally managed packages for this directory. -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+</Project>
--- a/api-samples/Detection/Detection.csproj
+++ b/api-samples/Detection/Detection.csproj
@ -6,6 +6,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis.Detection" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Detection" Version="8.17.0" />
  </ItemGroup>
 </Project>
--- a/api-samples/Extraction.Json/Extraction.Json.csproj
+++ b/api-samples/Extraction.Json/Extraction.Json.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>
  
 </Project>
--- a/api-samples/Extraction.Text/Extraction.Text.csproj
+++ b/api-samples/Extraction.Text/Extraction.Text.csproj
@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-     <PackageReference Include="Microsoft.ProgramSynthesis.Extraction.Text" Version="8.16.0" />
+     <PackageReference Include="Microsoft.ProgramSynthesis.Extraction.Text" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/api-samples/Extraction.Web/Extraction.Web.csproj
+++ b/api-samples/Extraction.Web/Extraction.Web.csproj
@ -9,7 +9,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis.Extraction.Web" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Extraction.Web" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/api-samples/Matching.Text/Matching.Text.csproj
+++ b/api-samples/Matching.Text/Matching.Text.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/api-samples/Read.FlatFile/Read.FlatFile.csproj
+++ b/api-samples/Read.FlatFile/Read.FlatFile.csproj
@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/api-samples/Split.Text/Split.Text.csproj
+++ b/api-samples/Split.Text/Split.Text.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/api-samples/Transformation.Formula/SampleProgram.cs
+++ b/api-samples/Transformation.Formula/SampleProgram.cs
@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.ProgramSynthesis.Transformation.Formula;
+using Microsoft.ProgramSynthesis.Transformation.Formula.Constraints;
+using Microsoft.ProgramSynthesis.Transformation.Formula.Translation;
+using Microsoft.ProgramSynthesis.Translation;
+using Microsoft.ProgramSynthesis.Wrangling;
+using Microsoft.ProgramSynthesis.Wrangling.Constraints;
+
+namespace Transformation.Formula
+{
+    /// <summary>
+    ///     Sample of how to use the Transformation.Formula API. Transformation.Formula generates programs from input/output examples.
+    /// </summary>
+    internal static class SampleProgram {
+        private static void Main(string[] args) {
+            // Simplest usage: learn from one or more examples with ONE source string:
+            LearnFormatName();
+            // Learning top-k ranked programs instead of just the single best one:
+            LearnTop10ExtractName();
+            // Learning with additional inputs:
+            LearnNormalizeDate();
+            // Learning with unicode regexes enabled and disabled:
+            LearnUnicodeRegexes();
+            // Complete scenario: Learn without unicode regexes, but if it fails, then with it.
+            LearnWithoutUnicodeThenWithUnicodeRegexes();
+            Console.WriteLine("\n\nDone.");
+        }
+
+        /// <summary>
+        ///     Learn to reformat a name written "First Last" as "Last, F." where 'F' is the first initial.
+        ///     Demonstrates basic usage of Transformation.Formula API.
+        /// </summary>
+        private static void LearnFormatName() {
+            var session = new Session();
+
+            // Examples are given as an Example object which takes an input and output.
+            // Here we have 3 inputs -- a string, an int, a datetime -- and one string output in each example. 
+            session.Constraints.Add(
+                // 1 or more input-output examples needed, here we provide 2
+                new Example(new InputRow("Kettil Hansson", 1, new DateTime(2022,11,30,6,6,6)), "Hansson, K."),
+                new Example(new InputRow("Foo Bar", 2, new DateTime(2022,12,12,10,45,30)), "Bar, F.")
+            );
+            // Given just the examples, the best program is returned
+            Program topRankedProgram = session.Learn();
+
+            if (topRankedProgram == null) {
+                Console.Error.WriteLine("Error: failed to learn format name program.");
+            } else {
+                // Run the program on some new inputs.
+                foreach (var name in new[] { "Etelka Bala", "Myron Lampros" }) {
+                    string formatted = topRankedProgram.Run(new InputRow(name)) as string;
+                    Console.WriteLine("\"{0}\" => \"{1}\"", name, formatted);
+                }
+                var translation = session.Translate(TargetLanguage.Pandas, topRankedProgram);
+                if (translation == null) {
+                    Console.Error.WriteLine("Error: failed to translate to target language.");
+                } else {
+                    Console.WriteLine($"The generated program in Pandas:\n{translation.ToString()}");
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Look at the top 10 programs learned from a single example for extracting the last name and show
+        ///     the behavior of them on slightly differently formatted name. Demonstrates learning more than just
+        ///     the single top program, and shows the variation in outputs among the top-ranked programs on unseen
+        ///     input formats.
+        /// </summary>
+        private static void LearnTop10ExtractName() {
+            var session = new Session();
+
+            session.Constraints.Add(new Example(new InputRow("Greta Hermansson"), "Hermansson"));
+            IReadOnlyList<Program> programs = session.LearnTopK(k: 10);
+
+            // This attempts running the top 10 programs on an input not directly similar to the example
+            // to see different behaviours.
+            // Here, we will see the outputs:
+            // a. "Smith", corresponding to programs that extract the last name.
+            // b. "Hansson Smith", corresponding to programs that extract everything after the first name.
+            int i = 0;
+            foreach (var program in programs) {
+                var input = new InputRow("Kettil Hansson Smith"); // Notice that we now include a middle name too.
+                Console.WriteLine("Program {0}: \"{1}\" => \"{2}\"", ++i, input, program.Run(input));
+            }
+        }
+
+        /// <summary>
+        ///     Learns a program to convert dates from "DD/MM/YYYY" to "YYYY-MM-DD".
+        ///     Demonstrates providing additional inputs (other inputs, without corresponding outputs).
+        /// </summary>
+        private static void LearnNormalizeDate() {
+            var session = new Session();
+
+            session.Constraints.Add(
+                new Example(new InputRow("02/04/1953"), "1953-04-02")
+            );
+            // Inputs for which the corresponding output is not known. May be used for improving ranking.
+            session.Inputs.Add(
+                new InputRow("04/02/1962"),
+                new InputRow("27/08/1998")
+            );
+            Program topRankedProgram = session.Learn();
+
+            if (topRankedProgram == null) {
+                Console.Error.WriteLine("Error: failed to learn normalize date program.");
+            } else {
+                foreach (var date in new[] { "12/02/1972", "31/01/1983" }) {
+                    string normalized = topRankedProgram.Run(new InputRow(date)) as string;
+                    Console.WriteLine("\"{0}\" => \"{1}\"", date, normalized);
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Learn to extract numerical temperature from a string containing unicode characters.
+        ///     Demonstrates the setting of using unicode regexes versus not using them.
+        /// </summary>
+        private static void LearnUnicodeRegexes() {
+            var session = new Session();
+
+            // Examples are given as an Example object which takes an input and output.
+            session.Constraints.Add(
+                new Example(new InputRow("Min 34° Celcius"), "34"),
+                new Example(new InputRow("Max 50° C"), "50"),
+                new Example(new InputRow("Avg 44°C"), "44"),
+                new Example(new InputRow("54°"), "54"),
+                new Example(new InputRow("24"), "24")
+            );
+            // Given just the examples, the best program is returned
+            Program topRankedProgram = session.Learn();
+
+            if (topRankedProgram == null) {
+                Console.Error.WriteLine("Error: failed to learn program to extract number.");
+                return;
+            }
+            var translation = session.Translate(TargetLanguage.Pandas, topRankedProgram);
+            if (translation == null) {
+                Console.Error.WriteLine("Error: failed to translate to target language.");
+                return;
+            }
+            Console.WriteLine($"The default setting uses unicodes, and requires regex module:\n{translation.ToString()}");
+            session.Constraints.AddOrReplace(new LearnConstraint() { EnableMatchUnicode = false });
+            topRankedProgram = session.Learn();
+            if (topRankedProgram == null) {
+                Console.Error.WriteLine("Error: failed to learn program to extract number.");
+                return;
+            }
+            translation = session.Translate(TargetLanguage.Pandas, topRankedProgram);
+            if (translation == null) {
+                Console.Error.WriteLine("Error: failed to translate to target language.");
+                return;
+            }
+            Console.WriteLine($"The custom setting forbids use of unicodes, and uses the re module:\n{translation.ToString()}");
+        }
+
+        /// <summary>
+        ///     Learn without unicode regexes, but if it doesn't work, learn with unicode, and if the latter
+        ///     succeeds, then log such instances. Illustrates use of cancellation token.
+        /// </summary>
+        private static void LearnWithoutUnicodeThenWithUnicodeRegexes() {
+            var session = new Session();
+
+            // Examples are given as an Example object which takes an input and output.
+            session.Constraints.Add(
+                new Example(new InputRow("Renée"), "Renée"), // extracting UpperCase.LowerCase*
+                new Example(new InputRow("Noël#"), "Noël"),
+                new Example(new InputRow("Sørina44.."), "Sørina"),
+                new Example(new InputRow("Österreich____"), "Österreich"),
+                new Example(new InputRow("Ångström*****"), "Ångström"),
+                new Example(new InputRow("Zoë2"), "Zoë"),
+                new Example(new InputRow("ZoëAb"), "Zoë"),
+                new Example(new InputRow("ZoëËab"), "Zoë"),
+                new Example(new InputRow("ÅngströmB"), "Ångström"),
+                new Example(new InputRow("ÅngströmÒa"), "Ångström")
+            );
+            // Learn without unicode categories in regexes
+            session.Constraints.Add(new LearnConstraint() { EnableMatchUnicode = false });
+
+            CancellationTokenSource cancellationTokenSource = new();
+            CancellationToken token = cancellationTokenSource.Token;
+
+            // Call with a cancellation token and time limit of 0.2 seconds
+            cancellationTokenSource.CancelAfter(200);
+            Program topRankedProgram = null;
+            try {
+                topRankedProgram = session.Learn(cancel: token);
+            } catch (TaskCanceledException) {
+            } finally {
+                cancellationTokenSource.Dispose();
+            }
+
+            if (topRankedProgram != null) {
+                Console.WriteLine("Succeeded to learn the following program using non-unicode regexes:");
+                Console.WriteLine($"{session.Translate(TargetLanguage.Pandas, topRankedProgram)?.ToString()}");
+                return;
+            }
+            Console.WriteLine("Failed to learn program to extract name without unicode.");
+            // Replace old learn constraint by a new one where unicode matching is enabled
+            session.Constraints.Remove(session.Constraints.OfType<LearnConstraint>());
+            session.Constraints.Add(new LearnConstraint() { EnableMatchUnicode = true });
+            cancellationTokenSource = new CancellationTokenSource();
+            cancellationTokenSource.CancelAfter(2000); // Cancel after 2 seconds
+            try {
+                topRankedProgram = session.Learn(cancel: cancellationTokenSource.Token);
+            } catch (TaskCanceledException) {
+            } finally {
+                cancellationTokenSource.Dispose();
+            }
+            if (topRankedProgram == null) {
+                Console.Error.WriteLine("Error: Failed to learn program to extract name with unicode.");
+                return;
+            }
+            Console.WriteLine("Succeeded to learn with Unicode matches. We should log such examples!");
+            FormulaTranslation translation = null;
+            cancellationTokenSource = new CancellationTokenSource();
+            cancellationTokenSource.CancelAfter(2000); // Cancel after 2 seconds
+            try {
+                translation = session.Translate(TargetLanguage.Pandas, topRankedProgram, cancellationTokenSource.Token);
+            } catch (TaskCanceledException) {
+            } finally {
+                cancellationTokenSource.Dispose();
+            }
+            if (translation == null) {
+                Console.Error.WriteLine("Error: failed to translate to target language.");
+                return;
+            }
+            Console.WriteLine($"{translation.ToString()}");
+        }
+    }
+}
--- a/api-samples/Transformation.Formula/Transformation.Formula.csproj
+++ b/api-samples/Transformation.Formula/Transformation.Formula.csproj
@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ProgramSynthesis.Transformation.Formula" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+  </ItemGroup>
+</Project>
--- a/api-samples/Transformation.Json/Transformation.Json.csproj
+++ b/api-samples/Transformation.Json/Transformation.Json.csproj
@ -6,6 +6,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>
 </Project>
--- a/api-samples/Transformation.Text/Transformation.Text.csproj
+++ b/api-samples/Transformation.Text/Transformation.Text.csproj
@ -6,6 +6,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis.Transformation.Text" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Transformation.Text" Version="8.17.0" />
  </ItemGroup>
 </Project>
--- a/dsl-samples/MergeConflictsResolution/MergeConflictsResolution/MergeConflictsResolution.csproj
+++ b/dsl-samples/MergeConflictsResolution/MergeConflictsResolution/MergeConflictsResolution.csproj
@ -4,7 +4,7 @@
    <TargetFramework>netcoreapp3.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
 </Project>
--- a/dsl-samples/ProseSample/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj
+++ b/dsl-samples/ProseSample/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj
@ -5,7 +5,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis.Common" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Common" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/dsl-samples/ProseSample/ProseSample.Substrings/ProseSample.Substrings.csproj
+++ b/dsl-samples/ProseSample/ProseSample.Substrings/ProseSample.Substrings.csproj
@ -6,9 +6,9 @@
  
  <ItemGroup>
    <ProjectReference Include="..\ProseSample.Substrings.Semantics\ProseSample.Substrings.Semantics.csproj" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Common" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.DslcTargets" Version="8.16.0" />
-    <DotNetCliToolReference Include="Microsoft.ProgramSynthesis.Dslc" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Common" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.DslcTargets" Version="8.17.0" />
+    <DotNetCliToolReference Include="Microsoft.ProgramSynthesis.Dslc" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/dsl-samples/ProseSample/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj
+++ b/dsl-samples/ProseSample/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj
@ -11,8 +11,8 @@
  <ItemGroup>
    <ProjectReference Include="..\ProseSample.Substrings.Semantics\ProseSample.Substrings.Semantics.csproj" />
    <ProjectReference Include="..\ProseSample.Substrings\ProseSample.Substrings.csproj" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
 </Project>

--- a/dsl-samples/ProseSample/ProseSample/ProseSample.csproj
+++ b/dsl-samples/ProseSample/ProseSample/ProseSample.csproj
@ -14,7 +14,7 @@
    <ProjectReference Include="..\ProseSample.Substrings.Semantics\ProseSample.Substrings.Semantics.csproj" />
    <ProjectReference Include="..\ProseSample.Substrings\ProseSample.Substrings.csproj" />
    <ProjectReference Include="..\ProseSample.TextExtraction\ProseSample.TextExtraction.csproj" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
  </ItemGroup>

 </Project>
--- a/dsl-samples/tutorial/part1a-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1a-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1a-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1a-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1a/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1a/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1a/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1a/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1b-attempt1-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1b-attempt1-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1b-attempt1-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1b-attempt1-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1b-attempt1/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1b-attempt1/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1b-attempt1/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1b-attempt1/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1b-attempt2-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1b-attempt2-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1b-attempt2-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1b-attempt2-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1b-attempt2/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1b-attempt2/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1b-attempt2/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1b-attempt2/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1c-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1c-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1c-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1c-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1c/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1c/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1c/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1c/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1d-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1d-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1d-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1d-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part1d/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part1d/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part1d/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part1d/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part2a-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part2a-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part2a-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part2a-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part2a/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part2a/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part2a/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part2a/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part2b-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part2b-complete/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part2b-complete/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part2b-complete/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/dsl-samples/tutorial/part2b/ProseTutorial.Tests/ProseTutorial.Tests.csproj
+++ b/dsl-samples/tutorial/part2b/ProseTutorial.Tests/ProseTutorial.Tests.csproj
@ -5,8 +5,8 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
  </ItemGroup>
--- a/dsl-samples/tutorial/part2b/ProseTutorial/ProseTutorial.csproj
+++ b/dsl-samples/tutorial/part2b/ProseTutorial/ProseTutorial.csproj
@ -4,8 +4,8 @@
    <TargetFramework>netcoreapp2.1</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.Compiler" Version="8.17.0" />
  </ItemGroup>
  <ItemGroup>
    <None Update="synthesis\grammar\substring.grammar">
--- a/misc/BenchmarkDriver/BenchmarkDriver.csproj
+++ b/misc/BenchmarkDriver/BenchmarkDriver.csproj
@ -6,8 +6,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.16.0" />
-    <PackageReference Include="Microsoft.ProgramSynthesis.CommandLine" Version="8.16.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis" Version="8.17.0" />
+    <PackageReference Include="Microsoft.ProgramSynthesis.CommandLine" Version="8.17.0" />
  </ItemGroup>

 </Project>