remove preview3

build.fsx

@@ -46,8 +46,8 @@ let tags = "nuget, bundler, F#"
 let solutionFile  = "Paket.sln"
 
 // Pattern specifying assemblies to be tested using NUnit
-let testAssemblies = "tests/**/bin/Release/net46/*Tests*.dll"
-let integrationTestAssemblies = "integrationtests/Paket.IntegrationTests/bin/Release/net46/*Tests*.dll"
+let testAssemblies = "tests/**/bin/Release/net461/*Tests*.dll"
+let integrationTestAssemblies = "integrationtests/Paket.IntegrationTests/bin/Release/net461/*Tests*.dll"
 
 // Git configuration (used for publishing documentation in gh-pages branch)
 // The profile where the project is posted
@@ -69,7 +69,7 @@ let mutable dotnetExePath = "dotnet"
 // --------------------------------------------------------------------------------------
 
 let buildDir = "bin"
-let buildDirNet46 = "bin/net46"
+let buildDirNet461 = "bin/net461"
 let buildDirNetCore = "bin_netcore"
 let tempDir = "temp"
 let buildMergedDir = buildDir @@ "merged"
@@ -123,8 +123,8 @@ let genCSAssemblyInfo (projectPath: string) =
 
 // 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"
+    let csProjs = !! "src/**/*.csproj"
     fsProjs |> Seq.iter genFSAssemblyInfo
     csProjs |> Seq.iter genCSAssemblyInfo
 )
@@ -141,7 +141,7 @@ Target "Clean" (fun _ ->
     !! "src/**/bin"
     ++ "tests/**/bin"
     ++ buildDir
-    ++ buildDirNet46
+    ++ buildDirNet461
     ++ buildDirNetCore
     ++ tempDir
     |> CleanDirs
@@ -203,15 +203,15 @@ Target "DotnetRestore" (fun _ ->
 
     DotNetCli.Restore (fun c ->
         { c with
-            Project = "Paket.preview3.sln"
+            Project = "Paket.sln"
             ToolPath = dotnetExePath
         })
 )
 
 Target "DotnetBuild" (fun _ ->
     DotNetCli.Build (fun c ->
         { c with
-            Project = "Paket.preview3.sln"
+            Project = "Paket.sln"
             ToolPath = dotnetExePath
             AdditionalArgs = [ "/p:SourceLinkCreate=true" ]
         })
@@ -221,9 +221,10 @@ Target "DotnetBuild" (fun _ ->
 Target "DotnetPublish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
-            Project = "src/Paket.preview3"
+            Project = "src/Paket"
             ToolPath = dotnetExePath
             Output = FullName (currentDirectory </> buildDirNetCore)
+            AdditionalArgs = [ "-f netcoreapp2.1" ]
         })
 )
 "Clean" ==> "DotnetBuild" ?=> "DotnetPublish"
@@ -233,19 +234,19 @@ Target "DotnetPackage" (fun _ ->
     CleanDir outPath
     DotNetCli.Pack (fun c ->
         { c with
-            Project = "src/Paket.Core.preview3/Paket.Core.fsproj"
+            Project = "src/Paket.Core/Paket.Core.fsproj"
             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"
+            Project = "src/Paket/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"
+            Project = "src/Paket.Bootstrapper/Paket.Bootstrapper.csproj"
             ToolPath = dotnetExePath
             AdditionalArgs = [(sprintf "-o \"%s\"" outPath); (sprintf "/p:Version=%s" release.NugetVersion)]
         })
@@ -256,7 +257,7 @@ Target "DotnetTest" (fun _ ->
 
     DotNetCli.Test (fun c ->
         { c with
-            Project = "tests/Paket.Tests.preview3/Paket.Tests.fsproj"
+            Project = "tests/Paket.Tests/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)
@@ -272,10 +273,11 @@ 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/Paket.IntegrationTests.fsproj"
             ToolPath = dotnetExePath
             AdditionalArgs =
               [ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
+                "--framework=netcoreapp2.0"
                 sprintf "--logger:trx;LogFileName=%s" ("tests_result/netcore/Paket.IntegrationTests/TestResult.trx" |> Path.GetFullPath) ]
             TimeOut = TimeSpan.FromMinutes 60.
         })
@@ -342,13 +344,13 @@ Target "MergePaketTool" (fun _ ->
 
     let toPack =
         mergeLibs
-        |> List.map (fun l -> buildDirNet46 @@ l)
+        |> List.map (fun l -> buildDirNet461 @@ l)
         |> separated " "
 
     let result =
         ExecProcess (fun info ->
             info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
-            info.Arguments <- sprintf "/lib:%s /ver:%s /out:%s %s" buildDirNet46 release.AssemblyVersion paketFile toPack
+            info.Arguments <- sprintf "/lib:%s /ver:%s /out:%s %s" buildDirNet461 release.AssemblyVersion paketFile toPack
             ) (TimeSpan.FromMinutes 5.)
 
     if result <> 0 then failwithf "Error during ILRepack execution."

docs/tools/generate.fsx

@@ -1,6 +1,6 @@
 /// Getting help docs from Paket.exe
-#r "../../bin/net46/Argu.dll"
-#r "../../bin/net46/Paket.exe"
+#r "../../bin/net461/Argu.dll"
+#r "../../bin/net461/Paket.exe"
 open System.IO
 
 

integrationtests/Paket.IntegrationTests/App.config

@@ -14,6 +14,36 @@
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="10.0.0.0" />
   </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Collections.NonGeneric" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Runtime.Serialization.Formatters" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.1.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.2.0" />
+  </dependentAssembly>
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="System.Xml.XmlDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />

integrationtests/Paket.IntegrationTests/InitSpecs.fs

@@ -39,7 +39,7 @@ let ``#1743 empty log file``() =
 #endif
 let ``#1240 current bootstrapper should work``() =
     CleanDir (scenarioTempPath "i001240-bootstrapper")
-    let paketToolPath = FullName(__SOURCE_DIRECTORY__ + "../../../bin/paket.bootstrapper.exe")
+    let paketToolPath = FullName(__SOURCE_DIRECTORY__ + "../../../bin/net461/paket.bootstrapper.exe")
     CopyFile (scenarioTempPath "i001240-bootstrapper") paketToolPath
 
     let result =

integrationtests/Paket.IntegrationTests/PackSpecs.fs

@@ -586,11 +586,6 @@ let ``#2694 paket fixnuspec should not remove project references``() =
     | None -> Assert.Fail("Expected package to still contain the FSharp.Core reference!")
     | Some s -> ignore s
 
-    // Should we remove Microsoft.NETCore.App?
-    // Problably not as "packaged" console applications have this dependency by default, see https://www.nuget.org/packages/dotnet-mergenupkg
-    nuspec.Dependencies.Value.Length
-    |> shouldEqual 3
-
 [<Test>]
 let ``#2765 pack single template does not evaluate other template`` () =
     let scenario = "i002765-evaluate-only-single-template"

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <DefineConstants Condition=" '$(TargetFramework)' != 'net461'">PAKET_NETCORE;NO_UNIT_PLATFORMATTRIBUTE;TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;FAKE_NETSTANDARD_API;@(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\paket-files\forki\FsUnit\FsUnit.fs">
@@ -48,5 +48,9 @@
       <HintPath>..\..\packages\build\FAKE\tools\FakeLib.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net461'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+  </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

integrationtests/Paket.IntegrationTests/TestHelper.fs

@@ -23,7 +23,7 @@ let paketToolPath =
 #if PAKET_NETCORE
     dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin_netcore/paket.dll")
 #else
-    "", FullName(__SOURCE_DIRECTORY__ + "../../../bin/net46/paket.exe")
+    "", FullName(__SOURCE_DIRECTORY__ + "../../../bin/net461/paket.exe")
 #endif
 
 let integrationTestPath = FullName(__SOURCE_DIRECTORY__ + "../../../integrationtests/scenarios")