From c61b8f46cba1bd25ad5bbd5faf14b2621ef9250c Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 21:50:43 +0100 Subject: [PATCH 01/61] add global.json to pin .net core sdk version --- global.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..b62f6cc --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "2.1.500" + } +} From 56a3334e24c4d1e81a5033bdcdcbd76245b63325 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 21:55:31 +0100 Subject: [PATCH 02/61] remove FSharp.NET.Sdk usage, deprecated in .net core sdk 1.0 --- Build/FParsec.Common.targets | 31 ------------------- FParsec/FParsec.fsproj | 2 +- Samples/Calculator/Calculator.fsproj | 2 +- Samples/FParsec.Samples.Common.targets | 4 --- .../FParsecVersion/InterpFParsec.fsproj | 2 +- Samples/JSON/JsonParser.fsproj | 2 +- Samples/PEG/PegParser.fsproj | 2 +- Samples/Tutorial/Tutorial.fsproj | 2 +- Test/Test.fsproj | 2 +- 9 files changed, 7 insertions(+), 42 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 63734fc..8c4a4a5 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -61,10 +61,6 @@ .NETCoreApp - - - - $(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets $(FSharpPortableLanguageTargets) @@ -132,31 +128,4 @@ - - - - $(IntermediateOutputPath)$(AssemblyName).ExtraAssemblyInfo.fs -] -[] -[] -[] -[] -[] -[] -[] -do () -]]> - - - - - - - \ No newline at end of file diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 37e029a..ad2638a 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -1,4 +1,4 @@ - + net40-client;net45;netstandard1.6;portable-net45+win8+wp8+wpa81 diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 0b75c50..24724fc 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index 2decb09..dba6d31 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -33,10 +33,6 @@ - - - - $(DefineConstants);PCL_FPARSEC diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index d88357f..850fb4c 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 3f20aa4..0cc6a67 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 3f20aa4..0cc6a67 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index f9a7f68..cf74b54 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -1,4 +1,4 @@ - + diff --git a/Test/Test.fsproj b/Test/Test.fsproj index 34c28b9..2ceec93 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -1,4 +1,4 @@ - + Exe false From 55aab7e3c30142e3ec64a2f5fbcf4f6c104aeef4 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:00:38 +0100 Subject: [PATCH 03/61] move metadata in a shared and auto imported Directory.Build.props --- Build/NuGet.props | 33 --------------------------------- Directory.Build.props | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 Directory.Build.props diff --git a/Build/NuGet.props b/Build/NuGet.props index f4fc57f..ea92eb4 100644 --- a/Build/NuGet.props +++ b/Build/NuGet.props @@ -2,39 +2,6 @@ FParsec-Big-Data-Edition - - 1.0.4 - 1.0.4.0 - 1.0.0.0 - $(FileVersion) - $(Version)-$(VersionSuffix) - - false - false - - Stephan Tolksdorf - Copyright © Stephan Tolksdorf - FParsec - FParsec is a parser combinator library for F#. - $(PackageTags);parser;combinator;f#;fsharp;c#;csharp;parsec;fparsec - http://www.quanttec.com/fparsec/license.html - http://www.quanttec.com/fparsec/ - git - https://github.com/stephan-tolksdorf/fparsec - $(Summary) - -You can find comprehensive documentation for FParsec at http://www.quanttec.com/fparsec. The documentation includes a feature list, a tutorial, a user’s guide and an API reference. - $(Description) - -This package uses the basic “low-trust” configuration of FParsec, which does not use any unverifiable code and is optimized for maximum portability. If you need to parse very large files or if you employ FParsec for performance-critical jobs, consider using the alternate “Big Data Edition” NuGet package (see https://nuget.org/packages/fparsec-big-data-edition). - - $(Description) - -This package uses a configuration of FParsec that supports very large input streams and is optimized for maximum performance in longer running processes. See http://www.quanttec.com/fparsec/download-and-installation.html for more information. - -This version of FParsec is currently not compatible with .NET Core. If you want to use .NET Core, please choose the other FParsec NuGet package instead (see https://nuget.org/packages/fparsec). - - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..a68c1df --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,34 @@ + + + + 1.0.4 + 1.0.4.0 + 1.0.0.0 + $(FileVersion) + $(Version)-$(VersionSuffix) + + Stephan Tolksdorf + Copyright © Stephan Tolksdorf + FParsec + FParsec is a parser combinator library for F#. + $(PackageTags);parser;combinator;f#;fsharp;c#;csharp;parsec;fparsec + http://www.quanttec.com/fparsec/license.html + http://www.quanttec.com/fparsec/ + git + https://github.com/stephan-tolksdorf/fparsec + $(Summary) + +You can find comprehensive documentation for FParsec at http://www.quanttec.com/fparsec. The documentation includes a feature list, a tutorial, a user’s guide and an API reference. + $(Description) + +This package uses the basic “low-trust” configuration of FParsec, which does not use any unverifiable code and is optimized for maximum portability. If you need to parse very large files or if you employ FParsec for performance-critical jobs, consider using the alternate “Big Data Edition” NuGet package (see https://nuget.org/packages/fparsec-big-data-edition). + + $(Description) + +This package uses a configuration of FParsec that supports very large input streams and is optimized for maximum performance in longer running processes. See http://www.quanttec.com/fparsec/download-and-installation.html for more information. + +This version of FParsec is currently not compatible with .NET Core. If you want to use .NET Core, please choose the other FParsec NuGet package instead (see https://nuget.org/packages/fparsec). + + + + From 7a2ba35ee3ff86a17f727d323d0d261da870113d Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:05:12 +0100 Subject: [PATCH 04/61] remove default --- Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index a68c1df..35d6e96 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,7 +14,6 @@ $(PackageTags);parser;combinator;f#;fsharp;c#;csharp;parsec;fparsec http://www.quanttec.com/fparsec/license.html http://www.quanttec.com/fparsec/ - git https://github.com/stephan-tolksdorf/fparsec $(Summary) From 5ce3cf59e3285570ea7fef93ff0ae0c04be385fc Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:15:31 +0100 Subject: [PATCH 05/61] simplify dependencies, use FSharp.Core 4.3.4 drop support for `.NETPortable`( `portable-net45+win8+wp8+wpa81` ) target framework --- Build/FParsec.Common.targets | 18 ------------------ FParsec/FParsec.fsproj | 4 ++++ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 8c4a4a5..423c5da 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -66,24 +66,6 @@ $(FSharpPortableLanguageTargets) - - - - - - - - FSharp.Core - FSharp.Core.dll - C:\Program Files (x86)\Reference Assemblies\Microsoft\FSharp\.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll - - - - - - - - true diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index ad2638a..03a8796 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -28,6 +28,10 @@ + + + + From 8ce5c0b014fbb9a01a8409c5a8030cbaeed0262e Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:26:41 +0100 Subject: [PATCH 06/61] drop support for `.NETPortable`( `portable-net45+win8+wp8+wpa81` ) target framework remove compiler define and code for `PCL_FPARSEC` the compiler defines `PCL` is not used anymore. The code is not yet removed because it's a big change, but because the compiler define is not set, the code is unused --- Build/FParsec.Common.targets | 27 +------------------ FParsec/FParsec.fsproj | 2 +- FParsecCS/FParsecCS.csproj | 2 +- Samples/FParsec.Samples.Common.targets | 19 +++---------- .../FParsecVersion/main.fs | 4 --- Samples/JSON/parser.fs | 4 --- Samples/PEG/main.fs | 4 --- Test/Test.fsproj | 19 +++---------- 8 files changed, 11 insertions(+), 70 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 423c5da..a482078 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -10,11 +10,6 @@ false - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets - - - false true @@ -31,7 +26,6 @@ netstandard1.6 $(TargetFrameworks);net40-client - $(TargetFrameworks);portable-net45+win8+wp8+wpa81 netcoreapp2.0 $(TargetFrameworks);net45 @@ -42,17 +36,6 @@ Client - - .NETPortable - v4.5 - Profile259 - .NETPortable,Version=v0.0,Profile=Profile259 - netcore - 3.259.4.0 - - false - - .NETFramework .NETStandard @@ -61,11 +44,6 @@ .NETCoreApp - - $(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets - $(FSharpPortableLanguageTargets) - - true @@ -91,15 +69,12 @@ $(DefineConstants);UNALIGNED_READS - - $(DefineConstants);PCL - $(DefineConstants);USE_STATIC_MAPPING_FOR_IS_ANY_OF - true + true diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 03a8796..11b736c 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard1.6;portable-net45+win8+wp8+wpa81 + net40-client;net45;netstandard1.6 true false /nooptimizationdata diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index 8451715..d265144 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard1.6;portable-net45+win8+wp8+wpa81 + net40-client;net45;netstandard1.6 false true 1591 diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index dba6d31..b8eba77 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -33,19 +33,8 @@ - - - $(DefineConstants);PCL_FPARSEC - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/Samples/FSharpParsingSample/FParsecVersion/main.fs b/Samples/FSharpParsingSample/FParsecVersion/main.fs index bfb514e..5e438f4 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/main.fs +++ b/Samples/FSharpParsingSample/FParsecVersion/main.fs @@ -19,11 +19,7 @@ let main(argv: string[]) = // is assumed to be the encoding. let fileName = argv.[0] let result = - #if PCL_FPARSEC - runParserOnString Parser.prog () fileName (System.IO.File.ReadAllText(fileName, System.Text.Encoding.UTF8)) - #else runParserOnFile Parser.prog () fileName System.Text.Encoding.UTF8 - #endif let myProg = match result with diff --git a/Samples/JSON/parser.fs b/Samples/JSON/parser.fs index 4de343a..e072f7d 100644 --- a/Samples/JSON/parser.fs +++ b/Samples/JSON/parser.fs @@ -85,11 +85,7 @@ let parseJsonString str = run json str // UTF8 is the default, but it will detect UTF16 or UTF32 byte-order marks automatically let parseJsonFile fileName encoding = -#if PCL_FPARSEC - runParserOnString json () fileName (System.IO.File.ReadAllText(fileName, encoding)) -#else runParserOnFile json () fileName encoding -#endif let parseJsonStream stream encoding = runParserOnStream json () "" stream System.Text.Encoding.UTF8 \ No newline at end of file diff --git a/Samples/PEG/main.fs b/Samples/PEG/main.fs index 28ab817..f02c42e 100644 --- a/Samples/PEG/main.fs +++ b/Samples/PEG/main.fs @@ -19,11 +19,7 @@ let main(args: string[]) = // is assumed to be the encoding. // The parser result will be the abstract syntax tree of the input file. let fileName = args.[0] -#if PCL_FPARSEC - let result = runParserOnString Parser.pGrammar () fileName (System.IO.File.ReadAllText(fileName, System.Text.Encoding.UTF8)) -#else let result = runParserOnFile Parser.pGrammar () fileName System.Text.Encoding.UTF8 -#endif // for the moment we just print out the AST match result with | Success (v, _, _) -> printf "The ast for the input file is:\n%A\n" v diff --git a/Test/Test.fsproj b/Test/Test.fsproj index 2ceec93..c5907b8 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -34,19 +34,8 @@ - - - $(DefineConstants);PCL - - - - - - - - - - - - + + + + From db9391e0e111520095164b26baeddf95cf2803b0 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:31:03 +0100 Subject: [PATCH 07/61] simplify, move metadata of package in the project --- Build/FParsec.Common.targets | 2 -- Build/NuGet.props | 7 ------- FParsec/FParsec.fsproj | 5 ++++- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 Build/NuGet.props diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index a482078..0a425f8 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -83,6 +83,4 @@ $(DefineConstants);STRONG_NAME - - \ No newline at end of file diff --git a/Build/NuGet.props b/Build/NuGet.props deleted file mode 100644 index ea92eb4..0000000 --- a/Build/NuGet.props +++ /dev/null @@ -1,7 +0,0 @@ - - - FParsec-Big-Data-Edition - - - - \ No newline at end of file diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 11b736c..c986968 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -7,6 +7,10 @@ /nooptimizationdata + + FParsec-Big-Data-Edition + + @@ -40,7 +44,6 @@ - From 77ba905f1faa475f2cd4ebc2ae36d11ff05c1077 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:35:18 +0100 Subject: [PATCH 08/61] remove MergedFParsecPackage conditional, i'll embeed FParsecCS later --- FParsec/FParsec.fsproj | 13 +------------ FParsecCS/FParsecCS.csproj | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index c986968..5364797 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -28,7 +28,7 @@ - + @@ -36,15 +36,4 @@ - - - - - - - - - - - diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index d265144..8b6a798 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -5,7 +5,7 @@ false true 1591 - false + false From 33fa6f63c6c3369f3bcc3d3d6aeadfece5b04fd5 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:37:31 +0100 Subject: [PATCH 09/61] drop support for `netstandard1.6`, support `netstandard2.0` instead --- Build/FParsec.Common.targets | 3 +-- FParsec/FParsec.fsproj | 2 +- FParsecCS/FParsecCS.csproj | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 0a425f8..e9ce643 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -24,7 +24,7 @@ net40-client;net45 - netstandard1.6 + netstandard2.0 $(TargetFrameworks);net40-client netcoreapp2.0 $(TargetFrameworks);net45 @@ -38,7 +38,6 @@ .NETFramework - .NETStandard .NETStandard .NETCoreApp .NETCoreApp diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 5364797..7863d82 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard1.6 + net40-client;net45;netstandard2.0 true false /nooptimizationdata diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index 8b6a798..0e363c7 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard1.6 + net40-client;net45;netstandard2.0 false true 1591 From 5231fbde3c91f9f32bfeb993056fedd68238cb6f Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:42:49 +0100 Subject: [PATCH 10/61] property `TargetFrameworkIdentifier` is automatically defined by .NET Sdk --- Build/FParsec.Common.targets | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index e9ce643..864bcec 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -31,18 +31,10 @@ - .NETFramework v4.0 Client - - .NETFramework - .NETStandard - .NETCoreApp - .NETCoreApp - - true From 1edf6064e41ebb5be56354f8ecbc684c1a383ca5 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:44:28 +0100 Subject: [PATCH 11/61] use default conventions for compile c# --- FParsecCS/FParsecCS.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index 0e363c7..7874716 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -2,7 +2,6 @@ net40-client;net45;netstandard2.0 - false true 1591 false @@ -10,11 +9,6 @@ - - - - - From 8b690e287cf9076e32786b55511d32c975444008 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:49:34 +0100 Subject: [PATCH 12/61] remove VS11 projects --- Build/VS11/Calculator.fsproj | 78 -------------------- Build/VS11/FParsec.fsproj | 116 ------------------------------ Build/VS11/FParsec.sln | 85 ---------------------- Build/VS11/FParsecCS.csproj | 86 ---------------------- Build/VS11/InterpFParsec.fsproj | 90 ----------------------- Build/VS11/InterpLexYacc.fsproj | 109 ---------------------------- Build/VS11/JSON.fsproj | 86 ---------------------- Build/VS11/PEG.fsproj | 86 ---------------------- Build/VS11/Test.fsproj | 122 -------------------------------- Build/VS11/Tutorial.fsproj | 78 -------------------- Build/VS11/packages.config | 5 -- 11 files changed, 941 deletions(-) delete mode 100644 Build/VS11/Calculator.fsproj delete mode 100644 Build/VS11/FParsec.fsproj delete mode 100644 Build/VS11/FParsec.sln delete mode 100644 Build/VS11/FParsecCS.csproj delete mode 100644 Build/VS11/InterpFParsec.fsproj delete mode 100644 Build/VS11/InterpLexYacc.fsproj delete mode 100644 Build/VS11/JSON.fsproj delete mode 100644 Build/VS11/PEG.fsproj delete mode 100644 Build/VS11/Test.fsproj delete mode 100644 Build/VS11/Tutorial.fsproj delete mode 100644 Build/VS11/packages.config diff --git a/Build/VS11/Calculator.fsproj b/Build/VS11/Calculator.fsproj deleted file mode 100644 index 940e793..0000000 --- a/Build/VS11/Calculator.fsproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {ec65683f-e2a1-4523-bf89-b081b20b0cc5} - Exe - Calculator - calculator - Calculator - v4.5 - 4.3.0.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - calculator.fs - - - - - True - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - \ No newline at end of file diff --git a/Build/VS11/FParsec.fsproj b/Build/VS11/FParsec.fsproj deleted file mode 100644 index 3340360..0000000 --- a/Build/VS11/FParsec.fsproj +++ /dev/null @@ -1,116 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - Library - FParsec - FParsec - FParsec - v4.5 - 4.3.0.0 - - - true - full - false - bin\Debug\ - $(OutputPath)\$(AssemblyName).XML - TRACE;DEBUG;NOINLINE;DEBUG_STATIC_MAPPING;AGGRESSIVE_INLINING;USE_STATIC_MAPPING_FOR_IS_ANY_OF;UNALIGNED_READS - prompt - 3 - /nooptimizationdata - - - pdbonly - true - bin\Release\ - $(OutputPath)\$(AssemblyName).XML - TRACE;AGGRESSIVE_INLINING;USE_STATIC_MAPPING_FOR_IS_ANY_OF;UNALIGNED_READS - prompt - 3 - false - /nooptimizationdata - - - $(OutputPath)\$(AssemblyName).XML - - - - False - - - - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - - - AssemblyInfo.fs - - - Internals.fs - - - Range.fs - - - Emit.fs - - - StaticMapping.fsi - - - StaticMapping.fs - - - Error.fsi - - - Error.fs - - - Primitives.fsi - - - Primitives.fs - - - CharParsers.fsi - - - CharParsers.fs - - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - \ No newline at end of file diff --git a/Build/VS11/FParsec.sln b/Build/VS11/FParsec.sln deleted file mode 100644 index 39b826e..0000000 --- a/Build/VS11/FParsec.sln +++ /dev/null @@ -1,85 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 11 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E2678E0B-F79F-4461-AA53-7E74D12CF6ED}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharpParsingSample", "FSharpParsingSample", "{8493F4B6-CCE9-4A7B-9798-B567DA6A1367}" - ProjectSection(SolutionItems) = preProject - ..\..\Samples\FSharpParsingSample\readme.txt = ..\..\Samples\FSharpParsingSample\readme.txt - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FParsecCS", "FParsecCS.csproj", "{501423C3-8EA5-4E54-8D9C-EF60272B57FA}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FParsec", "FParsec.fsproj", "{8EA340D3-E9E0-477E-9AC3-FBFDF3BAD41E}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test", "Test.fsproj", "{A5957BE0-A31B-4245-BE7F-2218CAF83541}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator", "Calculator.fsproj", "{EC65683F-E2A1-4523-BF89-B081B20B0CC5}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "PEG", "PEG.fsproj", "{368D4810-4CB8-43E7-901F-3050091F114E}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JSON", "JSON.fsproj", "{5FBFE1A7-82C2-49CE-92B0-B0EC04021419}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InterpFParsec", "InterpFParsec.fsproj", "{ECC92E10-C53B-40FC-9033-F3BB63A6F7A8}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InterpLexYacc", "InterpLexYacc.fsproj", "{1CDA7320-DBCF-465C-B88A-11A2EC0625DA}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tutorial", "Tutorial.fsproj", "{B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1CDA7320-DBCF-465C-B88A-11A2EC0625DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CDA7320-DBCF-465C-B88A-11A2EC0625DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CDA7320-DBCF-465C-B88A-11A2EC0625DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CDA7320-DBCF-465C-B88A-11A2EC0625DA}.Release|Any CPU.Build.0 = Release|Any CPU - {368D4810-4CB8-43E7-901F-3050091F114E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {368D4810-4CB8-43E7-901F-3050091F114E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {368D4810-4CB8-43E7-901F-3050091F114E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {368D4810-4CB8-43E7-901F-3050091F114E}.Release|Any CPU.Build.0 = Release|Any CPU - {501423C3-8EA5-4E54-8D9C-EF60272B57FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {501423C3-8EA5-4E54-8D9C-EF60272B57FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {501423C3-8EA5-4E54-8D9C-EF60272B57FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {501423C3-8EA5-4E54-8D9C-EF60272B57FA}.Release|Any CPU.Build.0 = Release|Any CPU - {5FBFE1A7-82C2-49CE-92B0-B0EC04021419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FBFE1A7-82C2-49CE-92B0-B0EC04021419}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FBFE1A7-82C2-49CE-92B0-B0EC04021419}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FBFE1A7-82C2-49CE-92B0-B0EC04021419}.Release|Any CPU.Build.0 = Release|Any CPU - {8EA340D3-E9E0-477E-9AC3-FBFDF3BAD41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EA340D3-E9E0-477E-9AC3-FBFDF3BAD41E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EA340D3-E9E0-477E-9AC3-FBFDF3BAD41E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EA340D3-E9E0-477E-9AC3-FBFDF3BAD41E}.Release|Any CPU.Build.0 = Release|Any CPU - {A5957BE0-A31B-4245-BE7F-2218CAF83541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5957BE0-A31B-4245-BE7F-2218CAF83541}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5957BE0-A31B-4245-BE7F-2218CAF83541}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5957BE0-A31B-4245-BE7F-2218CAF83541}.Release|Any CPU.Build.0 = Release|Any CPU - {B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE}.Release|Any CPU.Build.0 = Release|Any CPU - {EC65683F-E2A1-4523-BF89-B081B20B0CC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC65683F-E2A1-4523-BF89-B081B20B0CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC65683F-E2A1-4523-BF89-B081B20B0CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC65683F-E2A1-4523-BF89-B081B20B0CC5}.Release|Any CPU.Build.0 = Release|Any CPU - {ECC92E10-C53B-40FC-9033-F3BB63A6F7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECC92E10-C53B-40FC-9033-F3BB63A6F7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECC92E10-C53B-40FC-9033-F3BB63A6F7A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECC92E10-C53B-40FC-9033-F3BB63A6F7A8}.Release|Any CPU.Build.0 = Release|Any CPU - - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1CDA7320-DBCF-465C-B88A-11A2EC0625DA} = {8493F4B6-CCE9-4A7B-9798-B567DA6A1367} - {368D4810-4CB8-43E7-901F-3050091F114E} = {E2678E0B-F79F-4461-AA53-7E74D12CF6ED} - {5FBFE1A7-82C2-49CE-92B0-B0EC04021419} = {E2678E0B-F79F-4461-AA53-7E74D12CF6ED} - {8493F4B6-CCE9-4A7B-9798-B567DA6A1367} = {E2678E0B-F79F-4461-AA53-7E74D12CF6ED} - {B0FED0AB-EF96-4E20-B7BB-EE478FACB5BE} = {E2678E0B-F79F-4461-AA53-7E74D12CF6ED} - {EC65683F-E2A1-4523-BF89-B081B20B0CC5} = {E2678E0B-F79F-4461-AA53-7E74D12CF6ED} - {ECC92E10-C53B-40FC-9033-F3BB63A6F7A8} = {8493F4B6-CCE9-4A7B-9798-B567DA6A1367} - EndGlobalSection -EndGlobal diff --git a/Build/VS11/FParsecCS.csproj b/Build/VS11/FParsecCS.csproj deleted file mode 100644 index 9aa8932..0000000 --- a/Build/VS11/FParsecCS.csproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - 11 - Debug - AnyCPU - {501423C3-8EA5-4E54-8D9C-EF60272B57FA} - Library - Properties - FParsec - FParsecCS - v4.5 - 4.3.0.0 - 512 - - - true - pdbonly - false - bin\Debug\ - TRACE;DEBUG;AGGRESSIVE_INLINING;UNALIGNED_READS - prompt - 4 - true - $(OutputPath)\$(AssemblyName).XML - 1591 - - - pdbonly - true - bin\Release\ - TRACE;AGGRESSIVE_INLINING;UNALIGNED_READS - prompt - 4 - true - true - $(OutputPath)\$(AssemblyName).XML - 1591 - - - $(OutputPath)\$(AssemblyName).XML - 1591 - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Build/VS11/InterpFParsec.fsproj b/Build/VS11/InterpFParsec.fsproj deleted file mode 100644 index 8d2c911..0000000 --- a/Build/VS11/InterpFParsec.fsproj +++ /dev/null @@ -1,90 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {ecc92e10-c53b-40fc-9033-f3bb63a6f7a8} - Exe - FParsecVersion - interp_fparsec - FParsecVersion - v4.5 - 4.3.0.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - ..\..\..\..\Samples\FSharpParsingSample\LexYaccVersion\test.lang - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - ..\..\..\..\Samples\FSharpParsingSample\LexYaccVersion\test.lang - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - ast.fs - - - interp.fs - - - parser.fs - - - main.fs - - - - - True - - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - \ No newline at end of file diff --git a/Build/VS11/InterpLexYacc.fsproj b/Build/VS11/InterpLexYacc.fsproj deleted file mode 100644 index 94e8408..0000000 --- a/Build/VS11/InterpLexYacc.fsproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {1cda7320-dbcf-465c-b88a-11a2ec0625da} - Exe - LexYaccVersion - interp_lexyacc - LexYaccVersion - v4.5 - 4.3.0.0 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - --mlcompatibility - ..\..\..\..\Samples\FSharpParsingSample\LexYaccVersion\test.lang - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - --mlcompatibility - ..\..\..\..\Samples\FSharpParsingSample\LexYaccVersion\test.lang - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - ast.fs - - - interp.fs - - - lex.fsl - --unicode -o ..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs - - - pars.fsy - --module Parser -o ..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs - - - pars.fsi - - - pars.fs - - - lex.fs - - - main.fs - - - - - - True - - - packages\FsLexYacc.Runtime.6.1.0\lib\net40\FsLexYacc.Runtime.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}. - - - - - \ No newline at end of file diff --git a/Build/VS11/JSON.fsproj b/Build/VS11/JSON.fsproj deleted file mode 100644 index d1fd5c3..0000000 --- a/Build/VS11/JSON.fsproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {5fbfe1a7-82c2-49ce-92b0-b0ec04021419} - Exe - JSON - json - JSON - v4.5 - 4.3.0.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - ..\..\..\..\Samples\JSON\test_json.txt - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - ..\..\..\..\Samples\JSON\test_json.txt - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - ast.fs - - - parser.fs - - - main.fs - - - - - True - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - \ No newline at end of file diff --git a/Build/VS11/PEG.fsproj b/Build/VS11/PEG.fsproj deleted file mode 100644 index e526246..0000000 --- a/Build/VS11/PEG.fsproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {368d4810-4cb8-43e7-901f-3050091f114e} - Exe - PEG - peg - PEG - v4.5 - 4.3.0.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - ..\..\..\..\Samples\PEG\test_peg.txt - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - ..\..\..\..\Samples\PEG\test_peg.txt - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - ast.fs - - - parser.fs - - - main.fs - - - - - True - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - \ No newline at end of file diff --git a/Build/VS11/Test.fsproj b/Build/VS11/Test.fsproj deleted file mode 100644 index c1f9296..0000000 --- a/Build/VS11/Test.fsproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {a5957be0-a31b-4245-be7f-2218caf83541} - Exe - Test - Test - Test - v4.5 - 4.3.0.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 3 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 3 - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - Test.fs - - - BufferTests.fs - - - CharSetTests.fs - - - HexFloatTests.fs - - - TextTests.fs - - - CloningTests.fs - - - StringBufferTests.fs - - - CharStreamTests.fs - - - PrimitivesTests.fs - - - CharParsersTests.fs - - - IdentifierValidatorTests.fs - - - OperatorPrecedenceParserTests.fs - - - RangeTests.fs - - - StaticMappingTests.fs - - - AllTests.fs - - - - - True - - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - - \ No newline at end of file diff --git a/Build/VS11/Tutorial.fsproj b/Build/VS11/Tutorial.fsproj deleted file mode 100644 index 8bc461a..0000000 --- a/Build/VS11/Tutorial.fsproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - 11 - Debug - AnyCPU - 2.0 - {b0fed0ab-ef96-4e20-b7bb-ee478facb5be} - Exe - Tutorial - tutorial - Tutorial - v4.5 - 4.3.0.0 - true - - - true - full - false - false - bin\Debug\ - DEBUG;TRACE - 3 - - - pdbonly - true - true - bin\Release\ - TRACE - 3 - - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - tutorial.fs - - - - - True - - - - - FParsecCS - {501423c3-8ea5-4e54-8d9c-ef60272b57fa} - False - - - FParsec - {8ea340d3-e9e0-477e-9ac3-fbfdf3bad41e} - False - - - - \ No newline at end of file diff --git a/Build/VS11/packages.config b/Build/VS11/packages.config deleted file mode 100644 index 274064a..0000000 --- a/Build/VS11/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 3a4387d215629975246c228080b02364701950bc Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:57:25 +0100 Subject: [PATCH 13/61] drop support for discontinued `net40-client` target framework ref https://docs.microsoft.com/en-us/dotnet/framework/deployment/client-profile --- Build/FParsec.Common.targets | 10 ++-------- FParsec/FParsec.fsproj | 2 +- FParsecCS/FParsecCS.csproj | 2 +- Test/Test.fsproj | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 864bcec..0e3a99b 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -21,20 +21,14 @@ - net40-client;net45 + net45 netstandard2.0 - $(TargetFrameworks);net40-client netcoreapp2.0 $(TargetFrameworks);net45 - - v4.0 - Client - - true @@ -54,7 +48,7 @@ $(DefineConstants);SMALL_STATETAG - + $(DefineConstants);AGGRESSIVE_INLINING diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 7863d82..21ae320 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard2.0 + net45;netstandard2.0 true false /nooptimizationdata diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index 7874716..47c8ee2 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -1,7 +1,7 @@ - net40-client;net45;netstandard2.0 + net45;netstandard2.0 true 1591 false diff --git a/Test/Test.fsproj b/Test/Test.fsproj index c5907b8..906e2f2 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -2,7 +2,7 @@ Exe false - net40-client;net45;netcoreapp2.0 + net45;netcoreapp2.0 From 1cb3ede6ef5ffbca6d81a465f17faa56beccd754 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 22:59:52 +0100 Subject: [PATCH 14/61] use conventions of .NET Sdk --- Build/FParsec.Common.targets | 3 --- 1 file changed, 3 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 0e3a99b..7ff6da8 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -29,9 +29,6 @@ $(TargetFrameworks);net45 - - true - From 2a17c0fda0be6e9ebd1a80e441b74a8b98d185f6 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:07:14 +0100 Subject: [PATCH 15/61] remove useless `CoreOnNonWin` property --- Build/FParsec.Common.targets | 11 ----------- Samples/FParsec.Samples.Common.targets | 8 +------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 7ff6da8..5acb940 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -10,23 +10,12 @@ false - - false - true - - - - - - net45 netstandard2.0 netcoreapp2.0 - $(TargetFrameworks);net45 diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index b8eba77..3f9d354 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -12,17 +12,11 @@ $(DefineConstants);LOW_TRUST - - false - true - - net45 - netcoreapp2.0 - $(TargetFrameworks);net45 + netcoreapp2.0;net45 From acc09ed71910ef1ccea4963e75edf0874f35d921 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:10:48 +0100 Subject: [PATCH 16/61] refactor common properties in Directory.Build.props --- Build/FParsec.Common.targets | 10 ---------- Directory.Build.props | 10 ++++++++++ Samples/FParsec.Samples.Common.targets | 8 -------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 5acb940..2e8960e 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -1,15 +1,5 @@ - - false - true - - - true - $(DefineConstants);LOW_TRUST - false - - net45 diff --git a/Directory.Build.props b/Directory.Build.props index 35d6e96..a3c2293 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,4 +30,14 @@ This version of FParsec is currently not compatible with .NET Core. If you want + + false + true + + + true + $(DefineConstants);LOW_TRUST + false + + diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index 3f9d354..ea42687 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -4,14 +4,6 @@ false - - false - - - true - $(DefineConstants);LOW_TRUST - - net45 From d25e019cbc020011e8f0a5811f6d75d62e822793 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:12:37 +0100 Subject: [PATCH 17/61] more properties into test projects --- Samples/Calculator/Calculator.fsproj | 5 +++++ Samples/FParsec.Samples.Common.targets | 5 ----- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 5 +++++ Samples/JSON/JsonParser.fsproj | 5 +++++ Samples/PEG/PegParser.fsproj | 5 +++++ Samples/Tutorial/Tutorial.fsproj | 5 +++++ 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 24724fc..2ac7e83 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -1,4 +1,9 @@ + + Exe + false + + diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index ea42687..e190aee 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -1,9 +1,4 @@ - - Exe - false - - net45 diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 850fb4c..aea91d8 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -1,4 +1,9 @@ + + Exe + false + + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 0cc6a67..57e74ef 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -1,4 +1,9 @@ + + Exe + false + + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 0cc6a67..57e74ef 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -1,4 +1,9 @@ + + Exe + false + + diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index cf74b54..a2abbf2 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -1,4 +1,9 @@ + + Exe + false + + From 019d15a8f7de4e0df19860b88510c152abfd1e75 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:14:32 +0100 Subject: [PATCH 18/61] move shared deps into projects --- FParsec/FParsec.fsproj | 2 +- Samples/Calculator/Calculator.fsproj | 5 +++++ Samples/FParsec.Samples.Common.targets | 8 -------- .../FParsecVersion/InterpFParsec.fsproj | 5 +++++ Samples/JSON/JsonParser.fsproj | 5 +++++ Samples/PEG/PegParser.fsproj | 5 +++++ Samples/Tutorial/Tutorial.fsproj | 5 +++++ 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 21ae320..60f1a7e 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -33,7 +33,7 @@ - + diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 2ac7e83..2d06739 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -8,4 +8,9 @@ + + + + + diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index e190aee..323c987 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -6,14 +6,6 @@ netcoreapp2.0;net45 - - - - - - - - diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index aea91d8..f3631fa 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -11,4 +11,9 @@ + + + + + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 57e74ef..a519ab9 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -10,4 +10,9 @@ + + + + + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 57e74ef..a519ab9 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -10,4 +10,9 @@ + + + + + diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index a2abbf2..1d34344 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -8,4 +8,9 @@ + + + + + From 50bc6ee34cc48a678f09d2daa2ab8bf9e15d7450 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:16:17 +0100 Subject: [PATCH 19/61] move shared deps into projects --- Samples/Calculator/Calculator.fsproj | 5 +++++ Samples/FParsec.Samples.Common.targets | 4 ---- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 5 +++++ Samples/JSON/JsonParser.fsproj | 5 +++++ Samples/PEG/PegParser.fsproj | 5 +++++ Samples/Tutorial/Tutorial.fsproj | 5 +++++ 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 2d06739..4502d86 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -13,4 +13,9 @@ + + + + + diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index 323c987..db8683d 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -6,8 +6,4 @@ netcoreapp2.0;net45 - - - - \ No newline at end of file diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index f3631fa..7fd0a30 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -16,4 +16,9 @@ + + + + + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index a519ab9..678b05f 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -15,4 +15,9 @@ + + + + + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index a519ab9..678b05f 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -15,4 +15,9 @@ + + + + + diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index 1d34344..31d3cd3 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -13,4 +13,9 @@ + + + + + From 2120367d91960403c593ba38c6f5df6f372f8ac4 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:18:50 +0100 Subject: [PATCH 20/61] move in the correct place --- Directory.Build.props | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a3c2293..cf06c32 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,15 @@ + + false + true + + + true + $(DefineConstants);LOW_TRUST + false + + 1.0.4 1.0.4.0 @@ -30,14 +40,4 @@ This version of FParsec is currently not compatible with .NET Core. If you want - - false - true - - - true - $(DefineConstants);LOW_TRUST - false - - From ed642c99f4e83602ea7b88d0f1c48c4428df32a1 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:24:24 +0100 Subject: [PATCH 21/61] move shared deps into projects --- Samples/Calculator/Calculator.fsproj | 2 ++ Samples/FParsec.Samples.Common.targets | 6 +----- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 2 ++ Samples/JSON/JsonParser.fsproj | 2 ++ Samples/PEG/PegParser.fsproj | 2 ++ Samples/Tutorial/Tutorial.fsproj | 2 ++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 4502d86..4ad7521 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -1,5 +1,7 @@ + netcoreapp2.0;net45 + net45 Exe false diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets index db8683d..ea75b39 100644 --- a/Samples/FParsec.Samples.Common.targets +++ b/Samples/FParsec.Samples.Common.targets @@ -1,9 +1,5 @@ - - net45 - - - netcoreapp2.0;net45 + \ No newline at end of file diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 7fd0a30..464f86b 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -1,5 +1,7 @@ + netcoreapp2.0;net45 + net45 Exe false diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 678b05f..7ad4658 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -1,5 +1,7 @@ + netcoreapp2.0;net45 + net45 Exe false diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 678b05f..7ad4658 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -1,5 +1,7 @@ + netcoreapp2.0;net45 + net45 Exe false diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index 31d3cd3..8cf2acb 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -1,5 +1,7 @@ + netcoreapp2.0;net45 + net45 Exe false From b0c4fb6fd6ade8cce856b65d2b69ca3d315e6337 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:25:52 +0100 Subject: [PATCH 22/61] remove now useless FParsec.Samples.Common.targets --- Samples/Calculator/Calculator.fsproj | 1 - Samples/FParsec.Samples.Common.targets | 5 ----- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 1 - Samples/JSON/JsonParser.fsproj | 1 - Samples/PEG/PegParser.fsproj | 1 - Samples/Tutorial/Tutorial.fsproj | 1 - 6 files changed, 10 deletions(-) delete mode 100644 Samples/FParsec.Samples.Common.targets diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index 4ad7521..f20e5c6 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -6,7 +6,6 @@ false - diff --git a/Samples/FParsec.Samples.Common.targets b/Samples/FParsec.Samples.Common.targets deleted file mode 100644 index ea75b39..0000000 --- a/Samples/FParsec.Samples.Common.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 464f86b..6bb17a6 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -6,7 +6,6 @@ false - diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 7ad4658..dafcbe6 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -6,7 +6,6 @@ false - diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 7ad4658..dafcbe6 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -6,7 +6,6 @@ false - diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index 8cf2acb..e33ffee 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -6,7 +6,6 @@ false - From 4636d21cb329b25ccf015c0b69c9f0cb40fc8ad3 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:29:26 +0100 Subject: [PATCH 23/61] simplify project, move TargetFrameworks in projects --- Build/FParsec.Common.targets | 8 -------- FParsec/FParsec.fsproj | 1 + FParsecCS/FParsecCS.csproj | 1 + Test/Test.fsproj | 3 ++- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 2e8960e..f56828c 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -1,13 +1,5 @@ - - net45 - - - netstandard2.0 - netcoreapp2.0 - - diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 60f1a7e..a1216a4 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -2,6 +2,7 @@ net45;netstandard2.0 + net45 true false /nooptimizationdata diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index 47c8ee2..cd85679 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -2,6 +2,7 @@ net45;netstandard2.0 + net45 true 1591 false diff --git a/Test/Test.fsproj b/Test/Test.fsproj index 906e2f2..dbbd338 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -1,8 +1,9 @@ + net45;netcoreapp2.0 + net45 Exe false - net45;netcoreapp2.0 From 088f6721eb5a8d71c7322bb86253aeb9dea0e513 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:34:57 +0100 Subject: [PATCH 24/61] move shared properties in Directory.Build.props --- Build/FParsec.Common.targets | 13 ------------- Directory.Build.props | 5 +++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index f56828c..e6787f2 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -1,18 +1,5 @@ - - - - $(DefineConstants);DEBUG - - - - - $(DefineConstants);RELEASE - - - - $(DefineConstants);SMALL_STATETAG diff --git a/Directory.Build.props b/Directory.Build.props index cf06c32..6ee3f0e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,11 @@ false + + $(DefineConstants);DEBUG + $(DefineConstants);RELEASE + + 1.0.4 1.0.4.0 From f7b5c65c19e01e4b997196fff31865060a2d6182 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:36:58 +0100 Subject: [PATCH 25/61] cleanup --- Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6ee3f0e..3df5af7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,11 +16,10 @@ - 1.0.4 + 1.0.4 1.0.4.0 1.0.0.0 $(FileVersion) - $(Version)-$(VersionSuffix) Stephan Tolksdorf Copyright © Stephan Tolksdorf From 21fed8e9b199f3b9fa99048530104acea0a51550 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:42:43 +0100 Subject: [PATCH 26/61] more shared props near usage in projects --- Build/FParsec.Common.targets | 3 --- FParsec/FParsec.fsproj | 5 +++-- Test/Test.fsproj | 4 ++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index e6787f2..59e5aa0 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -9,9 +9,6 @@ $(DefineConstants);UNALIGNED_READS - - $(DefineConstants);USE_STATIC_MAPPING_FOR_IS_ANY_OF - true diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index a1216a4..1c63aa2 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -8,8 +8,9 @@ /nooptimizationdata - - FParsec-Big-Data-Edition + + FParsec-Big-Data-Edition + $(DefineConstants);USE_STATIC_MAPPING_FOR_IS_ANY_OF diff --git a/Test/Test.fsproj b/Test/Test.fsproj index dbbd338..297af2c 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -8,6 +8,10 @@ + + $(DefineConstants);USE_STATIC_MAPPING_FOR_IS_ANY_OF + + $(DefineConstants);NETCORE From fb0c9d054b302c7e0a4fbd542ceca734dfa1e6df Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:49:05 +0100 Subject: [PATCH 27/61] pin fsharp.core --- Test/Test.fsproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Test/Test.fsproj b/Test/Test.fsproj index 297af2c..cc6adc4 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -42,5 +42,9 @@ + + + + From 1fb79191b8598b395212970bbf6159baf7e310d6 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:49:22 +0100 Subject: [PATCH 28/61] cleanup --- Test/Test.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test/Test.fsproj b/Test/Test.fsproj index cc6adc4..2e75afa 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -40,11 +40,11 @@ - - + + From 6b60ab629bd2b457b7f2e17979ef785024f5392c Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:50:43 +0100 Subject: [PATCH 29/61] upgrade from netcoreapp2.0 to netcoreapp2.1 --- Samples/Calculator/Calculator.fsproj | 2 +- Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 2 +- Samples/JSON/JsonParser.fsproj | 2 +- Samples/PEG/PegParser.fsproj | 2 +- Samples/Tutorial/Tutorial.fsproj | 2 +- Test/Test.fsproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index f20e5c6..ba90c7d 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -1,6 +1,6 @@ - netcoreapp2.0;net45 + netcoreapp2.1;net45 net45 Exe false diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 6bb17a6..8c1e8ed 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -1,6 +1,6 @@ - netcoreapp2.0;net45 + netcoreapp2.1;net45 net45 Exe false diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index dafcbe6..9f0e51e 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -1,6 +1,6 @@ - netcoreapp2.0;net45 + netcoreapp2.1;net45 net45 Exe false diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index dafcbe6..9f0e51e 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -1,6 +1,6 @@ - netcoreapp2.0;net45 + netcoreapp2.1;net45 net45 Exe false diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index e33ffee..da98e61 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -1,6 +1,6 @@ - netcoreapp2.0;net45 + netcoreapp2.1;net45 net45 Exe false diff --git a/Test/Test.fsproj b/Test/Test.fsproj index 2e75afa..f62b48b 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -1,6 +1,6 @@ - net45;netcoreapp2.0 + net45;netcoreapp2.1 net45 Exe false From 253a950a1a4b0036fc75c1671520a8e604287c2d Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:54:14 +0100 Subject: [PATCH 30/61] fix fsharp.core --- FParsec/FParsec.fsproj | 2 +- FParsecCS/FParsecCS.csproj | 4 ++++ Samples/Calculator/Calculator.fsproj | 2 +- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 2 +- Samples/JSON/JsonParser.fsproj | 2 +- Samples/PEG/PegParser.fsproj | 2 +- Samples/Tutorial/Tutorial.fsproj | 2 +- Test/Test.fsproj | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 1c63aa2..fee8202 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -35,7 +35,7 @@ - + diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index cd85679..adf2948 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -14,4 +14,8 @@ + + + + diff --git a/Samples/Calculator/Calculator.fsproj b/Samples/Calculator/Calculator.fsproj index ba90c7d..14897f6 100644 --- a/Samples/Calculator/Calculator.fsproj +++ b/Samples/Calculator/Calculator.fsproj @@ -11,7 +11,7 @@ - + diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 8c1e8ed..8a44224 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -14,7 +14,7 @@ - + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index 9f0e51e..e141dfd 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -13,7 +13,7 @@ - + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index 9f0e51e..e141dfd 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -13,7 +13,7 @@ - + diff --git a/Samples/Tutorial/Tutorial.fsproj b/Samples/Tutorial/Tutorial.fsproj index da98e61..0d22382 100644 --- a/Samples/Tutorial/Tutorial.fsproj +++ b/Samples/Tutorial/Tutorial.fsproj @@ -11,7 +11,7 @@ - + diff --git a/Test/Test.fsproj b/Test/Test.fsproj index f62b48b..f90f8dd 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -40,7 +40,7 @@ - + From fa69e366fd65630988e1b39159d6393fff088145 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Tue, 19 Feb 2019 23:58:56 +0100 Subject: [PATCH 31/61] fix p2p --- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 8a44224..51e6b9b 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -18,8 +18,8 @@ - - + + From e53156e4b67cd3fc892201d05954cf5dbbe39f66 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 00:18:59 +0100 Subject: [PATCH 32/61] embeed FParsecCS.dll into FParsec nupkg --- FParsec/FParsec.fsproj | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index fee8202..0817713 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -31,11 +31,23 @@ - + + + + $(TargetsForTfmSpecificBuildOutput);IncludeFParsecCSOutput + + + + + + + + + From 985c6abb0659fe61ef31c0bf1a846814f12a5bee Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 00:21:30 +0100 Subject: [PATCH 33/61] include pdb in nupkg --- Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 3df5af7..ba3a666 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,6 +15,10 @@ $(DefineConstants);RELEASE + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + 1.0.4 1.0.4.0 From 348c05edf2442a857d0a32db513c40ec8ed4a6cb Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 00:35:40 +0100 Subject: [PATCH 34/61] update pack powershell script --- pack.ps1 | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/pack.ps1 b/pack.ps1 index 4687d04..ecc2315 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -1,23 +1,18 @@ # This PowerShell script builds the FParsec NuGet packages. -# Currently, it uses msbuild and needs to be run in the VS2017 Command Prompt, -# so that it can build PCL assemblies. -# It also requires the nuget.exe, see $nuget below. # # Run this script from the VS2017 Command Prompt, e.g. with # powershell -File pack.ps1 -versionSuffix "" > pack.out.txt Param( - [string]$versionSuffix = "dev", - [string]$nuget = ".\nuget.exe" + [string]$versionSuffix = "dev" ) $ErrorActionPreference = 'Stop' $configs = $('Release-LowTrust', 'Release') -$testTargetFrameworks = @{'Release' = $('net45', 'net40-client') - 'Release-LowTrust' = $('netcoreapp2.0', 'net45')} -$testPCL = $true +$testTargetFrameworks = @{'Release' = $('net45') + 'Release-LowTrust' = $('netcoreapp2.1', 'net45')} function invoke([string] $cmd) { echo '' @@ -35,32 +30,11 @@ foreach ($folder in $("FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\ } foreach ($config in $configs) { - $props = "/p:Configuration=$config /p:VersionSuffix=$versionSuffix /p:FParsecNuGet=true" - invoke "msbuild /t:Restore $props" - invoke "msbuild /t:Clean $props" - invoke "msbuild FParsec /t:Build $props" - invoke "msbuild Test /t:Build $props" + $props = "-c $config -p:VersionSuffix=$versionSuffix -p:FParsecNuGet=true" + invoke "dotnet build FParsec $props" + invoke "dotnet build Test $props" foreach ($tf in $testTargetFrameworks[$config]) { - if ($tf.StartsWith('netcoreapp')) { - invoke "dotnet .\Test\bin\$config\$tf\Test.dll" - } else { - invoke ".\Test\bin\$config\$tf\Test.exe" - } + invoke "dotnet run --no-build -p Test -f $tf" } - invoke "msbuild /t:Restore $props /p:MergedFParsecPackage=true" - invoke "msbuild /t:Pack /p:NoBuild=true /p:IncludeSource=true /p:IncludeSymbols=true $props /p:MergedFParsecPackage=true" - if (($config -eq 'Release-LowTrust') -and $testPCL) { - $pclProps = "/p:TargetFramework=net45 /p:OutputPath=bin\$config\net45-pcl\ /p:TestPCLFParsec=true $props" - invoke "msbuild Test/Test.fsproj /t:Clean $pclProps" - invoke "msbuild Test/Test.fsproj /t:Build $pclProps" - invoke ".\Test\bin\$config\net45-pcl\Test.exe" - } -} - -# The non-symbol packages built by the msbuild Pack target include some files only belonging -# into the symbol packages, so we have to recreate the packages from the generated nuspecs. -foreach ($nuspec in Get-ChildItem -Path ".\FParsec\obj\" -Recurse -Include "FParsec*.symbols.nuspec") { - $localNuspecPath = ".\$($nuspec.Name.Replace('.symbols', [string]::Empty))" - Copy-Item $nuspec $localNuspecPath -verbose - invoke ".\nuget pack $localNuspecPath -Symbols" + invoke "dotnet pack FParsec $props" } From 5e3b1832717c84f5f1212313ff2f2f71cfd5778f Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 00:39:13 +0100 Subject: [PATCH 35/61] f --- pack.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.ps1 b/pack.ps1 index ecc2315..bbf4e40 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -32,9 +32,9 @@ foreach ($folder in $("FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\ foreach ($config in $configs) { $props = "-c $config -p:VersionSuffix=$versionSuffix -p:FParsecNuGet=true" invoke "dotnet build FParsec $props" + invoke "dotnet pack FParsec $props" invoke "dotnet build Test $props" foreach ($tf in $testTargetFrameworks[$config]) { - invoke "dotnet run --no-build -p Test -f $tf" + invoke "dotnet run --no-build -p Test -c $config -f $tf" } - invoke "dotnet pack FParsec $props" } From 9ec707b656676e9670a6ab1f32c5e61019a368cd Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 00:56:50 +0100 Subject: [PATCH 36/61] add entrypoint --- Test/AllTests.fs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Test/AllTests.fs b/Test/AllTests.fs index c87e7c9..8267166 100644 --- a/Test/AllTests.fs +++ b/Test/AllTests.fs @@ -39,4 +39,12 @@ let run() = #endif printfn "No error was found." -run() \ No newline at end of file +[] +let main _argv = + try + run() + 0 + with + | ex -> + printfn "error: %A" ex + 1 From 037f07be83cabd7e561e310534ff00d6c83c11b7 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 01:03:24 +0100 Subject: [PATCH 37/61] fix error No data is available for encoding 54936 fix error ``` error: System.NotSupportedException: No data is available for encoding 54936. For information on defining a custom encoding, see the documentation for the Encoding.RegisterProvider method. ``` --- Test/AllTests.fs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Test/AllTests.fs b/Test/AllTests.fs index 8267166..aaad262 100644 --- a/Test/AllTests.fs +++ b/Test/AllTests.fs @@ -40,7 +40,12 @@ let run() = printfn "No error was found." [] -let main _argv = +let main _argv = + +#if NETCOREAPP + System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); +#endif + try run() 0 From 7e711666d614c5149d6e103082a6f72c974dae36 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 12:39:53 +0100 Subject: [PATCH 38/61] nupkgs are generated in `~/bin/nupkg` --- pack.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.ps1 b/pack.ps1 index bbf4e40..42acc8c 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -32,7 +32,7 @@ foreach ($folder in $("FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\ foreach ($config in $configs) { $props = "-c $config -p:VersionSuffix=$versionSuffix -p:FParsecNuGet=true" invoke "dotnet build FParsec $props" - invoke "dotnet pack FParsec $props" + invoke "dotnet pack FParsec $props -o ""$pwd\bin\nupkg""" invoke "dotnet build Test $props" foreach ($tf in $testTargetFrameworks[$config]) { invoke "dotnet run --no-build -p Test -c $config -f $tf" From cd54073f6171541c609c202a03ea3d40b89612eb Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 21:49:42 +0100 Subject: [PATCH 39/61] add travis --- .travis.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..1443592 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,28 @@ +language: csharp + +mono: 5.18.0 +dotnet: 2.1.500 + +install: + # workaround for missing .net 4.5 targing pack + - export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/ + +script: + - dotnet build FParsec.sln -c $CONFIGURATION -v n + - dotnet run --no-build -p Test -c $CONFIGURATION -f $TFM + + env: +- CONFIGURATION=Release + TFM=net45 +- CONFIGURATION=Release-LowTrust + TFM=net45 +- CONFIGURATION=Release-LowTrust + TFM=netcoreapp2.1 + +matrix: + include: + - os: linux + dist: trusty + sudo: required + - os: osx + osx_image: xcode9 From 15535a2b1d01bcdd5585e43f312179b0b501d362 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 21:49:53 +0100 Subject: [PATCH 40/61] add appveyor --- appveyor.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..f21f3d7 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,19 @@ +image: + - Visual Studio 2017 + +before_build: + - ps: >- + $buildId = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, '0'); + $versionSuffixPR = "-PR$($env:APPVEYOR_PULL_REQUEST_NUMBER)-$buildId"; + $branchName = "$env:APPVEYOR_REPO_BRANCH".Replace("_",""); + $versionSuffixBRANCH = "-$branchName-$buildId"; + $env:VersionSuffix = if ("$env:APPVEYOR_REPO_TAG" -eq "true") { "" } else { if ("$env:APPVEYOR_PULL_REQUEST_NUMBER") { $versionSuffixPR } else { $versionSuffixBRANCH } }; + +build_script: + - cmd: echo vs %VersionSuffix%" + - ps: ./pack.ps1 -versionSuffix $VersionSuffix + +artifacts: + - path: bin\nupkg\*.nupkg + name: nupkgs + type: NuGetPackage From 9da691fe7233c076a502cc1f58ebdb1e6e041767 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 21:54:07 +0100 Subject: [PATCH 41/61] empty commit From 3600028bef233d149fb1f936a53761535f66d92f Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 21:55:50 +0100 Subject: [PATCH 42/61] fix travis --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1443592..71712d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,13 @@ script: - dotnet build FParsec.sln -c $CONFIGURATION -v n - dotnet run --no-build -p Test -c $CONFIGURATION -f $TFM - env: -- CONFIGURATION=Release - TFM=net45 -- CONFIGURATION=Release-LowTrust - TFM=net45 -- CONFIGURATION=Release-LowTrust - TFM=netcoreapp2.1 +env: + - CONFIGURATION=Release + TFM=net45 + - CONFIGURATION=Release-LowTrust + TFM=net45 + - CONFIGURATION=Release-LowTrust + TFM=netcoreapp2.1 matrix: include: From 0088b0874ae57d73b1a401f76c806f7823c2c903 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 20 Feb 2019 22:06:40 +0100 Subject: [PATCH 43/61] dotnet run doesnt work on mono --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71712d0..362ea1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,10 @@ install: script: - dotnet build FParsec.sln -c $CONFIGURATION -v n - - dotnet run --no-build -p Test -c $CONFIGURATION -f $TFM + - | + if [ "$RUN_TESTS" == "1" ]; then + dotnet run --no-build -p Test -c $CONFIGURATION -f $TFM + fi env: - CONFIGURATION=Release @@ -18,6 +21,7 @@ env: TFM=net45 - CONFIGURATION=Release-LowTrust TFM=netcoreapp2.1 + RUN_TESTS=1 matrix: include: From f209a4f8e829a4f1f1c9163d69772bc2d8b46065 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Thu, 21 Feb 2019 09:07:33 +0100 Subject: [PATCH 44/61] update sln --- FParsec.sln | 243 ++++++++++++++++++++++++++-------------------------- 1 file changed, 123 insertions(+), 120 deletions(-) diff --git a/FParsec.sln b/FParsec.sln index a08db20..6b53854 100644 --- a/FParsec.sln +++ b/FParsec.sln @@ -2,25 +2,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26430.6 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FParsecCS", "FParsecCS\FParsecCS.csproj", "{8521556A-F853-4456-8D20-96C42F97E15A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FParsecCS", "FParsecCS\FParsecCS.csproj", "{8521556A-F853-4456-8D20-96C42F97E15A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FParsec", "FParsec\FParsec.fsproj", "{019F9A66-F105-43C7-841D-E4D312659B61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FParsec", "FParsec\FParsec.fsproj", "{019F9A66-F105-43C7-841D-E4D312659B61}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{01D1CDB5-2645-4929-865F-79B755DBC5B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calculator", "Samples\Calculator\Calculator.fsproj", "{A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator", "Samples\Calculator\Calculator.fsproj", "{A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharpParsingSample", "FSharpParsingSample", "{20AE5602-B9B6-434D-A41D-CB988AC49E79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InterpFParsec", "Samples\FSharpParsingSample\FParsecVersion\InterpFParsec.fsproj", "{B56A16AD-5BFE-4D99-932C-9073CAFF3D80}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InterpFParsec", "Samples\FSharpParsingSample\FParsecVersion\InterpFParsec.fsproj", "{B56A16AD-5BFE-4D99-932C-9073CAFF3D80}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonParser", "Samples\JSON\JsonParser.fsproj", "{3889AFB4-60BC-46CB-9747-4BD2F413B351}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonParser", "Samples\JSON\JsonParser.fsproj", "{3889AFB4-60BC-46CB-9747-4BD2F413B351}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PegParser", "Samples\PEG\PegParser.fsproj", "{2E8F33E4-77F0-4954-9486-239D7124EB86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PegParser", "Samples\PEG\PegParser.fsproj", "{2E8F33E4-77F0-4954-9486-239D7124EB86}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial", "Samples\Tutorial\Tutorial.fsproj", "{CEDA985E-30D3-400E-9869-4A22D5F9ADA5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial", "Samples\Tutorial\Tutorial.fsproj", "{CEDA985E-30D3-400E-9869-4A22D5F9ADA5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.fsproj", "{5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.fsproj", "{5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -44,192 +44,192 @@ Global {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x64.Build.0 = Debug|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x86.ActiveCfg = Debug|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x86.Build.0 = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|Any CPU.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|Any CPU.Build.0 = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x64.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x64.Build.0 = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x86.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x86.Build.0 = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.Build.0 = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.ActiveCfg = Debug|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.Build.0 = Debug|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.ActiveCfg = Debug|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.Build.0 = Debug|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|x86 + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.ActiveCfg = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.Build.0 = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.ActiveCfg = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.Build.0 = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|Any CPU.ActiveCfg = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|Any CPU.Build.0 = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.ActiveCfg = Release|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.Build.0 = Release|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.ActiveCfg = Release|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.Build.0 = Release|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.Build.0 = Release-LowTrust|x64 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|x86 - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.Build.0 = Release-LowTrust|x86 + {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.ActiveCfg = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.Build.0 = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.ActiveCfg = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.Build.0 = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.Build.0 = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x64.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x64.Build.0 = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x86.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x86.Build.0 = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|Any CPU.Build.0 = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x64.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x64.Build.0 = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x86.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x86.Build.0 = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.Build.0 = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|Any CPU.Build.0 = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x64.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x64.Build.0 = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x86.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x86.Build.0 = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|Any CPU.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|Any CPU.Build.0 = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x64.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x64.Build.0 = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x86.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x86.Build.0 = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.Build.0 = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|Any CPU.Build.0 = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x64.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x64.Build.0 = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x86.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x86.Build.0 = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|Any CPU.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|Any CPU.Build.0 = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x64.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x64.Build.0 = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x86.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x86.Build.0 = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.Build.0 = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x64.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x64.Build.0 = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x86.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x86.Build.0 = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|Any CPU.Build.0 = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x64.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x64.Build.0 = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x86.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x86.Build.0 = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.Build.0 = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x64.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x64.Build.0 = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x86.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x86.Build.0 = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|Any CPU.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|Any CPU.Build.0 = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x64.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x64.Build.0 = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x86.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x86.Build.0 = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.Build.0 = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.ActiveCfg = Debug|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.Build.0 = Debug|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.ActiveCfg = Debug|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.Build.0 = Debug|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|x86 + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.Build.0 = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.ActiveCfg = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.Build.0 = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|Any CPU.Build.0 = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.ActiveCfg = Release|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.Build.0 = Release|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.ActiveCfg = Release|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.Build.0 = Release|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.Build.0 = Release-LowTrust|x64 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|x86 - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.Build.0 = Release-LowTrust|x86 + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.ActiveCfg = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.Build.0 = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.ActiveCfg = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.Build.0 = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.Build.0 = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,4 +242,7 @@ Global {2E8F33E4-77F0-4954-9486-239D7124EB86} = {01D1CDB5-2645-4929-865F-79B755DBC5B8} {CEDA985E-30D3-400E-9869-4A22D5F9ADA5} = {01D1CDB5-2645-4929-865F-79B755DBC5B8} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EA9DAE45-7810-49BB-BDDA-C57E105B79BC} + EndGlobalSection EndGlobal From 07dd4a7b3b12301098f9d5d1ccd69ca3f560e9e0 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Thu, 21 Feb 2019 09:13:38 +0100 Subject: [PATCH 45/61] custom configurations require Configurations property --- .gitignore | 3 +- Directory.Build.props | 4 + FParsec.sln | 192 +++++++++++++++++++++--------------------- 3 files changed, 102 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index b1cfe3f..8dc6428 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ obj/ *.swp *.pdb packages/ -version.props \ No newline at end of file +version.props +/.vs/ diff --git a/Directory.Build.props b/Directory.Build.props index ba3a666..60212b4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,9 @@ + + Debug;Release;Debug-LowTrust;Release-LowTrust + + false true diff --git a/FParsec.sln b/FParsec.sln index 6b53854..861db23 100644 --- a/FParsec.sln +++ b/FParsec.sln @@ -44,192 +44,192 @@ Global {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x64.Build.0 = Debug|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x86.ActiveCfg = Debug|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Debug|x86.Build.0 = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|Any CPU.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|Any CPU.Build.0 = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x64.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x64.Build.0 = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x86.ActiveCfg = Release|Any CPU {8521556A-F853-4456-8D20-96C42F97E15A}.Release|x86.Build.0 = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {8521556A-F853-4456-8D20-96C42F97E15A}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|Any CPU.Build.0 = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.ActiveCfg = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x64.Build.0 = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.ActiveCfg = Debug|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Debug|x86.Build.0 = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|Any CPU.ActiveCfg = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|Any CPU.Build.0 = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.ActiveCfg = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x64.Build.0 = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.ActiveCfg = Release|Any CPU {019F9A66-F105-43C7-841D-E4D312659B61}.Release|x86.Build.0 = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {019F9A66-F105-43C7-841D-E4D312659B61}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x64.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x64.Build.0 = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x86.ActiveCfg = Debug|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug|x86.Build.0 = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|Any CPU.Build.0 = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x64.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x64.Build.0 = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x86.ActiveCfg = Release|Any CPU {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release|x86.Build.0 = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {A9B15BCE-C37B-4BA6-BC72-6E8A438F205D}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|Any CPU.Build.0 = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x64.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x64.Build.0 = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x86.ActiveCfg = Debug|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug|x86.Build.0 = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|Any CPU.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|Any CPU.Build.0 = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x64.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x64.Build.0 = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x86.ActiveCfg = Release|Any CPU {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release|x86.Build.0 = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {B56A16AD-5BFE-4D99-932C-9073CAFF3D80}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|Any CPU.Build.0 = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x64.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x64.Build.0 = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x86.ActiveCfg = Debug|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug|x86.Build.0 = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|Any CPU.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|Any CPU.Build.0 = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x64.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x64.Build.0 = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x86.ActiveCfg = Release|Any CPU {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release|x86.Build.0 = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {3889AFB4-60BC-46CB-9747-4BD2F413B351}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x64.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x64.Build.0 = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x86.ActiveCfg = Debug|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug|x86.Build.0 = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|Any CPU.Build.0 = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x64.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x64.Build.0 = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x86.ActiveCfg = Release|Any CPU {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release|x86.Build.0 = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {2E8F33E4-77F0-4954-9486-239D7124EB86}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x64.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x64.Build.0 = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x86.ActiveCfg = Debug|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug|x86.Build.0 = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|Any CPU.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|Any CPU.Build.0 = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x64.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x64.Build.0 = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x86.ActiveCfg = Release|Any CPU {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release|x86.Build.0 = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {CEDA985E-30D3-400E-9869-4A22D5F9ADA5}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.ActiveCfg = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x64.Build.0 = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.ActiveCfg = Debug|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug|x86.Build.0 = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.ActiveCfg = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.Build.0 = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.ActiveCfg = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.Build.0 = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.ActiveCfg = Debug|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.Build.0 = Debug|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|Any CPU.ActiveCfg = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|Any CPU.Build.0 = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.ActiveCfg = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x64.Build.0 = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.ActiveCfg = Release|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release|x86.Build.0 = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.ActiveCfg = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.Build.0 = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.ActiveCfg = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.Build.0 = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.ActiveCfg = Release|Any CPU - {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.Build.0 = Release|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From bda5aef25c1e0f83d42f0f8216eb3dddc6af6ad2 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Thu, 21 Feb 2019 09:29:07 +0100 Subject: [PATCH 46/61] add solutions files --- FParsec.sln | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/FParsec.sln b/FParsec.sln index 861db23..16c923f 100644 --- a/FParsec.sln +++ b/FParsec.sln @@ -22,6 +22,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial", "Samples\Tutoria EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.fsproj", "{5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1C2DDDBD-BF95-4F55-8651-6EAD5D984BD9}" + ProjectSection(SolutionItems) = preProject + .travis.yml = .travis.yml + appveyor.yml = appveyor.yml + Directory.Build.props = Directory.Build.props + global.json = global.json + pack.ps1 = pack.ps1 + readme.md = readme.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU From 6ba1db18295b0a4f270e2fb2d5f30fa7c9f5f9b2 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 27 Feb 2019 23:16:18 +0100 Subject: [PATCH 47/61] fix prerelease tag in appveyor --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f21f3d7..bcb5092 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,14 +4,14 @@ image: before_build: - ps: >- $buildId = $env:APPVEYOR_BUILD_NUMBER.PadLeft(5, '0'); - $versionSuffixPR = "-PR$($env:APPVEYOR_PULL_REQUEST_NUMBER)-$buildId"; + $versionSuffixPR = "PR$($env:APPVEYOR_PULL_REQUEST_NUMBER)-$buildId"; $branchName = "$env:APPVEYOR_REPO_BRANCH".Replace("_",""); - $versionSuffixBRANCH = "-$branchName-$buildId"; + $versionSuffixBRANCH = "$branchName-$buildId"; $env:VersionSuffix = if ("$env:APPVEYOR_REPO_TAG" -eq "true") { "" } else { if ("$env:APPVEYOR_PULL_REQUEST_NUMBER") { $versionSuffixPR } else { $versionSuffixBRANCH } }; build_script: - cmd: echo vs %VersionSuffix%" - - ps: ./pack.ps1 -versionSuffix $VersionSuffix + - ps: ./pack.ps1 -versionSuffix $env:VersionSuffix artifacts: - path: bin\nupkg\*.nupkg From 63f50499fc17a89656c66d4d88643dfd040b143c Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 27 Feb 2019 23:19:44 +0100 Subject: [PATCH 48/61] conditionals using tfm --- Build/FParsec.Common.targets | 4 ++-- FParsecCS/FParsecCS.csproj | 2 +- Test/Test.fsproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 59e5aa0..1d93349 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -6,12 +6,12 @@ $(DefineConstants);AGGRESSIVE_INLINING - + $(DefineConstants);UNALIGNED_READS - true + true diff --git a/FParsecCS/FParsecCS.csproj b/FParsecCS/FParsecCS.csproj index adf2948..7c99477 100644 --- a/FParsecCS/FParsecCS.csproj +++ b/FParsecCS/FParsecCS.csproj @@ -10,7 +10,7 @@ - + diff --git a/Test/Test.fsproj b/Test/Test.fsproj index f90f8dd..03048dc 100644 --- a/Test/Test.fsproj +++ b/Test/Test.fsproj @@ -12,7 +12,7 @@ $(DefineConstants);USE_STATIC_MAPPING_FOR_IS_ANY_OF - + $(DefineConstants);NETCORE @@ -34,7 +34,7 @@ - + From a9f1a3cf73929eb01a1fb8c29a173dc9614efafa Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 27 Feb 2019 23:24:03 +0100 Subject: [PATCH 49/61] move properties near usage --- Build/FParsec.Common.targets | 5 +++++ Directory.Build.props | 12 ------------ FParsec/FParsec.fsproj | 8 ++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Build/FParsec.Common.targets b/Build/FParsec.Common.targets index 1d93349..2f47574 100644 --- a/Build/FParsec.Common.targets +++ b/Build/FParsec.Common.targets @@ -14,6 +14,11 @@ true + + 1.0.0.0 + $(FileVersion) + + $(MSBuildThisFileDirectory)\fparsec.snk true diff --git a/Directory.Build.props b/Directory.Build.props index 60212b4..43ca5cf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,8 +26,6 @@ 1.0.4 1.0.4.0 - 1.0.0.0 - $(FileVersion) Stephan Tolksdorf Copyright © Stephan Tolksdorf @@ -40,16 +38,6 @@ $(Summary) You can find comprehensive documentation for FParsec at http://www.quanttec.com/fparsec. The documentation includes a feature list, a tutorial, a user’s guide and an API reference. - $(Description) - -This package uses the basic “low-trust” configuration of FParsec, which does not use any unverifiable code and is optimized for maximum portability. If you need to parse very large files or if you employ FParsec for performance-critical jobs, consider using the alternate “Big Data Edition” NuGet package (see https://nuget.org/packages/fparsec-big-data-edition). - - $(Description) - -This package uses a configuration of FParsec that supports very large input streams and is optimized for maximum performance in longer running processes. See http://www.quanttec.com/fparsec/download-and-installation.html for more information. - -This version of FParsec is currently not compatible with .NET Core. If you want to use .NET Core, please choose the other FParsec NuGet package instead (see https://nuget.org/packages/fparsec). - diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 0817713..5d31013 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -6,6 +6,14 @@ true false /nooptimizationdata + $(Description) + +This package uses the basic “low-trust” configuration of FParsec, which does not use any unverifiable code and is optimized for maximum portability. If you need to parse very large files or if you employ FParsec for performance-critical jobs, consider using the alternate “Big Data Edition” NuGet package (see https://nuget.org/packages/fparsec-big-data-edition). + $(Description) + +This package uses a configuration of FParsec that supports very large input streams and is optimized for maximum performance in longer running processes. See http://www.quanttec.com/fparsec/download-and-installation.html for more information. + +This version of FParsec is currently not compatible with .NET Core. If you want to use .NET Core, please choose the other FParsec NuGet package instead (see https://nuget.org/packages/fparsec). From b1c6609afcd76ceb0c98c09d5ad183227f991627 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 27 Feb 2019 23:25:16 +0100 Subject: [PATCH 50/61] verbose log for build --- pack.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.ps1 b/pack.ps1 index 42acc8c..c514b4b 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -31,9 +31,9 @@ foreach ($folder in $("FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\ foreach ($config in $configs) { $props = "-c $config -p:VersionSuffix=$versionSuffix -p:FParsecNuGet=true" - invoke "dotnet build FParsec $props" + invoke "dotnet build FParsec $props -v n" invoke "dotnet pack FParsec $props -o ""$pwd\bin\nupkg""" - invoke "dotnet build Test $props" + invoke "dotnet build Test $props -v n" foreach ($tf in $testTargetFrameworks[$config]) { invoke "dotnet run --no-build -p Test -c $config -f $tf" } From 158362a93330f08cf230a8b20002f429f15b2c19 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Wed, 27 Feb 2019 23:28:48 +0100 Subject: [PATCH 51/61] clean package output dir at beginning of build --- pack.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack.ps1 b/pack.ps1 index c514b4b..5db2513 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -23,7 +23,7 @@ function invoke([string] $cmd) { } } -foreach ($folder in $("FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\bin")) { +foreach ($folder in $("bin", "FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\bin")) { try { Remove-Item $folder -recurse } catch {} From 78d1e576084db17ca7477db13add97423d730d18 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 16:40:06 +0100 Subject: [PATCH 52/61] Add back default StartArguments to sample projects --- .../FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj | 4 +++- Samples/JSON/JsonParser.fsproj | 2 ++ Samples/PEG/PegParser.fsproj | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj index 51e6b9b..0f82aea 100644 --- a/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj +++ b/Samples/FSharpParsingSample/FParsecVersion/InterpFParsec.fsproj @@ -1,9 +1,10 @@ - + netcoreapp2.1;net45 net45 Exe false + $(MSBuildProjectDirectory)/../LexYaccVersion/test.lang @@ -11,6 +12,7 @@ + diff --git a/Samples/JSON/JsonParser.fsproj b/Samples/JSON/JsonParser.fsproj index e141dfd..57f70a0 100644 --- a/Samples/JSON/JsonParser.fsproj +++ b/Samples/JSON/JsonParser.fsproj @@ -4,12 +4,14 @@ net45 Exe false + $(MSBuildProjectDirectory)/test_json.txt + diff --git a/Samples/PEG/PegParser.fsproj b/Samples/PEG/PegParser.fsproj index e141dfd..737452d 100644 --- a/Samples/PEG/PegParser.fsproj +++ b/Samples/PEG/PegParser.fsproj @@ -4,12 +4,14 @@ net45 Exe false + $(MSBuildProjectDirectory)/test_peg.txt + From 62b7b1523bd4db4e97f790afc1a382ee3ad5e95d Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 16:45:09 +0100 Subject: [PATCH 53/61] Add back InterpLexYacc project --- FParsec.sln | 27 ++++++ .../LexYaccVersion/InterpLexYacc.fsproj | 30 ++++++ .../FSharpParsingSample/LexYaccVersion/lex.fs | 82 ++++++++--------- .../LexYaccVersion/pars.fs | 92 +++++++++---------- 4 files changed, 144 insertions(+), 87 deletions(-) create mode 100644 Samples/FSharpParsingSample/LexYaccVersion/InterpLexYacc.fsproj diff --git a/FParsec.sln b/FParsec.sln index 16c923f..19f64c2 100644 --- a/FParsec.sln +++ b/FParsec.sln @@ -32,6 +32,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1C2DDDBD readme.md = readme.md EndProjectSection EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "InterpLexYacc", "Samples\FSharpParsingSample\LexYaccVersion\InterpLexYacc.fsproj", "{C0616007-EAC1-4648-9124-727B4539EEB4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -240,6 +242,30 @@ Global {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU {5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|x64.ActiveCfg = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|x64.Build.0 = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|x86.ActiveCfg = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug|x86.Build.0 = Debug|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|Any CPU.ActiveCfg = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|Any CPU.Build.0 = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|x64.ActiveCfg = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|x64.Build.0 = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|x86.ActiveCfg = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Debug-LowTrust|x86.Build.0 = Debug-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|Any CPU.Build.0 = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|x64.ActiveCfg = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|x64.Build.0 = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|x86.ActiveCfg = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release|x86.Build.0 = Release|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|Any CPU.ActiveCfg = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|Any CPU.Build.0 = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|x64.ActiveCfg = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|x64.Build.0 = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|x86.ActiveCfg = Release-LowTrust|Any CPU + {C0616007-EAC1-4648-9124-727B4539EEB4}.Release-LowTrust|x86.Build.0 = Release-LowTrust|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -251,6 +277,7 @@ Global {3889AFB4-60BC-46CB-9747-4BD2F413B351} = {01D1CDB5-2645-4929-865F-79B755DBC5B8} {2E8F33E4-77F0-4954-9486-239D7124EB86} = {01D1CDB5-2645-4929-865F-79B755DBC5B8} {CEDA985E-30D3-400E-9869-4A22D5F9ADA5} = {01D1CDB5-2645-4929-865F-79B755DBC5B8} + {C0616007-EAC1-4648-9124-727B4539EEB4} = {20AE5602-B9B6-434D-A41D-CB988AC49E79} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EA9DAE45-7810-49BB-BDDA-C57E105B79BC} diff --git a/Samples/FSharpParsingSample/LexYaccVersion/InterpLexYacc.fsproj b/Samples/FSharpParsingSample/LexYaccVersion/InterpLexYacc.fsproj new file mode 100644 index 0000000..414e436 --- /dev/null +++ b/Samples/FSharpParsingSample/LexYaccVersion/InterpLexYacc.fsproj @@ -0,0 +1,30 @@ + + + net45 + Exe + false + $(MSBuildProjectDirectory)/test.lang + + + + + + + --unicode + + + --module Parser + + + + + + + + + + + + + + diff --git a/Samples/FSharpParsingSample/LexYaccVersion/lex.fs b/Samples/FSharpParsingSample/LexYaccVersion/lex.fs index 2622b5b..018a952 100644 --- a/Samples/FSharpParsingSample/LexYaccVersion/lex.fs +++ b/Samples/FSharpParsingSample/LexYaccVersion/lex.fs @@ -1,4 +1,4 @@ -# 13 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 13 "lex.fsl" module Lex @@ -17,7 +17,7 @@ let lexeme = LexBuffer.LexemeString let newline (lexbuf: LexBuffer<_>) = lexbuf.StartPos <- lexbuf.StartPos.NextLine -# 20 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 20 "lex.fs" let trans : uint16[] array = [| (* State 0 *) @@ -136,100 +136,100 @@ and token (lexbuf : Microsoft.FSharp.Text.Lexing.LexBuffer<_>) = _fslex_token and _fslex_token _fslex_state lexbuf = match _fslex_tables.Interpret(_fslex_state,lexbuf) with | 0 -> ( -# 54 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 54 "lex.fsl" token lexbuf -# 141 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 141 "lex.fs" ) | 1 -> ( -# 55 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 55 "lex.fsl" newline lexbuf; token lexbuf -# 146 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 146 "lex.fs" ) | 2 -> ( -# 56 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 56 "lex.fsl" WHILE -# 151 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 151 "lex.fs" ) | 3 -> ( -# 57 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 57 "lex.fsl" BEGIN -# 156 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 156 "lex.fs" ) | 4 -> ( -# 58 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 58 "lex.fsl" END -# 161 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 161 "lex.fs" ) | 5 -> ( -# 59 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 59 "lex.fsl" DO -# 166 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 166 "lex.fs" ) | 6 -> ( -# 60 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 60 "lex.fsl" IF -# 171 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 171 "lex.fs" ) | 7 -> ( -# 61 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 61 "lex.fsl" THEN -# 176 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 176 "lex.fs" ) | 8 -> ( -# 62 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 62 "lex.fsl" ELSE -# 181 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 181 "lex.fs" ) | 9 -> ( -# 63 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 63 "lex.fsl" PRINT -# 186 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 186 "lex.fs" ) | 10 -> ( -# 64 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 64 "lex.fsl" DECR -# 191 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 191 "lex.fs" ) | 11 -> ( -# 65 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 65 "lex.fsl" LPAREN -# 196 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 196 "lex.fs" ) | 12 -> ( -# 66 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 66 "lex.fsl" RPAREN -# 201 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 201 "lex.fs" ) | 13 -> ( -# 67 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 67 "lex.fsl" SEMI -# 206 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 206 "lex.fs" ) | 14 -> ( -# 68 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 68 "lex.fsl" ASSIGN -# 211 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 211 "lex.fs" ) | 15 -> ( -# 70 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 70 "lex.fsl" ID(lexeme lexbuf) -# 216 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 216 "lex.fs" ) | 16 -> ( -# 72 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 72 "lex.fsl" INT (int32 (lexeme lexbuf)) -# 221 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 221 "lex.fs" ) | 17 -> ( -# 74 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 74 "lex.fsl" FLOAT (float (lexeme lexbuf)) -# 226 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 226 "lex.fs" ) | 18 -> ( -# 75 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fsl" +# 75 "lex.fsl" EOF -# 231 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 231 "lex.fs" ) | _ -> failwith "token" -# 3000000 "..\..\Samples\FSharpParsingSample\LexYaccVersion\lex.fs" +# 3000000 "lex.fs" diff --git a/Samples/FSharpParsingSample/LexYaccVersion/pars.fs b/Samples/FSharpParsingSample/LexYaccVersion/pars.fs index 5d79b64..be85f4d 100644 --- a/Samples/FSharpParsingSample/LexYaccVersion/pars.fs +++ b/Samples/FSharpParsingSample/LexYaccVersion/pars.fs @@ -3,7 +3,7 @@ module Parser #nowarn "64";; // turn off warnings that type variables used in production annotations are instantiated to concrete type open Microsoft.FSharp.Text.Lexing open Microsoft.FSharp.Text.Parsing.ParseHelpers -# 10 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 10 "pars.fsy" // This prelude is F# code that is available throughout this file. In this @@ -11,7 +11,7 @@ open Microsoft.FSharp.Text.Parsing.ParseHelpers open Ast -# 14 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 14 "pars.fs" // This type is the type of tokens accepted by the parser type token = | DECR @@ -181,7 +181,7 @@ let _fsyacc_reductionSymbolCounts = [|1us; 1us; 1us; 1us; 1us; 1us; 4us; 3us; 4u let _fsyacc_productionToNonTerminalTable = [|0us; 1us; 2us; 3us; 3us; 3us; 3us; 4us; 4us; 4us; 4us; 4us; 4us; 5us; 5us; |] let _fsyacc_immediateActions = [|65535us; 49152us; 16385us; 65535us; 16387us; 16388us; 16389us; 65535us; 65535us; 65535us; 16390us; 65535us; 65535us; 16391us; 65535us; 65535us; 65535us; 16392us; 65535us; 65535us; 16393us; 65535us; 65535us; 65535us; 65535us; 65535us; 16395us; 65535us; 16396us; 16397us; 65535us; 16398us; |] let _fsyacc_reductions () = [| -# 184 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 184 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : Ast.Prog )) in Microsoft.FSharp.Core.Operators.box @@ -190,120 +190,120 @@ let _fsyacc_reductions () = [| raise (Microsoft.FSharp.Text.Parsing.Accept(Microsoft.FSharp.Core.Operators.box _1)) ) : '_startstart)); -# 193 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 193 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : 'Prog)) in Microsoft.FSharp.Core.Operators.box ( ( -# 37 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 37 "pars.fsy" _1 ) -# 37 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 37 "pars.fsy" : Ast.Prog )); -# 204 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 204 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : 'StmtList)) in Microsoft.FSharp.Core.Operators.box ( ( -# 40 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 40 "pars.fsy" Prog(List.rev(_1)) ) -# 40 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 40 "pars.fsy" : 'Prog)); -# 215 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 215 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : string)) in Microsoft.FSharp.Core.Operators.box ( ( -# 42 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 42 "pars.fsy" Val(_1); ) -# 42 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 42 "pars.fsy" : 'Expr)); -# 226 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 226 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : System.Int32)) in Microsoft.FSharp.Core.Operators.box ( ( -# 43 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 43 "pars.fsy" Int(_1) ) -# 43 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 43 "pars.fsy" : 'Expr)); -# 237 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 237 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : System.Double)) in Microsoft.FSharp.Core.Operators.box ( ( -# 44 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 44 "pars.fsy" Float(_1) ) -# 44 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 44 "pars.fsy" : 'Expr)); -# 248 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 248 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _3 = (let data = parseState.GetInput(3) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in Microsoft.FSharp.Core.Operators.box ( ( -# 45 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 45 "pars.fsy" Decr(_3) ) -# 45 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 45 "pars.fsy" : 'Expr)); -# 259 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 259 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : string)) in let _3 = (let data = parseState.GetInput(3) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in Microsoft.FSharp.Core.Operators.box ( ( -# 47 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 47 "pars.fsy" Assign(_1,_3) ) -# 47 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 47 "pars.fsy" : 'Stmt)); -# 271 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 271 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _2 = (let data = parseState.GetInput(2) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in let _4 = (let data = parseState.GetInput(4) in (Microsoft.FSharp.Core.Operators.unbox data : 'Stmt)) in Microsoft.FSharp.Core.Operators.box ( ( -# 48 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 48 "pars.fsy" While(_2,_4) ) -# 48 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 48 "pars.fsy" : 'Stmt)); -# 283 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 283 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _2 = (let data = parseState.GetInput(2) in (Microsoft.FSharp.Core.Operators.unbox data : 'StmtList)) in Microsoft.FSharp.Core.Operators.box ( ( -# 49 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 49 "pars.fsy" Seq(List.rev(_2)) ) -# 49 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 49 "pars.fsy" : 'Stmt)); -# 294 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 294 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _2 = (let data = parseState.GetInput(2) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in let _4 = (let data = parseState.GetInput(4) in (Microsoft.FSharp.Core.Operators.unbox data : 'Stmt)) in Microsoft.FSharp.Core.Operators.box ( ( -# 50 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 50 "pars.fsy" IfThen(_2,_4) ) -# 50 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 50 "pars.fsy" : 'Stmt)); -# 306 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 306 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _2 = (let data = parseState.GetInput(2) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in let _4 = (let data = parseState.GetInput(4) in (Microsoft.FSharp.Core.Operators.unbox data : 'Stmt)) in @@ -311,47 +311,47 @@ let _fsyacc_reductions () = [| Microsoft.FSharp.Core.Operators.box ( ( -# 51 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 51 "pars.fsy" IfThenElse(_2,_4,_6) ) -# 51 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 51 "pars.fsy" : 'Stmt)); -# 319 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 319 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _2 = (let data = parseState.GetInput(2) in (Microsoft.FSharp.Core.Operators.unbox data : 'Expr)) in Microsoft.FSharp.Core.Operators.box ( ( -# 52 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 52 "pars.fsy" Print(_2) ) -# 52 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 52 "pars.fsy" : 'Stmt)); -# 330 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 330 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : 'Stmt)) in Microsoft.FSharp.Core.Operators.box ( ( -# 55 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 55 "pars.fsy" [_1] ) -# 55 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 55 "pars.fsy" : 'StmtList)); -# 341 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 341 "pars.fs" (fun (parseState : Microsoft.FSharp.Text.Parsing.IParseState) -> let _1 = (let data = parseState.GetInput(1) in (Microsoft.FSharp.Core.Operators.unbox data : 'StmtList)) in let _3 = (let data = parseState.GetInput(3) in (Microsoft.FSharp.Core.Operators.unbox data : 'Stmt)) in Microsoft.FSharp.Core.Operators.box ( ( -# 56 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 56 "pars.fsy" _3 :: _1 ) -# 56 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fsy" +# 56 "pars.fsy" : 'StmtList)); |] -# 354 "..\..\Samples\FSharpParsingSample\LexYaccVersion\pars.fs" +# 354 "pars.fs" let tables () : Microsoft.FSharp.Text.Parsing.Tables<_> = { reductions= _fsyacc_reductions (); endOfInputTag = _fsyacc_endOfInputTag; From e4ade73e2273690fc01d79154288fe95b18c5ade Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 16:48:44 +0100 Subject: [PATCH 54/61] Add FParsec.Common.targets to solution file, rename "build" folder to "Build", use newer VisualStudioVersion --- FParsec.sln | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/FParsec.sln b/FParsec.sln index 19f64c2..900ddb8 100644 --- a/FParsec.sln +++ b/FParsec.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28621.142 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FParsecCS", "FParsecCS\FParsecCS.csproj", "{8521556A-F853-4456-8D20-96C42F97E15A}" EndProject @@ -22,11 +22,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tutorial", "Samples\Tutoria EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.fsproj", "{5AE7C1E6-A511-41A9-9A9F-E8A0944319A2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1C2DDDBD-BF95-4F55-8651-6EAD5D984BD9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{1C2DDDBD-BF95-4F55-8651-6EAD5D984BD9}" ProjectSection(SolutionItems) = preProject .travis.yml = .travis.yml appveyor.yml = appveyor.yml Directory.Build.props = Directory.Build.props + Build\FParsec.Common.targets = Build\FParsec.Common.targets global.json = global.json pack.ps1 = pack.ps1 readme.md = readme.md From 9c992bed34c66925d68e40dd7a4edf49eb88eda0 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 17:32:28 +0100 Subject: [PATCH 55/61] Move Summary, Description and PackageDescription properties from Directory.Build.props to FParsec.fsproj --- Directory.Build.props | 7 +------ FParsec/FParsec.fsproj | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 43ca5cf..e497bf3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,14 +30,9 @@ Stephan Tolksdorf Copyright © Stephan Tolksdorf FParsec - FParsec is a parser combinator library for F#. - $(PackageTags);parser;combinator;f#;fsharp;c#;csharp;parsec;fparsec http://www.quanttec.com/fparsec/license.html http://www.quanttec.com/fparsec/ - https://github.com/stephan-tolksdorf/fparsec - $(Summary) - -You can find comprehensive documentation for FParsec at http://www.quanttec.com/fparsec. The documentation includes a feature list, a tutorial, a user’s guide and an API reference. + https://github.com/stephan-tolksdorf/fparsec diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 5d31013..92a7e71 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -6,6 +6,14 @@ true false /nooptimizationdata + + + + FParsec is a parser combinator library for F#. + $(PackageTags);parser;combinator;f#;fsharp;c#;csharp;parsec;fparsec + $(Summary) + +You can find comprehensive documentation for FParsec at http://www.quanttec.com/fparsec. The documentation includes a feature list, a tutorial, a user’s guide and an API reference. $(Description) This package uses the basic “low-trust” configuration of FParsec, which does not use any unverifiable code and is optimized for maximum portability. If you need to parse very large files or if you employ FParsec for performance-critical jobs, consider using the alternate “Big Data Edition” NuGet package (see https://nuget.org/packages/fparsec-big-data-edition). From 3479c72ff2c1bcf0d2e3dc8b2313394b3cde1bab Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 17:38:08 +0100 Subject: [PATCH 56/61] Output nupkg files in nupkgs directory, not bin/nupkg --- appveyor.yml | 2 +- pack.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bcb5092..d5b30c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,6 @@ build_script: - ps: ./pack.ps1 -versionSuffix $env:VersionSuffix artifacts: - - path: bin\nupkg\*.nupkg + - path: nupkgs\*.nupkg name: nupkgs type: NuGetPackage diff --git a/pack.ps1 b/pack.ps1 index 5db2513..123d5a7 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -1,7 +1,7 @@ # This PowerShell script builds the FParsec NuGet packages. # # Run this script from the VS2017 Command Prompt, e.g. with -# powershell -File pack.ps1 -versionSuffix "" > pack.out.txt +# powershell -ExecutionPolicy ByPass -File pack.ps1 -versionSuffix "" > pack.out.txt Param( [string]$versionSuffix = "dev" @@ -23,7 +23,7 @@ function invoke([string] $cmd) { } } -foreach ($folder in $("bin", "FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\bin")) { +foreach ($folder in $("nupkgs", "FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "FParsec\bin")) { try { Remove-Item $folder -recurse } catch {} @@ -32,7 +32,7 @@ foreach ($folder in $("bin", "FParsecCS\obj", "FParsecCS\bin", "FParsec\obj", "F foreach ($config in $configs) { $props = "-c $config -p:VersionSuffix=$versionSuffix -p:FParsecNuGet=true" invoke "dotnet build FParsec $props -v n" - invoke "dotnet pack FParsec $props -o ""$pwd\bin\nupkg""" + invoke "dotnet pack FParsec $props -o ""$pwd\nupkgs""" invoke "dotnet build Test $props -v n" foreach ($tf in $testTargetFrameworks[$config]) { invoke "dotnet run --no-build -p Test -c $config -f $tf" From 5a10d1f443c011372414c0d11050f355a18b2189 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 17:38:31 +0100 Subject: [PATCH 57/61] Update readme.txt --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index ac899a6..c877d29 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,6 @@ FParsec’s features include: - [FParsec vs alternatives](http://www.quanttec.com/fparsec/about/fparsec-vs-alternatives.html) - [NuGet packages and building FParsec from source](http://www.quanttec.com/fparsec/download-and-installation.html) -
The new solution and project files in the source folders don't yet properly work within the Visual Studio 2017 IDE, but the old solution file in `Build/VS11` still works fine. - [Tutorial](http://www.quanttec.com/fparsec/tutorial.html) - [User's guide](http://www.quanttec.com/fparsec/users-guide/) - [Parser quick reference](http://www.quanttec.com/fparsec/reference/parser-overview.html) From 09629983daaf0649963b47ac04c59a90caf3bc89 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 18:47:02 +0100 Subject: [PATCH 58/61] Fix missing optimization flag for Release-LowTrust configuration and explicitly set optimization-related flags and defines --- Directory.Build.props | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e497bf3..10c32a7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,8 +15,15 @@ - $(DefineConstants);DEBUG - $(DefineConstants);RELEASE + true + + + false + $(DefineConstants);DEBUG + + + true + $(DefineConstants);RELEASE From 04575a2ae5f2b40f7ad7f0db2019406c7ded8d8e Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 18:48:46 +0100 Subject: [PATCH 59/61] Make comment in FParsec.fsproj less terse --- FParsec/FParsec.fsproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FParsec/FParsec.fsproj b/FParsec/FParsec.fsproj index 92a7e71..1c382c5 100644 --- a/FParsec/FParsec.fsproj +++ b/FParsec/FParsec.fsproj @@ -54,7 +54,8 @@ This version of FParsec is currently not compatible with .NET Core. If you want - + $(TargetsForTfmSpecificBuildOutput);IncludeFParsecCSOutput From c226295da1bd730c716223378af5b6962ae43582 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 19:49:34 +0100 Subject: [PATCH 60/61] Update .vscode/tasks.json --- .vscode/tasks.json | 74 +++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 90e4ebb..639b0ac 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,53 +1,67 @@ { // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format - "version": "0.1.0", - "command": "dotnet", - "isShellCommand": true, - "args": [], + "version": "2.0.0", "tasks": [ { - "taskName": "Restore (Config: Debug-LowTrust)", - "suppressTaskName": true, - "args": ["restore", "/p:Configuration=Debug-LowTrust"], - "showOutput": "always", + "label": "Restore (Config: Debug-LowTrust)", + "command": "dotnet restore /p:Configuration=Debug-LowTrust", + "type": "shell", + "group": "build", + "presentation": { + "reveal": "always" + }, "problemMatcher": "$msCompile" }, { - "taskName": "Build .NET Core Test (Config: Debug-LowTrust)", - "suppressTaskName": true, - "args": ["build", "Test", "-c", "Debug-LowTrust", "-f", "netcoreapp2.0"], - "isBuildCommand": true, - "showOutput": "silent", + "label": "Build .NET Core Test (Config: Debug-LowTrust)", + "command": "dotnet build Test -c Debug-LowTrust -f netcoreapp2.1", + "type": "shell", + "group": "build", + "presentation": { + "reveal": "silent" + }, "problemMatcher": "$msCompile" }, { - "taskName": "Build .NET 4.5 Test (Config: Debug-LowTrust)", - "suppressTaskName": true, - "args": ["build", "Test", "-c", "Debug-LowTrust", "-f", "net45"], - "showOutput": "silent", + "label": "Build .NET 4.5 Test (Config: Debug-LowTrust)", + "command": "dotnet build Test -c Debug-LowTrust -f net45", + "type": "shell", + "group": "build", + "presentation": { + "reveal": "silent" + }, "problemMatcher": "$msCompile" }, { - "taskName": "Build All (Config: Debug-LowTrust)", - "suppressTaskName": true, - "args": ["build", "-c", "Debug-LowTrust"], - "showOutput": "silent", + "label": "Build All (Config: Debug-LowTrust)", + "command": "dotnet build -c Debug-LowTrust", + "type": "shell", + "group": "build", + "presentation": { + "reveal": "silent" + }, "problemMatcher": "$msCompile" }, { - "taskName": "Test .NET  Core (Config: Debug-LowTrust)", - "suppressTaskName": true, - "args": [ "Test/bin/Debug-LowTrust/netcoreapp2.0/Test.dll" ], - "isTestCommand": true, - "showOutput": "always" + "label": "Test .NET Core (Config: Debug-LowTrust)", + "command": "dotnet Test/bin/Debug-LowTrust/netcoreapp2.1/Test.dll", + "type": "shell", + "group": "test", + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" }, - { - "taskName": "Test .NET 4.5 (Config: Debug-LowTrust)", - "suppressTaskName": true, + "label": "Test .NET 4.5 (Config: Debug-LowTrust)", "command": "Test/bin/Debug-LowTrust/net45/Test.exe", - "showOutput": "always" + "type": "shell", + "group": "test", + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" } ] } \ No newline at end of file From 92ae6ff86b10477b753492ff3015067e6ff9c3b3 Mon Sep 17 00:00:00 2001 From: Stephan Tolksdorf Date: Sat, 2 Mar 2019 21:47:17 +0100 Subject: [PATCH 61/61] Always show the output of .vscode test tasks --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 639b0ac..835f006 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -49,7 +49,7 @@ "type": "shell", "group": "test", "presentation": { - "reveal": "silent" + "reveal": "always" }, "problemMatcher": "$msCompile" }, @@ -59,7 +59,7 @@ "type": "shell", "group": "test", "presentation": { - "reveal": "silent" + "reveal": "always" }, "problemMatcher": "$msCompile" }