diff --git a/Directory.Build.props b/Directory.Build.props index 537c2dc344..06382ee0ac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,4 @@ - - $(MSBuildThisFileDirectory)packages\build\0x53A.ReferenceAssemblies.Paket\tools\framework - + + diff --git a/Paket.preview3.sln b/Paket.netstandard.sln similarity index 65% rename from Paket.preview3.sln rename to Paket.netstandard.sln index 97e2a66c1c..5ed748d183 100644 --- a/Paket.preview3.sln +++ b/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 diff --git a/build.fsx b/build.fsx index ffb252c138..c47183d2d2 100644 --- a/build.fsx +++ b/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,7 +203,7 @@ Target "DotnetRestore" (fun _ -> DotNetCli.Restore (fun c -> { c with - Project = "Paket.preview3.sln" + Project = "Paket.netstandard.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.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") diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx index 3ca9b8243f..ecd50f5ff7 100644 --- a/docs/tools/generate.fsx +++ b/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 diff --git a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests.netstandard/Paket.IntegrationTests.fsproj similarity index 97% rename from integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj rename to integrationtests/Paket.IntegrationTests.netstandard/Paket.IntegrationTests.fsproj index 76f6d6a037..ad5eb44f97 100644 --- a/integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests.netstandard/Paket.IntegrationTests.fsproj @@ -57,7 +57,7 @@ - + diff --git a/integrationtests/Paket.IntegrationTests.preview3/Program.fs b/integrationtests/Paket.IntegrationTests.netstandard/Program.fs similarity index 100% rename from integrationtests/Paket.IntegrationTests.preview3/Program.fs rename to integrationtests/Paket.IntegrationTests.netstandard/Program.fs diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index aa767eb03b..c640475612 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -10,12 +10,13 @@ Library Paket.Tests Paket.IntegrationTests - v4.5 + v4.6 4.4.0.0 Paket.Tests ..\..\ true + true true diff --git a/paket.dependencies b/paket.dependencies index 4c0f9ced73..adba3e6215 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -43,6 +43,7 @@ group Build nuget FAKE nuget FSharp.Formatting prerelease + nuget FSharp.Formatting.CommandTool prerelease nuget System.ValueTuple nuget Microsoft.AspNet.Razor nuget ILRepack @@ -50,9 +51,11 @@ group Build 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 \ No newline at end of file diff --git a/paket.lock b/paket.lock index b77ef38f90..88ab9ea3c8 100644 --- a/paket.lock +++ b/paket.lock @@ -1166,33 +1166,65 @@ CONTENT: NONE RESTRICTION: >= net461 NUGET remote: https://www.nuget.org/api/v2 - 0x53A.ReferenceAssemblies.Paket (0.2) - FAKE (4.64.11) - FSharp.Compiler.Service (17.0.1) + FAKE (5.3) + FSharp.Compiler.Service (22.0.3) + FSharp.Core (>= 4.1.18) + Microsoft.DiaSymReader (>= 1.1) + Microsoft.DiaSymReader.PortablePdb (>= 1.2) System.Collections.Immutable (>= 1.3.1) System.Reflection.Metadata (>= 1.4.2) - ILRepack (2.0.15) - Microsoft.AspNet.Razor (3.2.4) - Microsoft.NETCore.Platforms (2.0) - restriction: || (&& (>= monoandroid) (>= net461)) (&& (>= monotouch) (>= net461)) (&& (< net45) (>= net461) (>= netstandard1.5) (< netstandard1.6)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (< netstandard1.0)) (&& (>= net461) (< netstandard1.3)) (&& (>= net461) (< netstandard1.4)) (&& (>= net461) (< netstandard1.5) (>= uap10.0)) (&& (>= net461) (< netstandard2.0)) (&& (>= net461) (< portable-net45+win8+wpa81)) (&& (>= net461) (< portable-net451+win81+wpa81)) (&& (>= net461) (>= uap10.1)) (&& (>= net461) (>= xamarinios)) (&& (>= net461) (>= xamarinmac)) (&& (>= net461) (>= xamarintvos)) (&& (>= net461) (>= xamarinwatchos)) - NETStandard.Library (2.0) - restriction: && (>= net461) (< netstandard2.0) - Microsoft.NETCore.Platforms (>= 1.1) - Octokit (0.29) - System.Collections.Immutable (1.4) - NETStandard.Library (>= 1.6.1) - restriction: && (>= net461) (< netstandard2.0) - System.Reflection.Metadata (1.5) - NETStandard.Library (>= 1.6.1) - restriction: && (>= net461) (< netstandard2.0) - System.Collections.Immutable (>= 1.4) - System.ValueTuple (4.4) + System.ValueTuple (>= 4.4) + FSharp.Core (4.5.2) + ILRepack (2.0.16) + Microsoft.AspNet.Razor (3.2.6) + Microsoft.DiaSymReader (1.3) + Microsoft.DiaSymReader.PortablePdb (1.5) + Microsoft.DiaSymReader (>= 1.3) + System.Collections (>= 4.3) + System.Collections.Immutable (>= 1.5) + System.Diagnostics.Debug (>= 4.3) + System.Globalization (>= 4.3) + System.IO (>= 4.3) + System.Linq (>= 4.3) + System.Reflection (>= 4.3) + System.Reflection.Metadata (>= 1.6) + System.Reflection.Primitives (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Threading (>= 4.3) + Octokit (0.31) + System.Collections (4.3) + System.Collections.Immutable (1.5) + System.Diagnostics.Debug (4.3) + System.Globalization (4.3) + System.IO (4.3) + System.Linq (4.3) + System.Reflection (4.3) + System.Reflection.Metadata (1.6) + System.Collections.Immutable (>= 1.5) + System.Reflection.Primitives (4.3) + System.Runtime (4.3) + System.Runtime.Extensions (4.3) + System.Runtime.InteropServices (4.3) + System.Runtime (>= 4.3) - restriction: || (&& (< net45) (>= net461) (< netstandard1.2)) (&& (< net45) (>= net461) (< netstandard1.3)) (&& (< net45) (>= net461) (>= netstandard1.5)) (&& (< net45) (>= net461) (< netstandard1.5)) (&& (>= net461) (>= netcoreapp1.1)) (&& (>= net461) (< portable-net45+win8+wpa81)) (>= net462) + System.Text.Encoding (4.3) + System.Threading (4.3) + System.ValueTuple (4.5) remote: https://ci.appveyor.com/nuget/fsharp-formatting - FSharp.Formatting (3.0.0-beta09) - FSharp.Compiler.Service (>= 17.0.1 < 18.0) - Microsoft.AspNet.Razor (>= 3.2.3 < 4.0) + FSharp.Formatting (3.0.0-beta12) + FSharp.Compiler.Service (>= 22.0.3 < 23.0) + Microsoft.AspNet.Razor (>= 3.2.4 < 4.0) System.ValueTuple (>= 4.4 < 5.0) + FSharp.Formatting.CommandTool (3.0.0-beta12) remote: https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json + Microsoft.NETFramework.ReferenceAssemblies.net45 (1.0.0-alpha-004) + Microsoft.NETFramework.ReferenceAssemblies.net46 (1.0.0-alpha-004) RoslynTools.MSBuild (0.4.0-alpha) GITHUB remote: fsharp/FAKE - modules/Octokit/Octokit.fsx (96f1594fd50ced6c1aa45d7cf74fb6c067d08ac1) + modules/Octokit/Octokit.fsx (a0504738c6bba993d52ca882aae6aec72c641cd4) Octokit (>= 0.20) GROUP NetCoreTools STORAGE: NONE diff --git a/src/Paket.Core.netstandard/AssemblyInfo.fs b/src/Paket.Core.netstandard/AssemblyInfo.fs new file mode 100644 index 0000000000..4f20ebc26b --- /dev/null +++ b/src/Paket.Core.netstandard/AssemblyInfo.fs @@ -0,0 +1,21 @@ +// Auto-Generated by FAKE; do not edit +namespace System +open System.Reflection + +[] +[] +[] +[] +[] +[] +[] +do () + +module internal AssemblyVersionInformation = + let [] AssemblyTitle = "Paket.Core" + let [] AssemblyProduct = "Paket" + let [] AssemblyCompany = "Paket team" + let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." + let [] AssemblyVersion = "5.176.1" + let [] AssemblyFileVersion = "5.176.1" + let [] AssemblyInformationalVersion = "5.176.1" diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.netstandard/Paket.Core.fsproj similarity index 94% rename from src/Paket.Core.preview3/Paket.Core.fsproj rename to src/Paket.Core.netstandard/Paket.Core.fsproj index c9b427fb7e..046865268a 100644 --- a/src/Paket.Core.preview3/Paket.Core.fsproj +++ b/src/Paket.Core.netstandard/Paket.Core.fsproj @@ -3,7 +3,9 @@ netstandard2.0 ..\Paket.Core - NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) + NO_BOOTSTRAPPER;NO_CONFIGURATIONMANAGER;CUSTOM_WEBPROXY;$(DefineConstants) + USE_WEB_CLIENT_FOR_UPLOAD;NO_WINCLIENTHANDLER;$(DefineConstants) + true diff --git a/src/Paket.Core.preview3/app.config b/src/Paket.Core.netstandard/app.config similarity index 100% rename from src/Paket.Core.preview3/app.config rename to src/Paket.Core.netstandard/app.config diff --git a/src/Paket.Core.preview3/paket.references b/src/Paket.Core.netstandard/paket.references similarity index 100% rename from src/Paket.Core.preview3/paket.references rename to src/Paket.Core.netstandard/paket.references diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj index 4db42ce7c1..63cabbe6cd 100644 --- a/src/Paket.Core/Paket.Core.fsproj +++ b/src/Paket.Core/Paket.Core.fsproj @@ -15,6 +15,7 @@ ..\..\ true + true true diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index 80ca609528..12d1197603 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -18,6 +18,7 @@ true 2003 + true true diff --git a/src/paket-cli/AssemblyInfo.fs b/src/paket-cli/AssemblyInfo.fs new file mode 100644 index 0000000000..4e4b8a6604 --- /dev/null +++ b/src/paket-cli/AssemblyInfo.fs @@ -0,0 +1,21 @@ +// Auto-Generated by FAKE; do not edit +namespace System +open System.Reflection + +[] +[] +[] +[] +[] +[] +[] +do () + +module internal AssemblyVersionInformation = + let [] AssemblyTitle = "paket-cli" + let [] AssemblyProduct = "Paket" + let [] AssemblyCompany = "Paket team" + let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." + let [] AssemblyVersion = "5.176.1" + let [] AssemblyFileVersion = "5.176.1" + let [] AssemblyInformationalVersion = "5.176.1" diff --git a/src/Paket.preview3/Paket.fsproj b/src/paket-cli/paket-cli.fsproj similarity index 78% rename from src/Paket.preview3/Paket.fsproj rename to src/paket-cli/paket-cli.fsproj index 31efb21d56..7db2bdd273 100644 --- a/src/Paket.preview3/Paket.fsproj +++ b/src/paket-cli/paket-cli.fsproj @@ -1,8 +1,9 @@ + true Exe netcoreapp2.0 - paket + paket @@ -13,7 +14,7 @@ - + \ No newline at end of file diff --git a/src/Paket.preview3/paket.references b/src/paket-cli/paket.references similarity index 100% rename from src/Paket.preview3/paket.references rename to src/paket-cli/paket.references diff --git a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj index 8c1b03ba76..3ca1673d79 100644 --- a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj +++ b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj @@ -12,6 +12,7 @@ v4.5 512 + true true diff --git a/tests/Paket.Tests.preview3/Paket.Tests.fsproj b/tests/Paket.Tests.netstandard/Paket.Tests.fsproj similarity index 98% rename from tests/Paket.Tests.preview3/Paket.Tests.fsproj rename to tests/Paket.Tests.netstandard/Paket.Tests.fsproj index cd3aeb3bf7..160269c17c 100644 --- a/tests/Paket.Tests.preview3/Paket.Tests.fsproj +++ b/tests/Paket.Tests.netstandard/Paket.Tests.fsproj @@ -209,13 +209,14 @@ + - - + + diff --git a/tests/Paket.Tests.preview3/Program.fs b/tests/Paket.Tests.netstandard/Program.fs similarity index 100% rename from tests/Paket.Tests.preview3/Program.fs rename to tests/Paket.Tests.netstandard/Program.fs diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index 26fe566d79..daa32fd9ec 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -14,6 +14,7 @@ ..\..\ true + true true