Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Full netcore #3183

Merged
merged 35 commits into from
Sep 21, 2018
Merged

Full netcore #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
16bad15
paket full .net core, as .net core tool
enricosada May 3, 2018
b208577
workaround msbuild bug https://github.com/Microsoft/msbuild/issues/3268
enricosada May 4, 2018
7ff2200
paket as tool
enricosada May 18, 2018
075801b
nunit platform attribute
enricosada May 18, 2018
2333b15
add define for known failure
enricosada May 18, 2018
2336677
fake api
enricosada May 18, 2018
8c9946f
test suite on .net core
enricosada May 18, 2018
a7408ed
no nunit timeout attribute
enricosada May 18, 2018
4654830
fix nunit platform
enricosada May 18, 2018
0c8f36e
fix .net core 2.1 (Contains has both char and string version)
enricosada May 18, 2018
86833ce
fix tests, from sdk 2.1 the assemblyinfo are generated, and override …
enricosada May 18, 2018
3b4cb5c
fix package name
enricosada May 18, 2018
fad1d2c
fix template
enricosada May 18, 2018
557cab4
pack Paket and Paket.boostrapper too
enricosada Sep 6, 2018
f8ef4a5
fix deps
enricosada Sep 6, 2018
9d4b409
do not bundle published .net core paket
enricosada Sep 6, 2018
eba510c
move dotnet-mergenupkg in a single group and upgrade version
enricosada Sep 12, 2018
3f3d673
merge paket and paket.bootstrapper as tools
enricosada Sep 12, 2018
70da8fc
add --output-dir argument to bootstrapper
enricosada Sep 12, 2018
5f72fb6
add --as-tool argument to bootstrapper
enricosada Sep 12, 2018
f5b6476
add logging
enricosada Sep 12, 2018
c5ba0f2
wip github download
enricosada Sep 12, 2018
7d8139e
add msbuild property PaketUseLocalGithub to use local github server
enricosada Sep 13, 2018
52d365d
refactor extract install behaviour
enricosada Sep 13, 2018
27f8efc
minimize diff
enricosada Sep 13, 2018
d164fb9
add help for --as-tool
enricosada Sep 13, 2018
b604b38
use package System.Configuration.ConfigurationManager to support AppS…
enricosada Sep 13, 2018
30dac40
fix tests
enricosada Sep 13, 2018
23c5b2d
add PaketBoostrapping target
enricosada Sep 14, 2018
d18c242
add --config-file to bootstrapper
enricosada Sep 14, 2018
3736069
add PaketBootstrapperStyle property
enricosada Sep 17, 2018
72c04ff
add PaketExeImage property
enricosada Sep 17, 2018
16509ee
ignore cache by default
enricosada Sep 18, 2018
3e429ad
upload to github also the Paket nupkg
enricosada Sep 18, 2018
8c0ef3e
paket install to latest
enricosada Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Paket.preview3.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
26 changes: 22 additions & 4 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 _ ->
Expand Down Expand Up @@ -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 _ ->
Expand Down Expand Up @@ -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
)
Expand Down
8 changes: 7 additions & 1 deletion integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/Paket.IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
8 changes: 4 additions & 4 deletions integrationtests/Paket.IntegrationTests/FullGitSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``() =
Expand All @@ -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``() =
Expand All @@ -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``() =
Expand All @@ -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``() =
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand All @@ -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...
Expand Down
Loading