[WIP] General overdue updates

Directory.Build.props

@@ -1,5 +1,4 @@
 <Project>
- <PropertyGroup>
-	<TargetFrameworkRootPath>$(MSBuildThisFileDirectory)packages\build\0x53A.ReferenceAssemblies.Paket\tools\framework</TargetFrameworkRootPath>
- </PropertyGroup>
+ <Import Project="$(MSBuildThisFileDirectory)packages\build\Microsoft.NETFramework.ReferenceAssemblies.net45\build\Microsoft.NETFramework.ReferenceAssemblies.net45.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)packages\build\Microsoft.NETFramework.ReferenceAssemblies.net46\build\Microsoft.NETFramework.ReferenceAssemblies.net46.targets" />
 </Project>

Paket.preview3.sln → Paket.netstandard.sln

@@ -1,71 +1,86 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket.Core", "src/Paket.Core.preview3/Paket.Core.fsproj", "{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket.Core", "src\Paket.Core.netstandard\Paket.Core.fsproj", "{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket", "src/Paket.preview3/Paket.fsproj", "{6CA5144C-5444-46E8-9B89-86122B5E2D32}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "paket-cli", "src\paket-cli\paket-cli.fsproj", "{6CA5144C-5444-46E8-9B89-86122B5E2D32}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{90759A76-746D-4599-9BCC-E10F8D2E1355}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Paket.Tests", "tests/Paket.Tests.preview3/Paket.Tests.fsproj", "{0156FA92-AF44-4242-B76F-18D0A367A8B2}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket.Tests", "tests\Paket.Tests.netstandard\Paket.Tests.fsproj", "{0156FA92-AF44-4242-B76F-18D0A367A8B2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integrationtests", "integrationtests", "{C53925AA-95B0-4595-9EE5-E7D3FA1F8E89}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Paket.IntegrationTests", "integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj", "{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Paket.IntegrationTests", "integrationtests\Paket.IntegrationTests.netstandard\Paket.IntegrationTests.fsproj", "{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|x86.Build.0 = Debug|Any CPU
 		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|x64.Build.0 = Release|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|x86.Build.0 = Release|Any CPU
 		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|x64.Build.0 = Debug|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|x86.Build.0 = Debug|Any CPU
 		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|x64.ActiveCfg = Release|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|x64.Build.0 = Release|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|x86.ActiveCfg = Release|Any CPU
+		{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|x86.Build.0 = Release|Any CPU
 		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x64.ActiveCfg = Debug|x64
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x64.Build.0 = Debug|x64
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x86.ActiveCfg = Debug|x86
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x86.Build.0 = Debug|x86
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x64.Build.0 = Debug|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Debug|x86.Build.0 = Debug|Any CPU
 		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x64.ActiveCfg = Release|x64
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x64.Build.0 = Release|x64
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x86.ActiveCfg = Release|x86
-		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x86.Build.0 = Release|x86
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x64.ActiveCfg = Release|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x64.Build.0 = Release|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x86.ActiveCfg = Release|Any CPU
+		{0156FA92-AF44-4242-B76F-18D0A367A8B2}.Release|x86.Build.0 = Release|Any CPU
 		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x64.ActiveCfg = Debug|x64
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x64.Build.0 = Debug|x64
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x86.ActiveCfg = Debug|x86
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x86.Build.0 = Debug|x86
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x64.Build.0 = Debug|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Debug|x86.Build.0 = Debug|Any CPU
 		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x64.ActiveCfg = Release|x64
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x64.Build.0 = Release|x64
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x86.ActiveCfg = Release|x86
-		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x86.Build.0 = Release|x86
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x64.ActiveCfg = Release|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x64.Build.0 = Release|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x86.ActiveCfg = Release|Any CPU
+		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B8685609-2523-42CA-A8D0-921436B8674A}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0156FA92-AF44-4242-B76F-18D0A367A8B2} = {90759A76-746D-4599-9BCC-E10F8D2E1355}
 		{BCF3D1A7-724E-4E33-AC88-70984B3CC03A} = {C53925AA-95B0-4595-9EE5-E7D3FA1F8E89}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B8685609-2523-42CA-A8D0-921436B8674A}
+	EndGlobalSection
 EndGlobal

build.fsx

@@ -122,8 +122,8 @@ let genCSAssemblyInfo (projectPath) =
 
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
-    let fsProjs =  !! "src/**/*.fsproj" |> Seq.filter (fun s -> not <| s.Contains("preview"))
-    let csProjs = !! "src/**/*.csproj" |> Seq.filter (fun s -> not <| s.Contains("preview"))
+    let fsProjs =  !! "src/**/*.fsproj" |> Seq.filter (fun s -> not <| s.Contains("netstandard"))
+    let csProjs = !! "src/**/*.csproj" |> Seq.filter (fun s -> not <| s.Contains("netstandard"))
     fsProjs |> Seq.iter genFSAssemblyInfo
     csProjs |> Seq.iter genCSAssemblyInfo
 )
@@ -203,15 +203,15 @@ Target "DotnetRestore" (fun _ ->
 
     DotNetCli.Restore (fun c ->
         { c with
-            Project = "Paket.preview3.sln"
+            Project = "Paket.netstandard.sln"
             ToolPath = dotnetExePath
         })
 )
 
 Target "DotnetBuild" (fun _ ->
     DotNetCli.Build (fun c ->
         { c with
-            Project = "Paket.preview3.sln"
+            Project = "Paket.netstandard.sln"
             ToolPath = dotnetExePath
             AdditionalArgs = [ "/p:SourceLinkCreate=true" ]
         })
@@ -221,7 +221,7 @@ Target "DotnetBuild" (fun _ ->
 Target "DotnetPublish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
-            Project = "src/Paket.preview3"
+            Project = "src/paket-cli"
             ToolPath = dotnetExePath
             Output = FullName (currentDirectory </> buildDirNetCore)
         })
@@ -233,7 +233,7 @@ Target "DotnetPackage" (fun _ ->
     CleanDir outPath
     DotNetCli.Pack (fun c ->
         { c with
-            Project = "src/Paket.Core.preview3/Paket.Core.fsproj"
+            Project = "src/Paket.Core.netstandard/Paket.Core.fsproj"
             ToolPath = dotnetExePath
             AdditionalArgs = [(sprintf "-o \"%s\"" outPath); (sprintf "/p:Version=%s" release.NugetVersion)]
         })
@@ -244,7 +244,7 @@ Target "DotnetTest" (fun _ ->
 
     DotNetCli.Test (fun c ->
         { c with
-            Project = "tests/Paket.Tests.preview3/Paket.Tests.fsproj"
+            Project = "tests/Paket.Tests.netstandard/Paket.Tests.fsproj"
             AdditionalArgs =
               [ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
                 sprintf "--logger:trx;LogFileName=%s" ("tests_result/netcore/Paket.Tests/TestResult.trx" |> Path.GetFullPath) ]
@@ -259,7 +259,7 @@ Target "RunIntegrationTestsNetCore" (fun _ ->
     System.Environment.SetEnvironmentVariable("PAKET_DISABLE_RUNTIME_RESOLUTION", "true")
     DotNetCli.Test (fun c ->
         { c with
-            Project = "integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj"
+            Project = "integrationtests/Paket.IntegrationTests.netstandard/Paket.IntegrationTests.fsproj"
             ToolPath = dotnetExePath
             AdditionalArgs =
               [ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
@@ -401,7 +401,7 @@ Target "NuGet" (fun _ ->
         testTemplateFiles
         |> Seq.iter (fun (f, d) -> File.Move(f, d))
 
-        let files = !! "src/**/*.preview*" |> Seq.toList
+        let files = !! "src/**/*.netstandard*" |> Seq.toList
         for file in files do
             File.Move(file,file + ".temp")
 

docs/tools/generate.fsx

@@ -49,16 +49,13 @@ let info =
 // For typical project, no changes are needed below
 // --------------------------------------------------------------------------------------
 
-#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
 #I "../../packages/build/FAKE/tools/"
 #r "NuGet.Core.dll"
 #r "FakeLib.dll"
 open Fake
+open Fake.DotNet
 open System.IO
 open Fake.FileHelper
-open FSharp.Literate
-open FSharp.MetadataFormat
-open FSharp.Formatting.Razor
 
 // Paths with template/source/output locations
 let bin        = __SOURCE_DIRECTORY__ @@ "../../bin"
@@ -68,6 +65,7 @@ let output     = __SOURCE_DIRECTORY__ @@ "../output"
 let files      = __SOURCE_DIRECTORY__ @@ "../files"
 let templates  = __SOURCE_DIRECTORY__ @@ "templates"
 let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting/"
+let fsFormattingBin = __SOURCE_DIRECTORY__ @@ "../../packages/build/FSharp.Formatting.CommandTool/tools/fsformatting.exe"
 let docTemplate = formatting @@ "templates/docpage.cshtml"
 
 // Where to look for *.csproj templates (in this order)
@@ -96,12 +94,23 @@ let buildReference () =
   let binaries =
     referenceBinaries
     |> List.map (fun lib-> bin @@ lib)
-  RazorMetadataFormat.Generate
+  binaries
+  |> FSFormatting.createDocsForDlls(fun s ->
+    { s with
+        ToolPath = fsFormattingBin
+        OutputDirectory = output @@ "reference"
+        LayoutRoots = layoutRootsAll.["en"]
+        LibDirs = [bin]
+        ProjectParameters = ("root", "../")::info
+        Source = __SOURCE_DIRECTORY__ @@ ".." @@ ".."
+        SourceRepository = githubLink @@ "tree/master" })  
+  (*RazorMetadataFormat.Generate
     ( binaries, output @@ "reference", layoutRootsAll.["en"],
       parameters = ("root", "../")::info,
       sourceRepo = githubLink @@ "tree/master",
       sourceFolder = __SOURCE_DIRECTORY__ @@ ".." @@ "..",
       publicOnly = true, libDirs = [bin] )
+  *)
 
 // Build documentation from `fsx` and `md` files in `docs/content`
 let buildDocumentation () =
@@ -125,11 +134,21 @@ let buildDocumentation () =
         match key with
         | Some lang -> layoutRootsAll.[lang]
         | None -> layoutRootsAll.["en"] // "en" is the default language
-    RazorLiterate.ProcessDirectory
+    FSFormatting.createDocs (fun s ->
+      { s with
+          ToolPath = fsFormattingBin
+          Source = dir
+          OutputDirectory = output @@ sub
+          Template = docTemplate
+          ProjectParameters = ("root", ".")::info
+          LayoutRoots = layoutRoots
+          })
+    (*RazorLiterate.ProcessDirectory
       ( dir, docTemplate, output @@ sub, replacements = ("root", ".")::info,
         layoutRoots = layoutRoots,
         generateAnchors = true )
-
+    *)
+
 // Generate
 copyFiles()
 #if HELP

integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj → integrationtests/Paket.IntegrationTests.netstandard/Paket.IntegrationTests.fsproj

@@ -57,7 +57,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Paket.Core.preview3\Paket.Core.fsproj" />
+    <ProjectReference Include="..\..\src\Paket.Core.netstandard\Paket.Core.fsproj" />
   </ItemGroup>
 
 </Project>

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -10,12 +10,13 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Paket.Tests</RootNamespace>
     <AssemblyName>Paket.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>Paket.Tests</Name>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

paket.dependencies

@@ -43,16 +43,19 @@ group Build
 
   nuget FAKE
   nuget FSharp.Formatting prerelease
+  nuget FSharp.Formatting.CommandTool prerelease
   nuget System.ValueTuple
   nuget Microsoft.AspNet.Razor
   nuget ILRepack
 
   github fsharp/FAKE modules/Octokit/Octokit.fsx
 
   # Note: this package was produced using https://github.com/jaredpar/xcopy-msbuild and contains the two directories ".NETFramework\v4.5" and ".NETPortable\v4.5"
-  nuget 0x53A.ReferenceAssemblies.Paket 0.2.0
+  //nuget 0x53A.ReferenceAssemblies.Paket 0.2.0
 
   source https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
-  nuget RoslynTools.MSBuild prerelease
+  nuget RoslynTools.MSBuild ~> 0.4.0 prerelease
   # Note: RoslynTools.ReferenceAssemblies does not contain the required reference assemblies for net45, so I created 0x53A.ReferenceAssemblies.Paket. It is much smaller, anyway.
   #nuget RoslynTools.ReferenceAssemblies prerelease
+  nuget Microsoft.NETFramework.ReferenceAssemblies.net45
+  nuget Microsoft.NETFramework.ReferenceAssemblies.net46