Merge branch 'full_netcore' of https://github.com/enricosada/Paket

Paket.preview3.sln

@@ -7,6 +7,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket.Core", "src/Paket.Cor
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket", "src/Paket.preview3/Paket.fsproj", "{6CA5144C-5444-46E8-9B89-86122B5E2D32}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Paket.Bootstrapper", "src/Paket.Bootstrapper.preview3/Paket.Bootstrapper.csproj", "{8CC1605A-307B-4B68-876D-1D38ED48EA4D}"
+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}"
@@ -57,6 +59,18 @@ Global
 		{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
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|x64.ActiveCfg = Debug|x64
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|x64.Build.0 = Debug|x64
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|x86.ActiveCfg = Debug|x86
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Debug|x86.Build.0 = Debug|x86
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|x64.ActiveCfg = Release|x64
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|x64.Build.0 = Release|x64
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|x86.ActiveCfg = Release|x86
+		{8CC1605A-307B-4B68-876D-1D38ED48EA4D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build.fsx

@@ -237,6 +237,18 @@ Target "DotnetPackage" (fun _ ->
             ToolPath = dotnetExePath
             AdditionalArgs = [(sprintf "-o \"%s\"" outPath); (sprintf "/p:Version=%s" release.NugetVersion)]
         })
+    DotNetCli.Pack (fun c ->
+        { c with
+            Project = "src/Paket.preview3/Paket.fsproj"
+            ToolPath = dotnetExePath
+            AdditionalArgs = [(sprintf "-o \"%s\"" outPath); (sprintf "/p:Version=%s" release.NugetVersion)]
+        })
+    DotNetCli.Pack (fun c ->
+        { c with
+            Project = "src/Paket.Bootstrapper.preview3/Paket.Bootstrapper.csproj"
+            ToolPath = dotnetExePath
+            AdditionalArgs = [(sprintf "-o \"%s\"" outPath); (sprintf "/p:Version=%s" release.NugetVersion)]
+        })
 )
 
 Target "DotnetTest" (fun _ ->
@@ -424,12 +436,17 @@ Target "NuGet" (fun _ ->
 
 Target "MergeDotnetCoreIntoNuget" (fun _ ->
 
-    let nupkg = tempDir </> sprintf "Paket.Core.%s.nupkg" (release.NugetVersion) |> Path.GetFullPath
-    let netcoreNupkg = tempDir </> "dotnetcore" </> sprintf "Paket.Core.%s.nupkg" (release.NugetVersion) |> Path.GetFullPath
-
     let runTool = runCmdIn "tools" dotnetExePath
 
-    runTool """mergenupkg --source "%s" --other "%s" --framework netstandard2.0 """ nupkg netcoreNupkg
+    let mergeNupkg packageName args =
+        let nupkg = tempDir </> sprintf "%s.%s.nupkg" packageName (release.NugetVersion) |> Path.GetFullPath
+        let netcoreNupkg = tempDir </> "dotnetcore" </> sprintf "%s.%s.nupkg" packageName (release.NugetVersion) |> Path.GetFullPath
+
+        runTool """mergenupkg --source "%s" --other "%s" %s""" nupkg netcoreNupkg args
+
+    mergeNupkg "Paket.Core" "--framework netstandard2.0"
+    mergeNupkg "Paket" "--tools"
+    mergeNupkg "paket.bootstrapper" "--tools"
 )
 
 Target "PublishNuGet" (fun _ ->
@@ -637,6 +654,7 @@ Target "ReleaseGitHub" (fun _ ->
     |> uploadFile "./bin/paket.bootstrapper.exe"
     |> uploadFile ".paket/paket.targets"
     |> uploadFile ".paket/Paket.Restore.targets"
+    |> uploadFile (tempDir </> sprintf "Paket.%s.nupkg" (release.NugetVersion))
     |> releaseDraft
     |> Async.RunSynchronously
 )

integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj

@@ -3,7 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <PaketTestsSourcesDir>..\Paket.IntegrationTests</PaketTestsSourcesDir>
-    <DefineConstants>PAKET_NETCORE</DefineConstants>
+    <DefineConstants>
+      PAKET_NETCORE;
+      NO_UNIT_PLATFORMATTRIBUTE;
+      TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;
+      FAKE_NETSTANDARD_API;
+      @(DefineConstants)
+    </DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

integrationtests/Paket.IntegrationTests/App.config

@@ -7,7 +7,7 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
   </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>

integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs

@@ -25,7 +25,7 @@ let ``#1182 framework restrictions overwrite each other``() =
     lockFile.Contains("framework: winv4.5") |> shouldEqual false
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform("Mono")>] // PATH TOO LONG on Windows...

integrationtests/Paket.IntegrationTests/FullGitSpecs.fs

@@ -47,7 +47,7 @@ let ``#1353 should use NuGet source from git repo``() =
     |> shouldEqual (SemVer.Parse "1.1.3")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should use git tag as NuGet source``() = 
@@ -61,7 +61,7 @@ let ``#1353 should use git tag as NuGet source``() =
     |> shouldEqual (SemVer.Parse "2.0.0")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should use git tag with operatore as NuGet source``() = 
@@ -75,7 +75,7 @@ let ``#1353 should use git tag with operatore as NuGet source``() =
     |> shouldEqual (SemVer.Parse "2.0.0")
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should restore NuGet source from built git repo``() = 
@@ -88,7 +88,7 @@ let ``#1353 should restore NuGet source from built git repo``() =
     Directory.Exists arguPackagesDir |> shouldEqual true
 
 [<Test>]
-#if NETCOREAPP2_0
+#if TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005
 [<Ignore("Known failure on netcore: ref https://github.com/fsprojects/Paket/issues/3005")>]
 #endif
 let ``#1353 should build NuGet source from git repo``() = 

integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs

@@ -15,7 +15,7 @@ let ``#183 outdated without params``() =
     msg |> shouldContainText "FSharp.Formatting 2.4 ->"
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Mono">] // PATH TOO LONG on Windows...
@@ -26,7 +26,7 @@ let ``#183 outdated --ignore-constraint``() =
 
 
 [<Test>]
-#if NETCOREAPP2_0
+#if NO_UNIT_PLATFORMATTRIBUTE
 [<Ignore "PlatformAttribute not supported by netstandard NUnit">]
 #else
 [<Platform "Mono">] // PATH TOO LONG on Windows...