Begin migration to netstandard2.0

Author: panesofglass

build.fsx

@@ -248,7 +248,7 @@ Target "ReleaseDocs" (fun _ ->
     Branches.push tempDocsDir
 )
 
-#load "paket-files/fsharp/FAKE/modules/Octokit/Octokit.fsx"
+#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
 open Octokit
 
 Target "Release" (fun _ ->

docs/tools/generate.fsx

@@ -22,9 +22,9 @@ let info =
 // For typical project, no changes are needed below
 // --------------------------------------------------------------------------------------
 
-#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
-#r "../../packages/FAKE/tools/NuGet.Core.dll"
-#r "../../packages/FAKE/tools/FakeLib.dll"
+#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
+#r "../../packages/build/FAKE/tools/NuGet.Core.dll"
+#r "../../packages/build/FAKE/tools/FakeLib.dll"
 open Fake
 open System.IO
 open Fake.FileHelper
@@ -45,7 +45,7 @@ let content    = __SOURCE_DIRECTORY__ @@ "../content"
 let output     = __SOURCE_DIRECTORY__ @@ "../output"
 let files      = __SOURCE_DIRECTORY__ @@ "../files"
 let templates  = __SOURCE_DIRECTORY__ @@ "templates"
-let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
+let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/"
 let docTemplate = formatting @@ "templates/docpage.cshtml"
 
 // Where to look for *.csproj templates (in this order)
@@ -76,12 +76,12 @@ let references =
     // We replace the list and add required items manually as mcs doesn't like duplicates...
     let getItem name = loadedList |> Seq.find (fun l -> l.Contains name)
     [ (getItem "FSharp.Core").Replace("4.3.0.0", "4.3.1.0")
-      Path.GetFullPath "./../../packages/FSharp.Compiler.Service/lib/net40/FSharp.Compiler.Service.dll"
-      Path.GetFullPath "./../../packages/FSharp.Formatting/lib/net40/System.Web.Razor.dll"
-      Path.GetFullPath "./../../packages/FSharp.Formatting/lib/net40/RazorEngine.dll"
-      Path.GetFullPath "./../../packages/FSharp.Formatting/lib/net40/FSharp.Literate.dll"
-      Path.GetFullPath "./../../packages/FSharp.Formatting/lib/net40/FSharp.CodeFormat.dll"
-      Path.GetFullPath "./../../packages/FSharp.Formatting/lib/net40/FSharp.MetadataFormat.dll" ]
+      Path.GetFullPath "./../../packages/build/FSharp.Compiler.Service/lib/net40/FSharp.Compiler.Service.dll"
+      Path.GetFullPath "./../../packages/build/FSharp.Formatting/lib/net40/System.Web.Razor.dll"
+      Path.GetFullPath "./../../packages/build/FSharp.Formatting/lib/net40/RazorEngine.dll"
+      Path.GetFullPath "./../../packages/build/FSharp.Formatting/lib/net40/FSharp.Literate.dll"
+      Path.GetFullPath "./../../packages/build/FSharp.Formatting/lib/net40/FSharp.CodeFormat.dll"
+      Path.GetFullPath "./../../packages/build/FSharp.Formatting/lib/net40/FSharp.MetadataFormat.dll" ]
     |> Some
   else None
 

paket.dependencies

@@ -1,15 +1,16 @@
 source https://api.nuget.org/v3/index.json
 
-github fsharp/FAKE modules/Octokit/Octokit.fsx
-
 group Build
     source https://api.nuget.org/v3/index.json
 
     nuget FAKE
     nuget FSharp.Formatting
     nuget Nuget.CommandLine
+    github fsharp/FAKE modules/Octokit/Octokit.fsx
 
 group Test
+    source https://api.nuget.org/v3/index.json
+
     nuget NUnit
     nuget NUnit.Runners
     nuget NUnit3TestAdapter

paket.lock

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Version>2.0.14</Version>
   </PropertyGroup>
   <ItemGroup>

src/FSharp.Control.AsyncSeq/FSharp.Control.AsyncSeq.NetStandard.fsproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <IsPackable>false</IsPackable>
@@ -11,5 +12,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\FSharp.Control.AsyncSeq\FSharp.Control.AsyncSeq.NetStandard.fsproj" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

tests/FSharp.Control.AsyncSeq.Tests/FSharp.Control.AsyncSeq.Tests.NetCoreApp.fsproj

@@ -1 +1,3 @@
-NUnit
+group Test
+NUnit
+NUnit3TestAdapter