From a8f7a2b18a43f9ef7d38e6a6cde29d22b50fc8e7 Mon Sep 17 00:00:00 2001 From: simmdan Date: Fri, 15 Sep 2017 17:57:51 +0000 Subject: [PATCH] Upgrade the samples to 4.0.0 --- Directory.Build.props | 3 + Directory.Build.targets | 4 + Extraction.Json/App.config | 15 -- Extraction.Json/Extraction.Json.csproj | 180 +--------------- Extraction.Json/Properties/AssemblyInfo.cs | 6 +- Extraction.Json/packages.config | 12 -- Extraction.Text/App.config | 15 -- Extraction.Text/Extraction.Text.csproj | 181 +--------------- Extraction.Text/Properties/AssemblyInfo.cs | 6 +- Extraction.Text/packages.config | 12 -- .../Properties/AssemblyInfo.cs | 6 +- .../ProseSample.Substrings.Semantics.csproj | 190 +---------------- .../app.config | 35 ---- .../packages.config | 14 -- .../Properties/AssemblyInfo.cs | 6 +- .../ProseSample.Substrings.csproj | 194 +----------------- .../ProseSample.Substrings.grammar | 2 +- .../ProseSample.Substrings/app.config | 31 --- .../ProseSample.Substrings/packages.config | 14 -- .../Properties/AssemblyInfo.cs | 6 +- .../ProseSample.TextExtraction.csproj | 190 +---------------- .../ProseSample.TextExtraction.grammar | 4 +- .../ProseSample.TextExtraction/app.config | 31 --- .../packages.config | 14 -- ProgramSynthesis/ProseSample/Program.cs | 6 +- .../ProseSample/Properties/AssemblyInfo.cs | 6 +- .../ProseSample/ProseSample.csproj | 187 +---------------- ProgramSynthesis/ProseSample/packages.config | 14 -- Split.Text/App.config | 15 -- Split.Text/Properties/AssemblyInfo.cs | 6 +- Split.Text/Split.Text.csproj | 180 +--------------- Split.Text/packages.config | 12 -- Transformation.Json/App.config | 34 --- .../Properties/AssemblyInfo.cs | 6 +- .../Transformation.Json.csproj | 169 +-------------- Transformation.Json/packages.config | 12 -- Transformation.Text/App.config | 15 -- .../Properties/AssemblyInfo.cs | 6 +- Transformation.Text/SimpleAPI.cs | 10 +- .../Transformation.Text.csproj | 180 +--------------- Transformation.Text/packages.config | 12 -- nuget.config | 10 + 42 files changed, 69 insertions(+), 1982 deletions(-) create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets delete mode 100644 Extraction.Json/App.config delete mode 100644 Extraction.Json/packages.config delete mode 100644 Extraction.Text/App.config delete mode 100644 Extraction.Text/packages.config delete mode 100644 ProgramSynthesis/ProseSample.Substrings.Semantics/app.config delete mode 100644 ProgramSynthesis/ProseSample.Substrings.Semantics/packages.config delete mode 100644 ProgramSynthesis/ProseSample.Substrings/app.config delete mode 100644 ProgramSynthesis/ProseSample.Substrings/packages.config delete mode 100644 ProgramSynthesis/ProseSample.TextExtraction/app.config delete mode 100644 ProgramSynthesis/ProseSample.TextExtraction/packages.config delete mode 100644 ProgramSynthesis/ProseSample/packages.config delete mode 100644 Split.Text/App.config delete mode 100644 Split.Text/packages.config delete mode 100644 Transformation.Json/App.config delete mode 100644 Transformation.Json/packages.config delete mode 100644 Transformation.Text/App.config delete mode 100644 Transformation.Text/packages.config create mode 100644 nuget.config diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..766ba89 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..e2a3ca3 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/Extraction.Json/App.config b/Extraction.Json/App.config deleted file mode 100644 index 9586bcb..0000000 --- a/Extraction.Json/App.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Extraction.Json/Extraction.Json.csproj b/Extraction.Json/Extraction.Json.csproj index 22c8ef1..237ffd9 100644 --- a/Extraction.Json/Extraction.Json.csproj +++ b/Extraction.Json/Extraction.Json.csproj @@ -34,190 +34,12 @@ prompt 4 - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - - - - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/Extraction.Json/Properties/AssemblyInfo.cs b/Extraction.Json/Properties/AssemblyInfo.cs index 18cdf79..f5fc4fc 100644 --- a/Extraction.Json/Properties/AssemblyInfo.cs +++ b/Extraction.Json/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Extraction.Json/packages.config b/Extraction.Json/packages.config deleted file mode 100644 index 52db0c9..0000000 --- a/Extraction.Json/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Extraction.Text/App.config b/Extraction.Text/App.config deleted file mode 100644 index 9586bcb..0000000 --- a/Extraction.Text/App.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Extraction.Text/Extraction.Text.csproj b/Extraction.Text/Extraction.Text.csproj index 202a583..71e5eab 100644 --- a/Extraction.Text/Extraction.Text.csproj +++ b/Extraction.Text/Extraction.Text.csproj @@ -11,6 +11,7 @@ Extraction.Text v4.5 512 + true @@ -33,190 +34,12 @@ prompt 4 - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - - - - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/Extraction.Text/Properties/AssemblyInfo.cs b/Extraction.Text/Properties/AssemblyInfo.cs index 3ab44ae..185f1a2 100644 --- a/Extraction.Text/Properties/AssemblyInfo.cs +++ b/Extraction.Text/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Extraction.Text/packages.config b/Extraction.Text/packages.config deleted file mode 100644 index 52db0c9..0000000 --- a/Extraction.Text/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/ProgramSynthesis/ProseSample.Substrings.Semantics/Properties/AssemblyInfo.cs b/ProgramSynthesis/ProseSample.Substrings.Semantics/Properties/AssemblyInfo.cs index fd10290..3aa75d9 100644 --- a/ProgramSynthesis/ProseSample.Substrings.Semantics/Properties/AssemblyInfo.cs +++ b/ProgramSynthesis/ProseSample.Substrings.Semantics/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("3C5A5EFD-4FA6-4493-BA02-AD5A1ACDFF69")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] diff --git a/ProgramSynthesis/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj b/ProgramSynthesis/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj index d5743a0..d541c4e 100644 --- a/ProgramSynthesis/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj +++ b/ProgramSynthesis/ProseSample.Substrings.Semantics/ProseSample.Substrings.Semantics.csproj @@ -1,5 +1,5 @@  - + Debug @@ -31,173 +31,6 @@ prompt 4 - - - ..\..\packages\Antlr4.Runtime.4.6.1\lib\net45\Antlr4.Runtime.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.Compiler.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compiler.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - @@ -206,26 +39,7 @@ - - - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/ProgramSynthesis/ProseSample.Substrings.Semantics/app.config b/ProgramSynthesis/ProseSample.Substrings.Semantics/app.config deleted file mode 100644 index 727e5aa..0000000 --- a/ProgramSynthesis/ProseSample.Substrings.Semantics/app.config +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ProgramSynthesis/ProseSample.Substrings.Semantics/packages.config b/ProgramSynthesis/ProseSample.Substrings.Semantics/packages.config deleted file mode 100644 index ddff848..0000000 --- a/ProgramSynthesis/ProseSample.Substrings.Semantics/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ProgramSynthesis/ProseSample.Substrings/Properties/AssemblyInfo.cs b/ProgramSynthesis/ProseSample.Substrings/Properties/AssemblyInfo.cs index 05ecf38..ab15c7c 100644 --- a/ProgramSynthesis/ProseSample.Substrings/Properties/AssemblyInfo.cs +++ b/ProgramSynthesis/ProseSample.Substrings/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("41e9a9b1-b013-4a87-9759-e3004fef8a81")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] diff --git a/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.csproj b/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.csproj index edc0009..0125c46 100644 --- a/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.csproj +++ b/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.csproj @@ -1,5 +1,5 @@  - + Debug @@ -31,192 +31,18 @@ prompt 4 - - - ..\..\packages\Antlr4.Runtime.4.6.1\lib\net45\Antlr4.Runtime.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.Compiler.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compiler.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - {997C015E-6C5F-495B-A6A7-648E0837EC6D} ProseSample.Substrings.Semantics + - - PreserveNewest - - - - - - @@ -231,7 +57,7 @@ - + @@ -239,18 +65,4 @@ CompileGrammar;$(CoreCompileDependsOn) - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.grammar b/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.grammar index 180ab88..083c103 100644 --- a/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.grammar +++ b/ProgramSynthesis/ProseSample.Substrings/ProseSample.Substrings.grammar @@ -1,4 +1,4 @@ -#reference 'Microsoft.ProgramSynthesis.Extraction.Text.Semantics, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'; +#reference 'file:Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll'; #reference 'file:ProseSample.Substrings.Semantics.dll'; #reference 'file:System.ValueTuple.dll'; diff --git a/ProgramSynthesis/ProseSample.Substrings/app.config b/ProgramSynthesis/ProseSample.Substrings/app.config deleted file mode 100644 index be880b3..0000000 --- a/ProgramSynthesis/ProseSample.Substrings/app.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ProgramSynthesis/ProseSample.Substrings/packages.config b/ProgramSynthesis/ProseSample.Substrings/packages.config deleted file mode 100644 index ddff848..0000000 --- a/ProgramSynthesis/ProseSample.Substrings/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ProgramSynthesis/ProseSample.TextExtraction/Properties/AssemblyInfo.cs b/ProgramSynthesis/ProseSample.TextExtraction/Properties/AssemblyInfo.cs index 990e815..10c042b 100644 --- a/ProgramSynthesis/ProseSample.TextExtraction/Properties/AssemblyInfo.cs +++ b/ProgramSynthesis/ProseSample.TextExtraction/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("5aa217f9-deab-46be-81be-afd00948ac50")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] diff --git a/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj b/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj index 1259b27..62bc914 100644 --- a/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj +++ b/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.csproj @@ -1,5 +1,5 @@  - + Debug @@ -31,173 +31,6 @@ prompt 4 - - - ..\..\packages\Antlr4.Runtime.4.6.1\lib\net45\Antlr4.Runtime.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.Compiler.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compiler.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - @@ -205,8 +38,6 @@ - - PreserveNewest @@ -220,24 +51,7 @@ {41e9a9b1-b013-4a87-9759-e3004fef8a81} ProseSample.Substrings - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.grammar b/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.grammar index b35c227..4eb9436 100644 --- a/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.grammar +++ b/ProgramSynthesis/ProseSample.TextExtraction/ProseSample.TextExtraction.grammar @@ -1,5 +1,5 @@ -#reference 'Microsoft.ProgramSynthesis.Utils, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'; -#reference 'Microsoft.ProgramSynthesis.Extraction.Text.Semantics, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'; +#reference 'file:Microsoft.ProgramSynthesis.Utils.dll'; +#reference 'file:Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll'; #reference 'file:ProseSample.TextExtraction.dll'; #reference 'file:ProseSample.Substrings.dll'; diff --git a/ProgramSynthesis/ProseSample.TextExtraction/app.config b/ProgramSynthesis/ProseSample.TextExtraction/app.config deleted file mode 100644 index a3f9df9..0000000 --- a/ProgramSynthesis/ProseSample.TextExtraction/app.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ProgramSynthesis/ProseSample.TextExtraction/packages.config b/ProgramSynthesis/ProseSample.TextExtraction/packages.config deleted file mode 100644 index ddff848..0000000 --- a/ProgramSynthesis/ProseSample.TextExtraction/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ProgramSynthesis/ProseSample/Program.cs b/ProgramSynthesis/ProseSample/Program.cs index e1f0e7c..0f8166a 100644 --- a/ProgramSynthesis/ProseSample/Program.cs +++ b/ProgramSynthesis/ProseSample/Program.cs @@ -44,14 +44,14 @@ namespace ProseSample }).ToArray(); var examples = data.Take(exampleCount) .ToDictionary( - t => State.Create(grammar.InputSymbol, new StringRegion(t.Item1, Semantics.Tokens)), + t => State.CreateForLearning(grammar.InputSymbol, new StringRegion(t.Item1, Semantics.Tokens)), t => (object) new StringRegion(t.Item2, Semantics.Tokens)); var spec = new ExampleSpec(examples); ProgramNode program = Learn(grammar, spec, new Substrings.RankingScore(grammar), new Substrings.WitnessFunctions(grammar)); foreach (ValueTuple row in data.Skip(exampleCount)) { - State input = State.Create(grammar.InputSymbol, new StringRegion(row.Item1, Semantics.Tokens)); + State input = State.CreateForExecution(grammar.InputSymbol, new StringRegion(row.Item1, Semantics.Tokens)); var output = (StringRegion) program.Invoke(input); WriteColored(ConsoleColor.DarkCyan, $"{row.Item1} => {output.Value}"); } @@ -75,7 +75,7 @@ namespace ProseSample { StringRegion document; List examples = LoadBenchmark($"benchmarks/{benchmark}.txt", out document); - var input = State.Create(grammar.InputSymbol, document); + var input = State.CreateForLearning(grammar.InputSymbol, document); var spec = new PrefixSpec(input, examples); ProgramNode program = Learn(grammar, spec, new TextExtraction.RankingScore(grammar), new TextExtraction.WitnessFunctions(grammar)); diff --git a/ProgramSynthesis/ProseSample/Properties/AssemblyInfo.cs b/ProgramSynthesis/ProseSample/Properties/AssemblyInfo.cs index b32436e..edf85ca 100644 --- a/ProgramSynthesis/ProseSample/Properties/AssemblyInfo.cs +++ b/ProgramSynthesis/ProseSample/Properties/AssemblyInfo.cs @@ -23,6 +23,6 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("c7fc4d3c-3cae-42b9-aff9-83cb07a7872f")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] diff --git a/ProgramSynthesis/ProseSample/ProseSample.csproj b/ProgramSynthesis/ProseSample/ProseSample.csproj index 6084524..122a292 100644 --- a/ProgramSynthesis/ProseSample/ProseSample.csproj +++ b/ProgramSynthesis/ProseSample/ProseSample.csproj @@ -34,173 +34,6 @@ prompt 4 - - - ..\..\packages\Antlr4.Runtime.4.6.1\lib\net45\Antlr4.Runtime.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.Compiler.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compiler.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - @@ -211,7 +44,6 @@ benchmarks\emails.tsv PreserveNewest - @@ -236,24 +68,7 @@ {5aa217f9-deab-46be-81be-afd00948ac50} ProseSample.TextExtraction - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/ProgramSynthesis/ProseSample/packages.config b/ProgramSynthesis/ProseSample/packages.config deleted file mode 100644 index ddff848..0000000 --- a/ProgramSynthesis/ProseSample/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Split.Text/App.config b/Split.Text/App.config deleted file mode 100644 index 9586bcb..0000000 --- a/Split.Text/App.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Split.Text/Properties/AssemblyInfo.cs b/Split.Text/Properties/AssemblyInfo.cs index 89aa869..aed05a3 100644 --- a/Split.Text/Properties/AssemblyInfo.cs +++ b/Split.Text/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Split.Text/Split.Text.csproj b/Split.Text/Split.Text.csproj index 160a45d..5e15587 100644 --- a/Split.Text/Split.Text.csproj +++ b/Split.Text/Split.Text.csproj @@ -34,190 +34,12 @@ prompt 4 - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - - - - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/Split.Text/packages.config b/Split.Text/packages.config deleted file mode 100644 index 52db0c9..0000000 --- a/Split.Text/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Transformation.Json/App.config b/Transformation.Json/App.config deleted file mode 100644 index 04e4799..0000000 --- a/Transformation.Json/App.config +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Transformation.Json/Properties/AssemblyInfo.cs b/Transformation.Json/Properties/AssemblyInfo.cs index 9f6ad62..a10060b 100644 --- a/Transformation.Json/Properties/AssemblyInfo.cs +++ b/Transformation.Json/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Transformation.Json/Transformation.Json.csproj b/Transformation.Json/Transformation.Json.csproj index eaee244..c1cb285 100644 --- a/Transformation.Json/Transformation.Json.csproj +++ b/Transformation.Json/Transformation.Json.csproj @@ -33,164 +33,6 @@ 4 - - ..\packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll - True - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compiler.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\packages\System.Interactive.3.1.1\lib\net45\System.Interactive.dll - True - - - ..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - @@ -206,18 +48,9 @@ - - - + - diff --git a/Transformation.Json/packages.config b/Transformation.Json/packages.config deleted file mode 100644 index 8cc4728..0000000 --- a/Transformation.Json/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Transformation.Text/App.config b/Transformation.Text/App.config deleted file mode 100644 index 9586bcb..0000000 --- a/Transformation.Text/App.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Transformation.Text/Properties/AssemblyInfo.cs b/Transformation.Text/Properties/AssemblyInfo.cs index 493cf13..e79fc38 100644 --- a/Transformation.Text/Properties/AssemblyInfo.cs +++ b/Transformation.Text/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.0")] -[assembly: AssemblyInformationalVersion("3.2.0")] -[assembly: AssemblyFileVersion("3.2.0.0")] +[assembly: AssemblyVersion("3.3.0")] +[assembly: AssemblyInformationalVersion("3.3.0 - private build")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/Transformation.Text/SimpleAPI.cs b/Transformation.Text/SimpleAPI.cs index 446bf4b..7c65913 100644 --- a/Transformation.Text/SimpleAPI.cs +++ b/Transformation.Text/SimpleAPI.cs @@ -62,9 +62,9 @@ namespace Transformation.Text // Convert the examples in the format expected by Microsoft.ProgramSynthesis. // Internally, Transformation.Text represents strings as ValueSubstrings to save on // allocating new strings for each substring. - // Could also use InputRow.AsState() to construct the input state. + // Could also use InputRow.AsStateForLearning() to construct the input state. Dictionary trainExamples = trainingExamples.ToDictionary( - t => State.Create(grammar.InputSymbol, new[] { ValueSubstring.Create(t.Key) }), + t => State.CreateForLearning(grammar.InputSymbol, new[] { ValueSubstring.Create(t.Key) }), t => (object) ValueSubstring.Create(t.Value)); var spec = new ExampleSpec(trainExamples); // Learn an entire Transformation.Text program (i.e. start at the grammar's start symbol) @@ -77,7 +77,7 @@ namespace Transformation.Text task.AdditionalInputs = additionalInputs.Select( input => - State.Create(grammar.InputSymbol, new[] { ValueSubstring.Create(input) })) + State.CreateForLearning(grammar.InputSymbol, new[] { ValueSubstring.Create(input) })) .ToList(); } IEnumerable topk = engine.Learn(task).RealizedPrograms; @@ -94,9 +94,9 @@ namespace Transformation.Text public string Run(string input) { Grammar grammar = Language.Grammar; - State inputState = new InputRow(input).AsState(); + State inputState = new InputRow(input).AsStateForExecution(); // Same as above without using the InputRow class: - inputState = State.Create(grammar.InputSymbol, new[] { ValueSubstring.Create(input) }); + inputState = State.CreateForExecution(grammar.InputSymbol, new[] { ValueSubstring.Create(input) }); var result = (ValueSubstring) ProgramNode.Invoke(inputState); return result?.Value; } diff --git a/Transformation.Text/Transformation.Text.csproj b/Transformation.Text/Transformation.Text.csproj index 85370de..0ed18fd 100644 --- a/Transformation.Text/Transformation.Text.csproj +++ b/Transformation.Text/Transformation.Text.csproj @@ -35,191 +35,13 @@ prompt 4 - - - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Extraction.Field.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Compound.Split.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Conditionals.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.CoreFxLab.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Detection.DataType.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Extraction.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Matching.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.File.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Split.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Learning.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Json.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Transformation.Text.Semantics.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Utils.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.dll - True - - - ..\packages\Microsoft.ProgramSynthesis.3.2.0\lib\net45\Microsoft.ProgramSynthesis.Wrangling.Json.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - - ..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - ..\packages\System.Interactive.3.0.0\lib\net45\System.Interactive.dll - True - - - ..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - - - - - - - - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/Transformation.Text/packages.config b/Transformation.Text/packages.config deleted file mode 100644 index 52db0c9..0000000 --- a/Transformation.Text/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..9b510cf --- /dev/null +++ b/nuget.config @@ -0,0 +1,10 @@ + + + + + + + + + +