diff --git a/Paket.preview3.sln b/Paket.preview3.sln deleted file mode 100644 index e76e99b670..0000000000 --- a/Paket.preview3.sln +++ /dev/null @@ -1,85 +0,0 @@ - -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}" -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}" -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}" -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|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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|Any CPU.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}.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 - {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}.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 - {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 - 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 -EndGlobal diff --git a/build.fsx b/build.fsx index d12dcf0245..27c32354ca 100644 --- a/build.fsx +++ b/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,7 +203,7 @@ Target "DotnetRestore" (fun _ -> DotNetCli.Restore (fun c -> { c with - Project = "Paket.preview3.sln" + Project = "Paket.sln" ToolPath = dotnetExePath }) ) @@ -211,7 +211,7 @@ Target "DotnetRestore" (fun _ -> 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." diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index 3032e77648..4047e1ef11 100644 --- a/docs/tools/generate.fsx +++ b/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 diff --git a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj deleted file mode 100644 index a23e3d7957..0000000000 --- a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj +++ /dev/null @@ -1,67 +0,0 @@ - - - - netcoreapp2.0 - ..\Paket.IntegrationTests - - PAKET_NETCORE; - NO_UNIT_PLATFORMATTRIBUTE; - TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005; - FAKE_NETSTANDARD_API; - @(DefineConstants) - - - - - - ..\..\packages\build\FAKE\tools\FakeLib.dll - - - - - True - FsUnit.fs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/integrationtests/Paket.IntegrationTests.preview3/Program.fs b/integrationtests/Paket.IntegrationTests.preview3/Program.fs deleted file mode 100644 index b44f92ef04..0000000000 --- a/integrationtests/Paket.IntegrationTests.preview3/Program.fs +++ /dev/null @@ -1,4 +0,0 @@ -module Program - -let [] main _ = - 0 diff --git a/integrationtests/Paket.IntegrationTests/App.config b/integrationtests/Paket.IntegrationTests/App.config index 3a882c4929..b2b7052805 100644 --- a/integrationtests/Paket.IntegrationTests/App.config +++ b/integrationtests/Paket.IntegrationTests/App.config @@ -14,6 +14,36 @@ + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True diff --git a/integrationtests/Paket.IntegrationTests/InitSpecs.fs b/integrationtests/Paket.IntegrationTests/InitSpecs.fs index 527a0615a8..e10001a048 100644 --- a/integrationtests/Paket.IntegrationTests/InitSpecs.fs +++ b/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 = diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index 990c0c9e84..14f944eec7 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/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 - [] let ``#2765 pack single template does not evaluate other template`` () = let scenario = "i002765-evaluate-only-single-template" diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index a026e63247..e91759e9ae 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -1,9 +1,9 @@  - Library - net46 + net461;netcoreapp2.1 true + PAKET_NETCORE;NO_UNIT_PLATFORMATTRIBUTE;TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;FAKE_NETSTANDARD_API;@(DefineConstants) @@ -48,5 +48,9 @@ ..\..\packages\build\FAKE\tools\FakeLib.dll + + + + \ No newline at end of file diff --git a/integrationtests/Paket.IntegrationTests/TestHelper.fs b/integrationtests/Paket.IntegrationTests/TestHelper.fs index 59ce69f927..d3919a87c8 100644 --- a/integrationtests/Paket.IntegrationTests/TestHelper.fs +++ b/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") diff --git a/src/Paket.preview3/runtimeconfig.template.json b/integrationtests/Paket.IntegrationTests/runtimeconfig.template.json similarity index 100% rename from src/Paket.preview3/runtimeconfig.template.json rename to integrationtests/Paket.IntegrationTests/runtimeconfig.template.json diff --git a/src/Paket.Bootstrapper.preview3/Paket.Bootstrapper.csproj b/src/Paket.Bootstrapper.preview3/Paket.Bootstrapper.csproj deleted file mode 100644 index d224aa9a40..0000000000 --- a/src/Paket.Bootstrapper.preview3/Paket.Bootstrapper.csproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - Exe - netcoreapp2.1 - paket.bootstrapper - true - - ..\Paket.Bootstrapper - - NO_SSL3; - NO_SYSTEMWEBPROXY; - PAKET_BOOTSTRAP_NO_CACHE; - PAKET_BOOTSTRAP_WORKAROUND_MSBUILD_URLS; - $(DefineConstants) - - - - - LOCAL_GITHUB;$(DefineConstants) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj b/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj index 94cda77379..adc1a8b228 100644 --- a/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj +++ b/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj @@ -2,16 +2,26 @@ Exe - net46 + net461;netcoreapp2.1 Paket.Bootstrapper.Program paket.bootstrapper false + ..\..\bin\ + NO_SSL3;NO_SYSTEMWEBPROXY;PAKET_BOOTSTRAP_NO_CACHE;PAKET_BOOTSTRAP_WORKAROUND_MSBUILD_URLS;$(DefineConstants) + + + LOCAL_GITHUB;$(DefineConstants) + + - + + + + \ No newline at end of file diff --git a/src/Paket.Bootstrapper/paket.references b/src/Paket.Bootstrapper/paket.references new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.preview3/Paket.Core.fsproj deleted file mode 100644 index 4816582da8..0000000000 --- a/src/Paket.Core.preview3/Paket.Core.fsproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - netstandard2.0 - ..\Paket.Core - NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) - true - $(PAKET_PROJ_VERSION) - $(PAKET_PROJ_VERSION) - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - - - True - AssemblyReader.fs - - - Paket.Restore.targets - - - - - True - Globbing.fs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(DefineConstants);DOTNETCORE;NETSTANDARD1_5;NETSTANDARD1_6;USE_HTTP_CLIENT - - - \ No newline at end of file diff --git a/src/Paket.Core.preview3/app.config b/src/Paket.Core.preview3/app.config deleted file mode 100644 index 4526f73224..0000000000 --- a/src/Paket.Core.preview3/app.config +++ /dev/null @@ -1,44 +0,0 @@ - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - - diff --git a/src/Paket.Core.preview3/paket.references b/src/Paket.Core.preview3/paket.references deleted file mode 100644 index ee433115d8..0000000000 --- a/src/Paket.Core.preview3/paket.references +++ /dev/null @@ -1,8 +0,0 @@ -Newtonsoft.Json -Mono.Cecil -Chessie -System.Security.Cryptography.ProtectedData -System.Net.Http.WinHttpHandler - -File:Globbing.fs . -File:AssemblyReader.fs . diff --git a/src/Paket.Core/Common/NetUtils.fs b/src/Paket.Core/Common/NetUtils.fs index 503746ac20..e3cd1e2b59 100644 --- a/src/Paket.Core/Common/NetUtils.fs +++ b/src/Paket.Core/Common/NetUtils.fs @@ -357,7 +357,7 @@ let useDefaultHandler = let createHttpHandlerRaw(url, auth: Auth option) : HttpMessageHandler = let proxy = getDefaultProxyFor url -#if !NO_WINCLIENTHANDLER + if isWindows && not useDefaultHandler then // See https://github.com/dotnet/corefx/issues/31098 let handler = new WinHttpHandler(Proxy = proxy) @@ -382,7 +382,6 @@ let createHttpHandlerRaw(url, auth: Auth option) : HttpMessageHandler = handler.WindowsProxyUsePolicy <- WindowsProxyUsePolicy.UseCustomProxy handler :> _ else -#endif let handler = new HttpClientHandler( UseProxy = true, diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index 9b6f981175..c735ffad32 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -1,13 +1,20 @@  - net45 + net461;netstandard2.0 + true + $(PAKET_PROJ_VERSION) + $(PAKET_PROJ_VERSION) + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb TRACE - - USE_WEB_CLIENT_FOR_UPLOAD;NO_WINCLIENTHANDLER;NO_MAXCONNECTIONPERSERVER + + NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) + + + USE_WEB_CLIENT_FOR_UPLOAD;NO_MAXCONNECTIONPERSERVER @@ -101,11 +108,14 @@ - + + + $(DefineConstants);DOTNETCORE;NETSTANDARD1_5;NETSTANDARD1_6;USE_HTTP_CLIENT + \ No newline at end of file diff --git a/src/Paket.Core/app.config b/src/Paket.Core/app.config index 3bcdae9ead..4526f73224 100644 --- a/src/Paket.Core/app.config +++ b/src/Paket.Core/app.config @@ -11,4 +11,34 @@ + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + diff --git a/src/Paket.Core/paket.references b/src/Paket.Core/paket.references index db28b5c926..00d31f464e 100644 --- a/src/Paket.Core/paket.references +++ b/src/Paket.Core/paket.references @@ -2,6 +2,8 @@ Newtonsoft.Json FSharp.Core Mono.Cecil Chessie +System.Security.Cryptography.ProtectedData +System.Net.Http.WinHttpHandler System.Net.Http File:Globbing.fs Common\ diff --git a/src/Paket.preview3/Paket.fsproj b/src/Paket.preview3/Paket.fsproj deleted file mode 100644 index 4d01af21fc..0000000000 --- a/src/Paket.preview3/Paket.fsproj +++ /dev/null @@ -1,21 +0,0 @@ - - - Exe - netcoreapp2.1 - Paket - paket - true - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Paket.preview3/paket.references b/src/Paket.preview3/paket.references deleted file mode 100644 index 6090fa038a..0000000000 --- a/src/Paket.preview3/paket.references +++ /dev/null @@ -1,2 +0,0 @@ -Argu -Chessie \ No newline at end of file diff --git a/src/Paket/App.config b/src/Paket/App.config index 6600ff7c93..fde8e552ef 100644 --- a/src/Paket/App.config +++ b/src/Paket/App.config @@ -15,4 +15,34 @@ + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + \ No newline at end of file diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index c6fbdb6039..8594b4ea8d 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -1,15 +1,18 @@  Exe - net46 + net461;netcoreapp2.1 false ..\..\bin\ + Paket + paket + true - + diff --git a/src/Paket/runtimeconfig.template.json b/src/Paket/runtimeconfig.template.json new file mode 100644 index 0000000000..9336abc817 --- /dev/null +++ b/src/Paket/runtimeconfig.template.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://gist.githubusercontent.com/natemcmaster/0bdee16450f8ec1823f2c11af880ceeb/raw/runtimeconfig.template.schema.json", + // '2' allows for major-version roll-forward + "rollForwardOnNoCandidateFx": 2 +} \ No newline at end of file diff --git a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj index 4d8dfd2a38..5d185da7a8 100644 --- a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj +++ b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj @@ -2,7 +2,7 @@ Library - net46 + net461 true diff --git a/tests/Paket.Bootstrapper.Tests/app.config b/tests/Paket.Bootstrapper.Tests/app.config index 1aa7c4bc9a..f0065d9e71 100644 --- a/tests/Paket.Bootstrapper.Tests/app.config +++ b/tests/Paket.Bootstrapper.Tests/app.config @@ -1,6 +1,46 @@  + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True diff --git a/tests/Paket.Tests.preview3/Paket.Tests.fsproj b/tests/Paket.Tests.preview3/Paket.Tests.fsproj deleted file mode 100644 index f44f466298..0000000000 --- a/tests/Paket.Tests.preview3/Paket.Tests.fsproj +++ /dev/null @@ -1,241 +0,0 @@ - - - netcoreapp2.1 - ..\Paket.Tests - WEBPROXY_NETSTANDARD;$(DefineConstants) - - - false - - WEBPROXY_NETSTANDARD; - TESTSUITE_RUNS_ON_DOTNETCORE; - NO_UNIT_PLATFORMATTRIBUTE; - NO_UNIT_TIMEOUTATTRIBUTE; - @(DefineConstants) - - - - false - - - - - True - FsUnit.fs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %(TestAsset.Identity) - Always - - - - - - - - - - - - - - - - diff --git a/tests/Paket.Tests.preview3/Program.fs b/tests/Paket.Tests.preview3/Program.fs deleted file mode 100644 index b44f92ef04..0000000000 --- a/tests/Paket.Tests.preview3/Program.fs +++ /dev/null @@ -1,4 +0,0 @@ -module Program - -let [] main _ = - 0 diff --git a/tests/Paket.Tests/App.config b/tests/Paket.Tests/App.config index 3a882c4929..b2b7052805 100644 --- a/tests/Paket.Tests/App.config +++ b/tests/Paket.Tests/App.config @@ -14,6 +14,36 @@ + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + + + True + + + True diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index b33c91acaf..38e4ae38a5 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -2,10 +2,13 @@ Library - net46 + net461;netcoreapp2.1 true false + + WEBPROXY_NETSTANDARD;TESTSUITE_RUNS_ON_DOTNETCORE;NO_UNIT_PLATFORMATTRIBUTE;NO_UNIT_TIMEOUTATTRIBUTE;@(DefineConstants) + True @@ -29,106 +32,59 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Always - - - Always - + + + + + + + + - - Always - + - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - + + + + + + + + + + - - Always - - - Always - + + - - Always - - - Always - - + + @@ -164,88 +120,35 @@ - + - - PreserveNewest - - - Always - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Always - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Always - - - Always - - - Always - - - PreserveNewest - - - Always - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,6 +160,8 @@ + + @@ -301,6 +206,19 @@ + + + + + + + %(TestAsset.Identity) + Always + + + +