From 54f0af0c86723a0f37e517f142a4474ced9f6f7f Mon Sep 17 00:00:00 2001 From: Andrew Grant Date: Sun, 25 Jun 2017 15:38:38 +0100 Subject: [PATCH 1/4] Target correct version of Expecto for .NET 4.5 --- Content/tests/MyLib.Tests/MyLib.Tests.fsproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj index bb425c6d..902d07e8 100755 --- a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj +++ b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj @@ -10,10 +10,15 @@ + + + + + + - From 82a66f77d8d782911e371546bc56d6d313536a19 Mon Sep 17 00:00:00 2001 From: Andrew Grant Date: Sun, 25 Jun 2017 15:40:06 +0100 Subject: [PATCH 2/4] Corrected example command for installing template --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2ffd5b8..c5f68cbb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Stable | Prerelease ### Grab the template from nuget: ``` -dotnet new -i MiniScaffold::* +dotnet new -i "MiniScaffold::*" ``` ### Use the new template: From c522dbc3155f3b84ec06a1f5fc661323f62c8657 Mon Sep 17 00:00:00 2001 From: Andrew Grant Date: Sun, 25 Jun 2017 15:42:36 +0100 Subject: [PATCH 3/4] Use FSharp.Core 4.2.* for netcoreapp1.1 --- Content/src/MyLib/MyLib.fsproj | 2 +- Content/tests/MyLib.Tests/MyLib.Tests.fsproj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Content/src/MyLib/MyLib.fsproj b/Content/src/MyLib/MyLib.fsproj index 85e54428..a716e300 100755 --- a/Content/src/MyLib/MyLib.fsproj +++ b/Content/src/MyLib/MyLib.fsproj @@ -27,7 +27,7 @@ - + diff --git a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj index 902d07e8..858986e7 100755 --- a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj +++ b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj @@ -12,12 +12,13 @@ + + - From 5b46334f0b544abdf369ff85fb34202740851abc Mon Sep 17 00:00:00 2001 From: Andrew Grant Date: Sun, 25 Jun 2017 15:52:15 +0100 Subject: [PATCH 4/4] Added targets for NET Framework 4.6.1 --- Content/src/MyLib/MyLib.fsproj | 5 ++++- Content/tests/MyLib.Tests/MyLib.Tests.fsproj | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Content/src/MyLib/MyLib.fsproj b/Content/src/MyLib/MyLib.fsproj index a716e300..7b9cfec1 100755 --- a/Content/src/MyLib/MyLib.fsproj +++ b/Content/src/MyLib/MyLib.fsproj @@ -1,6 +1,6 @@ - netstandard1.6;net45 + netstandard1.6;net45;net461 @@ -26,6 +26,9 @@ + + + diff --git a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj index 858986e7..061c0907 100755 --- a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj +++ b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.1;net45 + netcoreapp1.1;net45;net461 @@ -14,6 +14,10 @@ + + + +