From d6005375c8c543912d7aac4050dbfa65227c2c56 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Thu, 17 Dec 2015 23:25:42 +0600 Subject: [PATCH 01/12] Convert the project to the latest available versions of .NET and F#. --- Naggum.Runtime/Naggum.Runtime.csproj | 7 +++++-- Naggum.Test/Naggum.Test.fsproj | 24 +++++++++++++++++---- Naggum.sln | 11 ++++++---- ngc/App.config | 26 +++++++++++++++++++++++ ngc/ngc.fsproj | 31 +++++++++++++++++++++++----- ngi/app.config | 3 +++ ngi/ngi.csproj | 14 ++++++++++--- 7 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 ngc/App.config create mode 100644 ngi/app.config diff --git a/Naggum.Runtime/Naggum.Runtime.csproj b/Naggum.Runtime/Naggum.Runtime.csproj index 5630aa4..0cb6973 100644 --- a/Naggum.Runtime/Naggum.Runtime.csproj +++ b/Naggum.Runtime/Naggum.Runtime.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties Naggum.Runtime Naggum.Runtime - v4.0 + v4.6.1 512 + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ TRACE prompt 4 + false diff --git a/Naggum.Test/Naggum.Test.fsproj b/Naggum.Test/Naggum.Test.fsproj index 5c8264b..f2bd198 100644 --- a/Naggum.Test/Naggum.Test.fsproj +++ b/Naggum.Test/Naggum.Test.fsproj @@ -9,8 +9,11 @@ Library Naggum.Test Naggum.Test - v4.0 + v4.6.1 Naggum.Test + 4.4.0.0 + 11 + true @@ -31,15 +34,28 @@ 3 bin\Release\Naggum.Test.XML - - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + True + - ..\packages\NUnit.2.6.1\lib\nunit.framework.dll True diff --git a/Naggum.sln b/Naggum.sln index c129483..dd4ccd2 100644 --- a/Naggum.sln +++ b/Naggum.sln @@ -1,8 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ngc", "ngc\ngc.fsproj", "{A4269C5E-E4AC-44BF-A06E-1B45248910AD}" -EndProject +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test programs", "Test programs", "{2972575D-A421-4759-AE89-57560E0224AE}" ProjectSection(SolutionItems) = preProject tests\comment.naggum = tests\comment.naggum @@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test programs", "Test progr tests\test.result = tests\test.result EndProjectSection EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ngc", "ngc\ngc.fsproj", "{A4269C5E-E4AC-44BF-A06E-1B45248910AD}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Naggum.Runtime", "Naggum.Runtime\Naggum.Runtime.csproj", "{402B5E79-E063-4833-AE4B-2986AEEC1D75}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ngi", "ngi\ngi.csproj", "{34E781DF-EAD9-4034-ADE4-8DA41A16644A}" @@ -64,6 +66,7 @@ Global {38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {38230CBD-DE3E-4470-925F-DE966E8691AA}.Debug|x86.ActiveCfg = Debug|Any CPU {38230CBD-DE3E-4470-925F-DE966E8691AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {38230CBD-DE3E-4470-925F-DE966E8691AA}.Release|Any CPU.Build.0 = Release|Any CPU diff --git a/ngc/App.config b/ngc/App.config new file mode 100644 index 0000000..9f184b0 --- /dev/null +++ b/ngc/App.config @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ngc/ngc.fsproj b/ngc/ngc.fsproj index 6a9385a..28ce189 100644 --- a/ngc/ngc.fsproj +++ b/ngc/ngc.fsproj @@ -9,11 +9,14 @@ Exe ngc ngc - v4.0 - Client + v4.6.1 + + ngc + 4.4.0.0 + 11 true @@ -37,8 +40,19 @@ AnyCPU bin\Release\ngc.XML - - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + @@ -61,8 +75,10 @@ ..\3rdparty\FParsecCS.dll + + True + - @@ -74,6 +90,11 @@ True + + + Always + +