From d6cb7f2936b60431a3a59d77e744c89fb43ae374 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Mon, 8 Feb 2016 11:10:50 -0600 Subject: [PATCH] * Created VS 2013 solution and projects * Updated FParsec to use version 1.0.2 big data edition * Updated to .Net 4.5 --- EDNReaderTest/EDNReaderTest-2013.fsproj | 102 ++++++++++++++++++++ EDNReaderTest/packages.config | 1 + EDNReaderTestCS/EDNReaderTestCS.csproj | 51 +++++----- EDNReaderTestCS/app.config | 11 --- EDNReaderWriter/EDNReaderWriter-2013.fsproj | 100 +++++++++++++++++++ EDNReaderWriter/packages.config | 1 + EDNTypes/EDNTypes.csproj | 18 +++- edn-dot-net-2013.sln | 51 ++++++++++ 8 files changed, 296 insertions(+), 39 deletions(-) create mode 100644 EDNReaderTest/EDNReaderTest-2013.fsproj delete mode 100644 EDNReaderTestCS/app.config create mode 100644 EDNReaderWriter/EDNReaderWriter-2013.fsproj create mode 100644 edn-dot-net-2013.sln diff --git a/EDNReaderTest/EDNReaderTest-2013.fsproj b/EDNReaderTest/EDNReaderTest-2013.fsproj new file mode 100644 index 0000000..df6c810 --- /dev/null +++ b/EDNReaderTest/EDNReaderTest-2013.fsproj @@ -0,0 +1,102 @@ + + + + + Debug + AnyCPU + 2.0 + {3e4b81c4-0b07-4b35-8337-268050f70894} + Exe + EDNReaderTest + EDNReaderTest + v4.5 + EDNReaderTest + ..\ + true + + OnBuildSuccess + 4.3.0.0 + + + true + full + false + false + bin\Debug\ + DEBUG;TRACE + 3 + bin\Debug\EDNReaderTest.XML + + + pdbonly + true + true + bin\Release\ + TRACE + 3 + bin\Release\EDNReaderTest.XML + + + 11 + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + copy /B $(TargetPath) $(SolutionDir)Build + + + + + + + + ..\packages\FParsec-Big-Data-Edition.1.0.2\lib\net45\FParsec.dll + True + + + ..\packages\FParsec-Big-Data-Edition.1.0.2\lib\net45\FParsecCS.dll + True + + + True + + + + + + + EDNReaderTestCS + {8a0884c8-d2d8-48fa-b936-a91ec3f39c0f} + True + + + EDNReaderWriter-2013 + {8a6173db-bc8c-42dc-ba02-72a9726212f7} + True + + + EDNTypes + {5ff5ea7a-1599-4412-aede-33b190244fdf} + True + + + + \ No newline at end of file diff --git a/EDNReaderTest/packages.config b/EDNReaderTest/packages.config index 1f339ee..90b5a42 100644 --- a/EDNReaderTest/packages.config +++ b/EDNReaderTest/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/EDNReaderTestCS/EDNReaderTestCS.csproj b/EDNReaderTestCS/EDNReaderTestCS.csproj index f546ab5..c7adfbf 100644 --- a/EDNReaderTestCS/EDNReaderTestCS.csproj +++ b/EDNReaderTestCS/EDNReaderTestCS.csproj @@ -10,30 +10,22 @@ Properties EDNReaderTestCS EDNReaderTestCS - v4.0 512 - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - + + + + v4.5 + + + + + v4.0 + + + true bin\Debug\ @@ -42,6 +34,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false bin\Release\ @@ -51,9 +44,9 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false - @@ -71,8 +64,18 @@ + + + + + {8a6173db-bc8c-42dc-ba02-72a9726212f7} + EDNReaderWriter-2013 + + + + {8a6173db-bc8c-42dc-ba02-72a9726212f7} EDNReaderWriter-2012 @@ -81,6 +84,7 @@ + {72e03163-0a92-46c5-8201-78eb4a771beb} EDNReaderWriter @@ -88,11 +92,6 @@ - - - Designer - - {5ff5ea7a-1599-4412-aede-33b190244fdf} diff --git a/EDNReaderTestCS/app.config b/EDNReaderTestCS/app.config deleted file mode 100644 index 86f423f..0000000 --- a/EDNReaderTestCS/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/EDNReaderWriter/EDNReaderWriter-2013.fsproj b/EDNReaderWriter/EDNReaderWriter-2013.fsproj new file mode 100644 index 0000000..cc8ca05 --- /dev/null +++ b/EDNReaderWriter/EDNReaderWriter-2013.fsproj @@ -0,0 +1,100 @@ + + + + + Debug + AnyCPU + 2.0 + 8a6173db-bc8c-42dc-ba02-72a9726212f7 + Library + EDNReaderWriter + EDNReaderWriter + v4.5 + EDNReaderWriter + ..\ + true + + OnBuildSuccess + 4.3.0.0 + + + true + full + false + false + bin\Debug\ + DEBUG;TRACE + 3 + bin\Debug\EDNReaderWriter.XML + + + pdbonly + true + true + bin\Release\ + TRACE + 3 + bin\Release\EDNReaderWriter.XML + + + 11 + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + + + + + + + + + + + ..\packages\FParsec-Big-Data-Edition.1.0.2\lib\net45\FParsec.dll + True + + + ..\packages\FParsec-Big-Data-Edition.1.0.2\lib\net45\FParsecCS.dll + True + + + True + + + + + + + + + EDNTypes + {5ff5ea7a-1599-4412-aede-33b190244fdf} + True + + + + + copy /B $(TargetPath) $(SolutionDir)Build + + + \ No newline at end of file diff --git a/EDNReaderWriter/packages.config b/EDNReaderWriter/packages.config index 1f339ee..90b5a42 100644 --- a/EDNReaderWriter/packages.config +++ b/EDNReaderWriter/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/EDNTypes/EDNTypes.csproj b/EDNTypes/EDNTypes.csproj index a52a974..512155b 100644 --- a/EDNTypes/EDNTypes.csproj +++ b/EDNTypes/EDNTypes.csproj @@ -9,10 +9,22 @@ Library Properties EDNTypes - EDNTypes - v4.0 + EDNTypes 512 + + + + + v4.5 + + + + + v4.0 + + + true full @@ -21,6 +33,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +42,7 @@ TRACE prompt 4 + false diff --git a/edn-dot-net-2013.sln b/edn-dot-net-2013.sln new file mode 100644 index 0000000..339dabb --- /dev/null +++ b/edn-dot-net-2013.sln @@ -0,0 +1,51 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FFC94509-5D42-48CA-A06A-D4654D63FBD2}" + ProjectSection(SolutionItems) = preProject + .nuget\NuGet.Config = .nuget\NuGet.Config + .nuget\NuGet.targets = .nuget\NuGet.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EDDCCA9-75EF-4D35-81BD-A2D162CEA5E1}" + ProjectSection(SolutionItems) = preProject + README.md = README.md + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDNTypes", "EDNTypes\EDNTypes.csproj", "{5FF5EA7A-1599-4412-AEDE-33B190244FDF}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EDNReaderWriter-2013", "EDNReaderWriter\EDNReaderWriter-2013.fsproj", "{8A6173DB-BC8C-42DC-BA02-72A9726212F7}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "EDNReaderTest-2013", "EDNReaderTest\EDNReaderTest-2013.fsproj", "{3E4B81C4-0B07-4B35-8337-268050F70894}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EDNReaderTestCS", "EDNReaderTestCS\EDNReaderTestCS.csproj", "{8A0884C8-D2D8-48FA-B936-A91EC3F39C0F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5FF5EA7A-1599-4412-AEDE-33B190244FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5FF5EA7A-1599-4412-AEDE-33B190244FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5FF5EA7A-1599-4412-AEDE-33B190244FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5FF5EA7A-1599-4412-AEDE-33B190244FDF}.Release|Any CPU.Build.0 = Release|Any CPU + {8A6173DB-BC8C-42DC-BA02-72A9726212F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A6173DB-BC8C-42DC-BA02-72A9726212F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A6173DB-BC8C-42DC-BA02-72A9726212F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A6173DB-BC8C-42DC-BA02-72A9726212F7}.Release|Any CPU.Build.0 = Release|Any CPU + {3E4B81C4-0B07-4B35-8337-268050F70894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E4B81C4-0B07-4B35-8337-268050F70894}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E4B81C4-0B07-4B35-8337-268050F70894}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E4B81C4-0B07-4B35-8337-268050F70894}.Release|Any CPU.Build.0 = Release|Any CPU + {8A0884C8-D2D8-48FA-B936-A91EC3F39C0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A0884C8-D2D8-48FA-B936-A91EC3F39C0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A0884C8-D2D8-48FA-B936-A91EC3F39C0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A0884C8-D2D8-48FA-B936-A91EC3F39C0F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal