From 9e3f9c7e828a6a89148876765864511c0aca95af Mon Sep 17 00:00:00 2001 From: Lysogorskiy Aleksey Date: Sun, 10 Sep 2017 19:03:19 +0300 Subject: [PATCH] fix for #1848 --- .../Paket.IntegrationTests/PackSpecs.fs | 114 ++++++++++++++++++ .../before/paket.dependencies | 3 + .../before/paket.lock | 4 + .../before/paket1848.sln | 28 +++++ .../projectA/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectA/bin/projectA.dll | Bin 0 -> 4096 bytes .../before/projectA/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectA/paket.template | 3 + .../before/projectA/projectA.csproj | 61 ++++++++++ .../projectB/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectB/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectB/paket.references | 1 + .../before/projectB/paket.template | 3 + .../before/projectB/projectB.csproj | 67 ++++++++++ .../before/paket.dependencies | 3 + .../before/paket.lock | 4 + .../before/paket1848.sln | 28 +++++ .../projectA/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectA/bin/projectA.dll | Bin 0 -> 4096 bytes .../before/projectA/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectA/paket.template | 3 + .../before/projectA/projectA.csproj | 61 ++++++++++ .../projectB/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectB/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectB/paket.references | 1 + .../before/projectB/paket.template | 3 + .../before/projectB/projectB.csproj | 67 ++++++++++ .../before/paket.dependencies | 3 + .../before/paket.lock | 4 + .../before/paket1848.sln | 28 +++++ .../projectA/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectA/bin/projectA.dll | Bin 0 -> 4096 bytes .../before/projectA/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectA/paket.template | 3 + .../before/projectA/projectA.csproj | 61 ++++++++++ .../projectB/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectB/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectB/paket.references | 1 + .../before/projectB/paket.template | 3 + .../before/projectB/projectB.csproj | 67 ++++++++++ .../before/paket.dependencies | 3 + .../before/paket.lock | 4 + .../before/paket1848.sln | 28 +++++ .../projectA/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectA/bin/projectA.dll | Bin 0 -> 4096 bytes .../before/projectA/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectA/paket.template | 3 + .../before/projectA/projectA.csproj | 61 ++++++++++ .../projectB/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectB/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectB/paket.references | 1 + .../before/projectB/paket.template | 3 + .../before/projectB/projectB.csproj | 67 ++++++++++ .../before/paket.dependencies | 3 + .../before/paket.lock | 4 + .../before/paket1848.sln | 28 +++++ .../projectA/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectA/bin/projectA.dll | Bin 0 -> 4096 bytes .../before/projectA/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectA/paket.template | 3 + .../before/projectA/projectA.csproj | 61 ++++++++++ .../projectB/Properties/AssemblyInfo.cs | 36 ++++++ .../before/projectB/bin/projectB.dll | Bin 0 -> 4096 bytes .../before/projectB/paket.references | 1 + .../before/projectB/projectB.csproj | 67 ++++++++++ src/Paket.Core/Packaging/PackageMetaData.fs | 42 +++---- src/Paket.Core/Packaging/PackageProcess.fs | 68 +++++------ 67 files changed, 1370 insertions(+), 61 deletions(-) create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.lock create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket1848.sln create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectA.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/projectA.csproj create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.references create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/projectB.csproj create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.lock create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket1848.sln create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectA.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/projectA.csproj create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/paket.references create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/projectB.csproj create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.lock create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket1848.sln create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/bin/projectA.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/projectA.csproj create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.references create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/projectB.csproj create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.lock create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket1848.sln create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/bin/projectA.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/projectA.csproj create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/paket.references create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/projectB.csproj create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.dependencies create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.lock create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket1848.sln create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/bin/projectA.dll create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/paket.template create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/projectA.csproj create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/Properties/AssemblyInfo.cs create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/bin/projectB.dll create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/paket.references create mode 100644 integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/projectB.csproj diff --git a/integrationtests/Paket.IntegrationTests/PackSpecs.fs b/integrationtests/Paket.IntegrationTests/PackSpecs.fs index e4037c4492..b1bc4ab4f5 100644 --- a/integrationtests/Paket.IntegrationTests/PackSpecs.fs +++ b/integrationtests/Paket.IntegrationTests/PackSpecs.fs @@ -392,6 +392,120 @@ let ``#1816 pack localized when satellite dll is missing`` () = CleanDir rootPath +[] +let ``#1848 single template without include-referenced-projects`` () = + let scenario = "i001848-pack-single-template-wo-incl-flag" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + let templatePath = Path.Combine(rootPath, "projectA", "paket.template") + paket ("pack --template " + templatePath + " \"" + outPath + "\"") scenario |> ignore + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectA") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> shouldBeEmpty + + ZipFile.ExtractToDirectory(Path.Combine(outPath, "projectA.1.0.0.0.nupkg"), outPath) + Path.Combine(outPath, "lib", "net45", "projectB.dll") |> checkFileExists + + CleanDir rootPath + +[] +let ``#1848 single template with include-referenced-projects`` () = + let scenario = "i001848-pack-single-template-with-incl-flag" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + let templatePath = Path.Combine(rootPath, "projectA", "paket.template") + paket ("pack --include-referenced-projects --template " + templatePath + " \"" + outPath + "\"") scenario |> ignore + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectA") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "projectB" && version = VersionRequirement.Parse "1.0.0.0") + |> shouldNotEqual None + + ZipFile.ExtractToDirectory(Path.Combine(outPath, "projectA.1.0.0.0.nupkg"), outPath) + let expectedFile = Path.Combine(outPath, "lib", "net45", "projectB.dll") + + File.Exists expectedFile |> shouldEqual false + + CleanDir rootPath + +[] +let ``#1848 all templates without include-referenced-projects`` () = + let scenario = "i001848-pack-all-templates-wo-incl-flag" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + paket ("pack \"" + outPath + "\"") scenario |> ignore + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectA") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "projectB" && version = VersionRequirement.Parse "1.0.0.0") + |> shouldNotEqual None + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectB") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "nunit" && version = VersionRequirement.Parse "[3.8.1]") + |> shouldNotEqual None + + ZipFile.ExtractToDirectory(Path.Combine(outPath, "projectA.1.0.0.0.nupkg"), outPath) + let expectedFile = Path.Combine(outPath, "lib", "net45", "projectB.dll") + File.Exists expectedFile |> shouldEqual false + + CleanDir rootPath + +[] +let ``#1848 all templates with include-referenced-projects`` () = + let scenario = "i001848-pack-all-templates-with-incl-flag" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + paket ("pack --include-referenced-projects \"" + outPath + "\"") scenario |> ignore + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectA") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "projectB" && version = VersionRequirement.Parse "1.0.0.0") + |> shouldNotEqual None + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectB") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "nunit" && version = VersionRequirement.Parse "[3.8.1]") + |> shouldNotEqual None + + ZipFile.ExtractToDirectory(Path.Combine(outPath, "projectA.1.0.0.0.nupkg"), outPath) + let expectedFile = Path.Combine(outPath, "lib", "net45", "projectB.dll") + File.Exists expectedFile |> shouldEqual false + + CleanDir rootPath + +[] +let ``#1848 include-referenced-projects with non-packed project dependencies`` () = + let scenario = "i001848-pack-with-non-packed-deps" + let rootPath = scenarioTempPath scenario + let outPath = Path.Combine(rootPath, "out") + paket ("pack --include-referenced-projects \"" + outPath + "\"") scenario |> ignore + + NuGetLocal.getDetailsFromLocalNuGetPackage false None outPath "" (PackageName "projectA") (SemVer.Parse "1.0.0.0") + |> Async.RunSynchronously + |> ODataSearchResult.get + |> getDependencies + |> List.tryFind (fun (name,version,_) -> name = PackageName "nunit" && version = VersionRequirement.Parse "[3.8.1]") + |> shouldNotEqual None + + ZipFile.ExtractToDirectory(Path.Combine(outPath, "projectA.1.0.0.0.nupkg"), outPath) + Path.Combine(outPath, "lib", "net45", "projectB.dll") |> checkFileExists + + CleanDir rootPath + [] let ``#2694 paket fixnuspec should not remove project references``() = let project = "console" diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.dependencies b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.dependencies new file mode 100644 index 0000000000..d523d36b90 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.dependencies @@ -0,0 +1,3 @@ +framework: net461 +source https://www.nuget.org/api/v2 +nuget nunit 3.8.1 \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.lock b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.lock new file mode 100644 index 0000000000..25de4dd4cf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket.lock @@ -0,0 +1,4 @@ +RESTRICTION: == net461 +NUGET + remote: https://www.nuget.org/api/v2 + NUnit (3.8.1) diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket1848.sln b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket1848.sln new file mode 100644 index 0000000000..c5c8a21282 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/paket1848.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectA", "projectA\projectA.csproj", "{2A530232-3251-445E-ADF8-7B562E1BAB0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectB", "projectB\projectB.csproj", "{4CF9D89C-5231-4A59-B823-17082D5646EA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..667bb061e5 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectA")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectA")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2A530232-3251-445E-ADF8-7B562E1BAB0D")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectA.dll b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectA.dll new file mode 100644 index 0000000000000000000000000000000000000000..94f81a1c0e5124ade9b517b7840db254d816335b GIT binary patch literal 4096 zcmeHKOKclO82&e}rfrh8X(@d~ux(PLLTzlvA!&KViIbAHc@U?j1&e0Ao;cI2cg^m) zjZuXPf&&srJ#hi<6!pLX(JE2};@(R^;&I9iP9SmUfkVspkG-~&R7K(fQu&?vX6Ap* zKmY7JGWqHiY9^uOdk5&1vURS%!0$qdOX>JS?EpsB)(>zfJc>W=x zp7pW^_4P{lfl532F9jXcVP7o!s9QDxbQGRzHEy&N=|uBk*KW}^e8)PB@1{7&U@b?`W1B_;_OZNuC((WYjj|KJjLGADcX((FJ15P(-TS5I?LF0 z#B#FeGr?Tjw2NpncmCA+X?G>|ZRqkGI0am|&4uV=tx~tq9r{CSBU591lD^TlQ8(PR z(JXxi&QA(g6rRwSvs>ZQ3Z>$|K;MDiqwrJ3d6(W+?ki((CN|RwM%)2xqrJc_bQrju zq6&{HOemaC__D&Y3Ju^RBvtzjg=K|d+Dg3?rk!*IxSvh}dua~%6lH<^3ZGRts`w{q z5&V?myr$5k%it{0=Rl9HQ_JNbLr9V${>+f_8tub)HF|E+$(1be0%5zK7p9+}f@eCe zC9`zABy$NLYnmVp=`uFNmqS5zn(cDZgdTe5vw5IiQv$x2K54boKE^F<+CRSH+9 ziEUI{kZ{hjC{Pm%78VIJrLgHcZop4UBX2vNFHJ9C1s*4CU${;&CEN?r6dS~qR0y{w zudFiyz=r|#D&5)h(cn8fZ%=!h`!v112!yBM0#{{kmxbqK66dGUvZ7%lw*%An?kL}+@kAT^fc&UyMj7lQ2Pq0Rc*aTHR>L9s>#;B zy{hZ6NOX|sutt5c#6W)})*lP?#|EOIczj?ilt_*bg$73ko{5b`M-n3u95)>rZHnUX z!jEV|qkZA2vANpEcBGo{=W)OdAj+;?HBnM}Maw8p;j`>!8@(pcp3A6#iA0CuL!qK!E`* zP2i<9h5iI^yz=Uzn=QZJZM>a>JLpANGx7aX+2yLM0GksBLz)b7;YZ?4A>h-d1#*2fYe?(Q*k+HN@mYOM;)jkEb(ACqlt5j(Zb1pnb5^XcYbm_z771 z7^Ol78)QW_ei^ehlwMVZj^Rz9)y7N0gGZ){qqru{B6tp+huj1|q0A#V8|$`d$Xr<0 z=N83n9;p?=Se?-4?D$I8Ml4oCMC->0Qx0-|rSZCU!}b*H^2&;5T%@v!G>`WLzh5`< zbh?U7rBe)XLuEBa+xTCnr>sp)j*@%}TUSN~_= Lh5DZ!x(xgUXCOD^ literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..1d593495b412c13d499b4b1e461d08d5ee68669e GIT binary patch literal 4096 zcmeHKO>7%Q6n>k(CT)|pp%hvo*fuFrq2Ahw(s_^A;E=PPKXmo95`@j`QF%TJ4sa}E+CcX%r`Ud zZ{EC_*_lkee3hDss0HQjU80+)nMM@eA66mmdg4|WebI4y|4r@8?fvN`>FY($&3k4+ zw@k-z13fErujJ^`(UUVNz2N4A(b>7Ruj+bsoal_!OiNQ=o)1S`qXYUjElSi5PFsb0 z=SkE$$_NV4PStLz#LbMV8qq2`;4?MT!dtA$fAzZBWftf&_?_X#2+;~BVk0dOZ3izn zNYt}YcE7$}2|rY6NB@PegW3qhN`Sg$3qVKVxmM#wOOZ~rV0gY~p{HUSL4y}+D@p^6 zAbP_SwhKj$l@?IgR~JeHjS!7BbX9YW^9thFny8g#b)vpjB8{2fze2Tu+c2GCm zwb2}X0?tngZz(*bF=vm$BMPPBpP(PW?@{=n;=D<3DEE~yI1?Ro3nT6Vw$WbTRyqXS zNil`P3P%-ADtuAld4(qMVUnu-s=~5DgSJsG8T1ex20liofxVOlK22HRfWl`KCKUfP zErFj>oL3ZDvcU(V^mLIZ0kCRRyJhzw<-X&>?P2x%_gjbVS z))@g{V?e!1-+Z*T62Ft0eE0d=Kfi70t<<7xT6?ojS}Pj6c5%0hp{f1GYnl1I@wIo_ zHT5whdYq3>x@pf#o>`oBo$(b*sP#xMdG2LjgC346s1pXYT}Z9!=sluQcP-iach_{i zKN>qmbV#GVcw%BWIW(Mz4E7JiBJt6|;mFuf|3D;mEIQPm96TC7IzEaokw#l$_;}$* zG^x=(V|qMY+iZuc34abBxIskOwYw%tO225EjzJL{{6&(_uD=`!V^jy&-iZ1!$M^8GFU2QGqdKh2r?3@gxi)^ zHV}T`XM9UIrYBuLBcsvSP<$v-G_B=`Y1QNXN1xi?*51WW}QEiAr%dToK2bublfia( z55k9f9c=dUAaXR7j7JGq!#b+m=r{+P_^ifnhjSy?#|`hNp5{2X^SE&?0LO8srf3o` zt!eZpffJQi7k%CG+nvVSIlP0Ohcy%5Kb2Fix(bp&4PH(1;78(3A>h-YMRJwAPg$iQ zHNo{EHz|Ogi(ZAUw_Jf!4KW4KlHlj>;pv>xiBkBB;y{JK`eGdL>tF2Cc-Vn#X&B->;i_I$gt| z(y1SD#0Z~UysbE2bw8Dr$-!>{em%TF!tC(_mE)bMj=?L#@rJ9+Jdng5*~kN2M;z4|``FVz3^ Hz-8bsZ16W2 literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/paket.template b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/paket.template new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/paket.template @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/projectA.csproj b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/projectA.csproj new file mode 100644 index 0000000000..0b0af1851b --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectA/projectA.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectA + projectA + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {4cf9d89c-5231-4a59-b823-17082d5646ea} + projectB + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e2a770bb8e --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectB")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectB")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4CF9D89C-5231-4A59-B823-17082D5646EA")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..1d593495b412c13d499b4b1e461d08d5ee68669e GIT binary patch literal 4096 zcmeHKO>7%Q6n>k(CT)|pp%hvo*fuFrq2Ahw(s_^A;E=PPKXmo95`@j`QF%TJ4sa}E+CcX%r`Ud zZ{EC_*_lkee3hDss0HQjU80+)nMM@eA66mmdg4|WebI4y|4r@8?fvN`>FY($&3k4+ zw@k-z13fErujJ^`(UUVNz2N4A(b>7Ruj+bsoal_!OiNQ=o)1S`qXYUjElSi5PFsb0 z=SkE$$_NV4PStLz#LbMV8qq2`;4?MT!dtA$fAzZBWftf&_?_X#2+;~BVk0dOZ3izn zNYt}YcE7$}2|rY6NB@PegW3qhN`Sg$3qVKVxmM#wOOZ~rV0gY~p{HUSL4y}+D@p^6 zAbP_SwhKj$l@?IgR~JeHjS!7BbX9YW^9thFny8g#b)vpjB8{2fze2Tu+c2GCm zwb2}X0?tngZz(*bF=vm$BMPPBpP(PW?@{=n;=D<3DEE~yI1?Ro3nT6Vw$WbTRyqXS zNil`P3P%-ADtuAld4(qMVUnu-s=~5DgSJsG8T1ex20liofxVOlK22HRfWl`KCKUfP zErFj>oL3ZDvcU(V^mLIZ0kCRRyJhzw<-X&>?P2x%_gjbVS z))@g{V?e!1-+Z*T62Ft0eE0d=Kfi70t<<7xT6?ojS}Pj6c5%0hp{f1GYnl1I@wIo_ zHT5whdYq3>x@pf#o>`oBo$(b*sP#xMdG2LjgC346s1pXYT}Z9!=sluQcP-iach_{i zKN>qmbV#GVcw%BWIW(Mz4E7JiBJt6|;mFuf|3D;mEIQPm96TC7IzEaokw#l$_;}$* zG^x=(V|qMY+iZuc34abBxIskOwYw%tO225EjzJL{{6&(_uD=`!V^jy&-iZ1!$M^8GFU2QGqdKh2r?3@gxi)^ zHV}T`XM9UIrYBuLBcsvSP<$v-G_B=`Y1QNXN1xi?*51WW}QEiAr%dToK2bublfia( z55k9f9c=dUAaXR7j7JGq!#b+m=r{+P_^ifnhjSy?#|`hNp5{2X^SE&?0LO8srf3o` zt!eZpffJQi7k%CG+nvVSIlP0Ohcy%5Kb2Fix(bp&4PH(1;78(3A>h-YMRJwAPg$iQ zHNo{EHz|Ogi(ZAUw_Jf!4KW4KlHlj>;pv>xiBkBB;y{JK`eGdL>tF2Cc-Vn#X&B->;i_I$gt| z(y1SD#0Z~UysbE2bw8Dr$-!>{em%TF!tC(_mE)bMj=?L#@rJ9+Jdng5*~kN2M;z4|``FVz3^ Hz-8bsZ16W2 literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.references b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.references new file mode 100644 index 0000000000..e88562d545 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.references @@ -0,0 +1 @@ +nunit \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.template b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.template new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/paket.template @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/projectB.csproj b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/projectB.csproj new file mode 100644 index 0000000000..cd35c8e35f --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-with-incl-flag/before/projectB/projectB.csproj @@ -0,0 +1,67 @@ + + + + + Debug + AnyCPU + {4CF9D89C-5231-4A59-B823-17082D5646EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectB + projectB + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + ..\packages\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.dependencies b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.dependencies new file mode 100644 index 0000000000..d523d36b90 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.dependencies @@ -0,0 +1,3 @@ +framework: net461 +source https://www.nuget.org/api/v2 +nuget nunit 3.8.1 \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.lock b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.lock new file mode 100644 index 0000000000..25de4dd4cf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket.lock @@ -0,0 +1,4 @@ +RESTRICTION: == net461 +NUGET + remote: https://www.nuget.org/api/v2 + NUnit (3.8.1) diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket1848.sln b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket1848.sln new file mode 100644 index 0000000000..c5c8a21282 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/paket1848.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectA", "projectA\projectA.csproj", "{2A530232-3251-445E-ADF8-7B562E1BAB0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectB", "projectB\projectB.csproj", "{4CF9D89C-5231-4A59-B823-17082D5646EA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..667bb061e5 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectA")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectA")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2A530232-3251-445E-ADF8-7B562E1BAB0D")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectA.dll b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectA.dll new file mode 100644 index 0000000000000000000000000000000000000000..5a478842e3d59c7526fa51aad297ed0433929ea7 GIT binary patch literal 4096 zcmeHKPiz!b82_gKD1Ta@0tz-d&|-qJ>+W_d1rfX3ZJ|I*?Jnhyo6y~W_Q~XOuT4<-}e39d*8qJ zz32GnR8jSY!^ket7}Vt;CgD5=&aI8cP4(g6ppq^2h^=fjHnZw4xjtz z71S!qFbdHQ*>3UUW=5b!w2Th;OszEg39Is7qYk>v0(}d==eRLUw8V*6PqReZ!1E3g z^{$sat*`pwhbo=up9(vuqn=puP`7OYs3<(wAa1lIsYJ6;$8~h{WNgD|@Iq}tX`*37 zA9aLjLy=>pSrqowjnYKJMCqokY_4)%K^$8PwbPVJ)Zb2|F!LW!I(s^;1lAnO)nqgl z9f%FYkFv9NGJ)6Oyzc{|Us3lX&c3YY7*@$;jcu48PqFWOmUf`QOV@Yu{CEbn$}+Z1 zn|1+xCYURmb`fpn&Y#Kv?eSyZjxNuEQ^1AWT!_9<{JMkwpx=}Z(iO&6>8`S!df={u zrs->N?n}Ha@wCF6JrZA+Xh{AE`WgIQiC;?2$MlhO?~lQm*i5%E;!a=(?FDY3L%g>b7GV z1v*(ZiYX6kTBv%0GNMo|m9&B>8oUv^JY%@V8eYnEMY&+sa)#HeT4y_2QIs`jvEe1B zIVItZ;j9tY>}Ek|GiI1#MmVlvTMesFIAU9KMycv(-V?Tu+pvfl@S> zCbm(1L83*|q)<)FnOG#ul%l$4J0U+~XeG;bJwtaxR_Jlu@`PhovckD)=wgG|Pla&m za(|r>06q+;2lUg`&qfC?JUI2q%CWnTF7N)G+Ehj9Y*k5VM`Pzs?shY@bgsOgpV^yS z{j^h&hau5RynS*ldoDOyWzx1rmvkZ5BRB8Z*IWg9*sh>17}UQ)YL{E@d4+mL>>%0d zk2h5{5sM!oI;2p4A~iS=OAI6;1BtjifSTLy;rt!8a14@pLL3!*R1sp-pid zUicA>E3_{~K|ob8Bw zn8CbVSjgk+7Mj~&Mk~ca5c$7X{Sw?&9Ki!_tK8a1t4(@DS4M0nW1171Vfjat5OQa* z-Q$DsAzud@y*!H?MJD3~!qu>b{2LwnU<04k`0a3U7~gTz`>D4z3GNJToGZXl+^Ja_ z$4hGx{c+%!|LUSUZ4Vzc-_GG3^fs)S`2O*Cx$H{7=ET7;LmD~oW8h68;M1ZxvZcIV zTIC?sz;z+l$b+7Zo=@MkU58TzF?rB3z%M<)(?zKhqwtr+y@?#qK3FO=0)J)v1gt%b z;?sd9Sw)Ut!)!IF7pTxNya|;0co}$bNtba{*2Gx>&!z>)b?{TtJchHeVLJnv1M9}z z;<(LY^+Fh{3;LWLPwHBT#cYab{TNXyLe8%=Ue_Mjo`qdWTJel4RFjdG@SfoJ>qeeR zH?gTyN+6Cn;mF0?iu2X*vtha?bO3J*hwOOCt^|>9AHYr5!%DEH}X$>>~J3AilKSOHpKLan+ J|Mbjd;4eFJIIsW! literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectA/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..69cfdc0c6dda3269e5759f1bd179baf927c29020 GIT binary patch literal 4096 zcmeHKO>7%Q6n@+MH2q21hEiyWVB4ffh1%GO(aMP|>PVCB%UPP%a<=w{YVGhyw=>E#DjO+D=jxi3>>OIrGiT z`ZW1aj<4s0?v`y`+Is3_S}!_z5p8eZ+!MH-9wnO4n&{@_r)R>^R%oBTMT-%&fzw*$ z-hLdljxvNov|Y6~RO4nwphmQe4){z>H1{T}@?X6Uy37K71ivS_F+{Y)iC9Z>L|ei0 z_Y-xkmEEhaSHllg+R%SK?4XYNV#!C{yb++I@LYqq(Nd%n%|%_$HPKVC4WYpcwHc*> zh7f(!6_x`K??|o%UU67d+P3iuv&ryHBNQI~u%n-N#Oir%>xG zW7`qS$)V2#b8X{JqD|cSQ|qH$)!4V8%X8oqaN#x=qIa}v-AaGZ?^-LF8sii6nYN8O z;jWct=rTAzD!ifaxW=4a3ZGIa75^xG3x1cvcNOOidR@7%j=`DOL^m+v4qz+o25zPU z!0i-QIH+(~;kd#V6rNFN03Rf&+OH_AD2&n;>ZT|?KnH=3&tDSM~*^M6O&Y7&%MSc}b@@D?Pc2H|%+$n6oMw={Ks@*shTmMZ;aJ zd&wAXLHJ|%)`$yEqad^yla`njt|uM4ZWRiXjy*36W!LcUDozQ{bY*F^5OJ5Jr7UKI zWh|+dx8C=(i{zO8dO^}DRa{wExT~mGGVDs-W~OZWvM6{=jFXd=^c$q?c?*k#nNrmB9XI5sq*1UP&zGhbvOYH;#{HxFN3{`!Y+s9D#vwkDml7BqJ3;BE)QhPG?3W@mRN zR^DpU)W?wMQ9eGI4ZB`+jnb53k1m-)tw(0TbuM@s^l)53?J%hALTXV*?;(vkYsuC> zzoP5CvG`%40~+-tl4FCZfx%>?zqcW{F%T&k=3>OKtO)iC0)txQf)kOpX+`EOqma#sdB+vm zFoRhqcP@+FEex;DjF$4bAo72&`YyPuID%iet#fNVtu*KnolQD!%CaU6X;(i{La39$ zc6au}hk6~X_i{gSG?k2p30K1^s@~{02kZE(#&3tyL)ga+@29S&1h})fan1rqai^wf z951aY^v8i?)mInYZ2t9j)Y12G8O5UTa zGLRbJdXO9BL(f64N}n`egi{SM`OuQ!7w+Qew9<)D_)Fm4L=I>VEHz5PUlBh6YagRj zXdNHdw+O#3-XLN2_<_pto(#s|mEm~9RpuUNoDj$A+%(4B ztMWUoH1bqd*=t;bwYG3a36 + + + + Debug + AnyCPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectA + projectA + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {4cf9d89c-5231-4a59-b823-17082d5646ea} + projectB + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e2a770bb8e --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectB")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectB")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4CF9D89C-5231-4A59-B823-17082D5646EA")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-all-templates-wo-incl-flag/before/projectB/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..69cfdc0c6dda3269e5759f1bd179baf927c29020 GIT binary patch literal 4096 zcmeHKO>7%Q6n@+MH2q21hEiyWVB4ffh1%GO(aMP|>PVCB%UPP%a<=w{YVGhyw=>E#DjO+D=jxi3>>OIrGiT z`ZW1aj<4s0?v`y`+Is3_S}!_z5p8eZ+!MH-9wnO4n&{@_r)R>^R%oBTMT-%&fzw*$ z-hLdljxvNov|Y6~RO4nwphmQe4){z>H1{T}@?X6Uy37K71ivS_F+{Y)iC9Z>L|ei0 z_Y-xkmEEhaSHllg+R%SK?4XYNV#!C{yb++I@LYqq(Nd%n%|%_$HPKVC4WYpcwHc*> zh7f(!6_x`K??|o%UU67d+P3iuv&ryHBNQI~u%n-N#Oir%>xG zW7`qS$)V2#b8X{JqD|cSQ|qH$)!4V8%X8oqaN#x=qIa}v-AaGZ?^-LF8sii6nYN8O z;jWct=rTAzD!ifaxW=4a3ZGIa75^xG3x1cvcNOOidR@7%j=`DOL^m+v4qz+o25zPU z!0i-QIH+(~;kd#V6rNFN03Rf&+OH_AD2&n;>ZT|?KnH=3&tDSM~*^M6O&Y7&%MSc}b@@D?Pc2H|%+$n6oMw={Ks@*shTmMZ;aJ zd&wAXLHJ|%)`$yEqad^yla`njt|uM4ZWRiXjy*36W!LcUDozQ{bY*F^5OJ5Jr7UKI zWh|+dx8C=(i{zO8dO^}DRa{wExT~mGGVDs-W~OZWvM6{=jFXd=^c$q?c?*k#nNrmB9XI5sq*1UP&zGhbvOYH;#{HxFN3{`!Y+s9D#vwkDml7BqJ3;BE)QhPG?3W@mRN zR^DpU)W?wMQ9eGI4ZB`+jnb53k1m-)tw(0TbuM@s^l)53?J%hALTXV*?;(vkYsuC> zzoP5CvG`%40~+-tl4FCZfx%>?zqcW{F%T&k=3>OKtO)iC0)txQf)kOpX+`EOqma#sdB+vm zFoRhqcP@+FEex;DjF$4bAo72&`YyPuID%iet#fNVtu*KnolQD!%CaU6X;(i{La39$ zc6au}hk6~X_i{gSG?k2p30K1^s@~{02kZE(#&3tyL)ga+@29S&1h})fan1rqai^wf z951aY^v8i?)mInYZ2t9j)Y12G8O5UTa zGLRbJdXO9BL(f64N}n`egi{SM`OuQ!7w+Qew9<)D_)Fm4L=I>VEHz5PUlBh6YagRj zXdNHdw+O#3-XLN2_<_pto(#s|mEm~9RpuUNoDj$A+%(4B ztMWUoH1bqd*=t;bwYG3a36 + + + + Debug + AnyCPU + {4CF9D89C-5231-4A59-B823-17082D5646EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectB + projectB + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + ..\packages\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.dependencies b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.dependencies new file mode 100644 index 0000000000..d523d36b90 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.dependencies @@ -0,0 +1,3 @@ +framework: net461 +source https://www.nuget.org/api/v2 +nuget nunit 3.8.1 \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.lock b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.lock new file mode 100644 index 0000000000..25de4dd4cf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket.lock @@ -0,0 +1,4 @@ +RESTRICTION: == net461 +NUGET + remote: https://www.nuget.org/api/v2 + NUnit (3.8.1) diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket1848.sln b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket1848.sln new file mode 100644 index 0000000000..c5c8a21282 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/paket1848.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectA", "projectA\projectA.csproj", "{2A530232-3251-445E-ADF8-7B562E1BAB0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectB", "projectB\projectB.csproj", "{4CF9D89C-5231-4A59-B823-17082D5646EA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..667bb061e5 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectA")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectA")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2A530232-3251-445E-ADF8-7B562E1BAB0D")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/bin/projectA.dll b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/bin/projectA.dll new file mode 100644 index 0000000000000000000000000000000000000000..2218d776b93678ea5bf942af44b5f718b7f6e337 GIT binary patch literal 4096 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 literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/paket.template b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/paket.template new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/paket.template @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/projectA.csproj b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/projectA.csproj new file mode 100644 index 0000000000..0b0af1851b --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectA/projectA.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectA + projectA + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {4cf9d89c-5231-4a59-b823-17082d5646ea} + projectB + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e2a770bb8e --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectB")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectB")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4CF9D89C-5231-4A59-B823-17082D5646EA")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..0b0bfac1ac60e4e0dcb968e03d8b3ffa399cad08 GIT binary patch literal 4096 zcmeHKPi$0082=vq%byk~SOpt>(4s-vWw+fzivn$TTP)B&c9#mW34Qx^x*huVz4g7f z&^5%AL=WnPJMj*N0|z5WVq&;+lEirH(Zoaz2M?Nnzi)Qm?zSbEc+mvE?fhou`#0Zw zGxKIT@%}YxAfiT;Cr^m(qGlRW_-t5)xc$|8?ex{g2Yc>nryuM|El5uoSYYp^p;_Gw4Xe+c=->gN5TES^9b05Ek zT1Oc|A=;+e8_IDrqoPK%j1Krr4K()&tMXs1u5_6Nx&^;e+!!KS;zX>aIifA#`TK~v z*2 zhHilKqr!U%PioBRRCrLKRQzM~J@{P;zfhcy>8f&H9)mNnk?vu{?Z9T*1>8jYf!ipm za8Ti}!f}P~Dmg`FmN-T@?iYpWk5Jw-9oLc> zI#HC_VIOOnDf)sEB2&!ejEp5}yttE}m7ZM18}>Yr&se3D^y^itY}d$&yx}g^yrc{_ zC;TydYs6)zUJ%%fNlVNM*OQK2vkHW9$DWtDqHFk16(@vey0WlZh`0;VQWi79GL}@! zTkm_?MRH7ky&&!sO0LW;JXMr07q%a`gPJ|$@4`%Tu};Frio)z zU663rvM5j!^A;8fGo`TUJ8r;FNF!%Eo-a)=UZC|)fAt~HT(iH2&H+AdWC-b;hR4rpWhz6v7_bZgZFP8r$$}VS{roIn$Xz3oxAM}8(Qytn4aAgTlutA zQy)X3SNQm(Hgvw{8ih&69$hkpT94F%>sRbBZn&BAt`|LNSw`HWr1SmRKd+w!E^w z@O&@rnZh<)>3C@wi9`ot1EGRpE`~fTj3q+YGKkF=q04X*lD27u<}D+a&WL%(73m<0 zX(w|rjU6rwuf_})vYATs|4#L=a#!)_zi?aU)_Pj0(<8bNcieh-dd2*DzM_HvH zHNf>CH^_&cgI<|#H(r5L4Kex9lHli_;_0l?iBRy1;od|JXg4f1io;(XKLKkWqm*fH zovfh7FJZQZ(yOS@5xfbs>Uarw@W@ng6jsGq0MDU|kelF-DDw!ujWyd@$Xr<0<`%_m z9;p_>SZ&bf?D$I8Ml4ocL~F+gQx|NlT%eMQG>7*DzhBq$bh?Q{ zrBg5Bh!Q@zcw2G4YJSQqlZD?r{JMC91li*UD#trj8G~1b;|*4sdz^7X9IJCvA9t_H z@3hj$Qc-2Eeht>z!X3p_URT?!&F literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.references b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.references new file mode 100644 index 0000000000..e88562d545 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.references @@ -0,0 +1 @@ +nunit \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.template b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.template new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/paket.template @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/projectB.csproj b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/projectB.csproj new file mode 100644 index 0000000000..cd35c8e35f --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-with-incl-flag/before/projectB/projectB.csproj @@ -0,0 +1,67 @@ + + + + + Debug + AnyCPU + {4CF9D89C-5231-4A59-B823-17082D5646EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectB + projectB + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + ..\packages\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.dependencies b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.dependencies new file mode 100644 index 0000000000..d523d36b90 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.dependencies @@ -0,0 +1,3 @@ +framework: net461 +source https://www.nuget.org/api/v2 +nuget nunit 3.8.1 \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.lock b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.lock new file mode 100644 index 0000000000..25de4dd4cf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket.lock @@ -0,0 +1,4 @@ +RESTRICTION: == net461 +NUGET + remote: https://www.nuget.org/api/v2 + NUnit (3.8.1) diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket1848.sln b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket1848.sln new file mode 100644 index 0000000000..c5c8a21282 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/paket1848.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectA", "projectA\projectA.csproj", "{2A530232-3251-445E-ADF8-7B562E1BAB0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectB", "projectB\projectB.csproj", "{4CF9D89C-5231-4A59-B823-17082D5646EA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..667bb061e5 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectA")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectA")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2A530232-3251-445E-ADF8-7B562E1BAB0D")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/bin/projectA.dll b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectA/bin/projectA.dll new file mode 100644 index 0000000000000000000000000000000000000000..febb72e12d0f3eab7f60cee267550a8d542b3485 GIT binary patch literal 4096 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 + + + + Debug + AnyCPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectA + projectA + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {4cf9d89c-5231-4a59-b823-17082d5646ea} + projectB + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e2a770bb8e --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectB")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectB")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4CF9D89C-5231-4A59-B823-17082D5646EA")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-single-template-wo-incl-flag/before/projectB/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..70daebe57d18722c56b23b1ac0f06196110ad498 GIT binary patch literal 4096 zcmeHKO>7%Q6n>k(CT)|Zp#<7Sux-*xh1%GO(563Xu(pmUQe89*1KkR z-NvXw0l|S=FGxj*J4Fa_K(wj^s<`(A7j8KsgaC2iz#-*(W3TNbRgt)WRGu^6%)GyO z^JZpeGX2_hY9^u7IIZlh+3D||StLfrNAoi6&a{M*je>3( zw(a+!DwrAP~V|Nh}ywvt8mv3 zqt;R4C`8?=-BgL28C5l+Rdm2-YNmzvSe5_kb+yYZ&}Z;_jvH~J6;8xvS|Hj9o_~m_ zZ?o)SeZ3NXpwf>1%RvWq*cU54>XvN)9fjvwjT)! z!cm1|3a1plqVS?Z1Nb;e)qX=^Sz(xVP(Ov~F**v|PiKJrlmTYu=M^Rt{|qgG zpHiIH6`HgP&N6)p^yn6~tOglEk`(baL&|Hk598J7g=r^OvcyTkalb4~f1C=Q>A056 z(y5Znjrmy9Y{?gt6xmWfZ)7b|=OvuNy!7M--k9f!Le?s$rQfJpW4lI96byH{?j>!w zdErmuTO+PIje@{tQd(kOxSn+Ex>X=dIQF8==ma(E* z-d5kUE|O#VTLlTHSaxN8>4Bm`(Xh*Po4Jzh%YxuBF-}%m(r=Ka%APL@;i^)&I!zp- z+Jc00mPLV@ShTQ6m??!#-*E$eQW|;N@qB4|0W0u0W&6T)iYehs_I|sj zK88e3@$pGF^}gyF#Tmz*STTiKkMxr3T=g{Q;kbf2VNlzJ)T)l&6B_l@lC6JxQ`ZM0 z(c?r%G#ZE{CP$MaqlwV);7~La8yg-CjgJftg`&qJBZJA|W3gisWB3wjv@ME{7k)%j z8tn_uOr&d@?PxXOFX96?j3~SI)I>??6)mGYgKgQvHhN8>L${ij;J)J-^daKwxL>a0 zE|^OtQ~OUJ={Wq&VEjYro>;$;&G3X0Co-N>a^ggDrekC%v2JSp=oJ+t7+^H#=!b@ug z{VCvN<<&)BxBR-^csmDo&`Ypp;`^s^%2iiE5~#teK`#7AyeR~H+O$ZHk`E}WG^7T& z9^?l3&~wnM&=)P&;8a6QKC~qG`3HEqpmZV>{9?E_kptQXON|onSHMre+Q%prI@lm9 zs`1O1t)cX)Ds%#G0;!x={ zh&ZBzPcGh8oUgi{%F5*6w*bE`-XKBt_<_pto~w?*E5q>ytIR#lI3bRWxoM1hP~~@4 zY2>J+ve&o + + + + Debug + AnyCPU + {4CF9D89C-5231-4A59-B823-17082D5646EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectB + projectB + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + ..\packages\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.dependencies b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.dependencies new file mode 100644 index 0000000000..d523d36b90 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.dependencies @@ -0,0 +1,3 @@ +framework: net461 +source https://www.nuget.org/api/v2 +nuget nunit 3.8.1 \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.lock b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.lock new file mode 100644 index 0000000000..25de4dd4cf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket.lock @@ -0,0 +1,4 @@ +RESTRICTION: == net461 +NUGET + remote: https://www.nuget.org/api/v2 + NUnit (3.8.1) diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket1848.sln b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket1848.sln new file mode 100644 index 0000000000..c5c8a21282 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/paket1848.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.0.0 +MinimumVisualStudioVersion = 10.0.0.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectA", "projectA\projectA.csproj", "{2A530232-3251-445E-ADF8-7B562E1BAB0D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projectB", "projectB\projectB.csproj", "{4CF9D89C-5231-4A59-B823-17082D5646EA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CF9D89C-5231-4A59-B823-17082D5646EA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..667bb061e5 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectA")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectA")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2A530232-3251-445E-ADF8-7B562E1BAB0D")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/bin/projectA.dll b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/bin/projectA.dll new file mode 100644 index 0000000000000000000000000000000000000000..46a79aee00a95e1bdf16628c83b8439e808a22bd GIT binary patch literal 4096 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 A^#A|> literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/paket.template b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/paket.template new file mode 100644 index 0000000000..f391c6c5bf --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/paket.template @@ -0,0 +1,3 @@ +type project +authors test +description test \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/projectA.csproj b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/projectA.csproj new file mode 100644 index 0000000000..0b0af1851b --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectA/projectA.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {2A530232-3251-445E-ADF8-7B562E1BAB0D} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectA + projectA + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {4cf9d89c-5231-4a59-b823-17082d5646ea} + projectB + + + + + \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/Properties/AssemblyInfo.cs b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e2a770bb8e --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("projectB")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("projectB")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("4CF9D89C-5231-4A59-B823-17082D5646EA")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/bin/projectB.dll b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/bin/projectB.dll new file mode 100644 index 0000000000000000000000000000000000000000..9ce47dafdc77e4d925dc10225615328a444fa1cb GIT binary patch literal 4096 zcmeHKPiz!b82_gKD1TZ?MHFmwphbhS>u$THEhu)o+hT#1(p@U(CUkc8bvtx+W}KOY zt|6u-deBoZUL+p8f#Kl62qDoJZyq@5gY8QQzM2=RTeeigQqyNLYRN8$Xh+AkzN+h)aiY^oGd-C4=0Z5y8XZu#D>0&WaM}Xy zgBMY&D5EGuU9#O2#LbMV8qo?m;4?MT{70)DA6(}Vk6BH?Eud| zNYt}Y_PD+pgdeK3qyJ{uK^^tQvX8oD3qVETxmM#wOOi@7A9X!fM^DB!iUu##Hk1Y$ zMf6cum^KtSR+>j)U!5ooG)gqq(3Q+9LwcI zG!`9*4a7&-Su2^qt8m`?KG83z`w(Yu#&->?=&{BQ%#WwodoDv=Xz_XWT#|hj0lFZl#N2t$C~ELzM!j;)>lU2yG?|Q_Kn1GiuI4{doEDz$8qRtl;&u#ETFeSl zTb3C%NMTgWQ2R!(8VTkkP6|} z40DKrwuTt#(y~3}beV6`XNKLjifASKwsEX3wtdi1-#;#r5?PO?bzx7^jZf|1k z<90Pw_1M$*G0smNgeKs=I24vs{|hWiI1@uApoe|qpp;>dUsCy_#1;yAqU zBbrobUvzprTl?4!R}=m^4!A)?*}1zWN*kVIYL#hxmfdWl)+8!)t9c3UJDx!gB3{M) zvWmN4Hj~br)vgWQ{Pft=>W|lNbRAo{%o9o-&3Sg&#X{tYhQC=IU^Q}4=08rj;1d~uD~c_*_P~yLZl!ZFP9e!wkvXB?s9hiQV!p> z(7ZY`>J;+TnE&nS=jvU>as0+@m0O!>twE3IV#;>Yra7e@^!G; z%ah1aWHO#5Tn+0exY4l>Ht|`F-wx+T@f|n3pL&`T;LhR3xd zuP*ww<^F@l+c~_0-hed|-#@`Fmt6^IpaQQNx$tA)O(EdZq6M<0yiZzXA=SY3AlJx; zo{e5WU$tC?Qw1^k&@#X;KEl&^sS~5{m%zP=9MC>kDwKl15`F^KK1K=XK!ePY<5w_S zP3l!u=qTOeQt5w=CN8KjMV{s z&W0>*R~oNtH*8PCt|+Z|#tv0vq(!_Z`2D(>r_v2Yz3wM-|d0lU_F}oXcJ1lLIh~ATP$s^JVX8w0}Jl=nX)aw5Xyiots6PJO%052^x A^#A|> literal 0 HcmV?d00001 diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/paket.references b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/paket.references new file mode 100644 index 0000000000..e88562d545 --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/paket.references @@ -0,0 +1 @@ +nunit \ No newline at end of file diff --git a/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/projectB.csproj b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/projectB.csproj new file mode 100644 index 0000000000..cd35c8e35f --- /dev/null +++ b/integrationtests/scenarios/i001848-pack-with-non-packed-deps/before/projectB/projectB.csproj @@ -0,0 +1,67 @@ + + + + + Debug + AnyCPU + {4CF9D89C-5231-4A59-B823-17082D5646EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + projectB + projectB + v4.5 + 512 + + + AnyCPU + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + ..\packages\NUnit\lib\net45\nunit.framework.dll + True + True + + + + + \ No newline at end of file diff --git a/src/Paket.Core/Packaging/PackageMetaData.fs b/src/Paket.Core/Packaging/PackageMetaData.fs index 142f739c8e..0e22426073 100644 --- a/src/Paket.Core/Packaging/PackageMetaData.fs +++ b/src/Paket.Core/Packaging/PackageMetaData.fs @@ -159,7 +159,7 @@ let addFile (source : string) (target : string) (templateFile : TemplateFile) = | IncompleteTemplate -> failwith (sprintf "You should only try and add files to template files with complete metadata.%sFile: %s" Environment.NewLine templateFile.FileName) -let findDependencies (dependenciesFile : DependenciesFile) config platform (template : TemplateFile) (project : ProjectFile) lockDependencies minimumFromLockFile pinProjectReferences (map : Map) includeReferencedProjects (version :SemVerInfo option) specificVersions (projDeps) = +let findDependencies (dependenciesFile : DependenciesFile) config platform (template : TemplateFile) (project : ProjectFile) lockDependencies minimumFromLockFile pinProjectReferences (projectWithTemplates : Map) includeReferencedProjects (version :SemVerInfo option) specificVersions (projDeps) = let includeReferencedProjects = template.IncludeReferencedProjects || includeReferencedProjects let targetDir = match project.OutputType with @@ -183,10 +183,10 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp interProjectDeps |> List.filter (fun proj -> proj <> project) - |> List.fold (fun (deps, files) p -> - match Map.tryFind p.FileName map with - | Some packagedRef -> packagedRef :: deps, files - | None -> + |> List.fold (fun (deps, files) p -> + match Map.tryFind p.FileName projectWithTemplates with + | Some (packagedTemplate,packagedProject,true) -> (packagedTemplate,packagedProject) :: deps, files + | _ -> let p = match ProjectFile.TryLoad p.FileName with | Some p -> p @@ -296,30 +296,20 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp |> Seq.map (fun kv -> kv.Value.NugetPackages |> List.map (fun p -> Some kv.Key, p, None)) |> List.concat | None -> [] - + [if includeReferencedProjects then for proj in project.GetAllReferencedProjects(false,projDeps) |> Seq.filter ((<>) project) do - match proj.FindTemplatesFile() with - | Some templateFileName when TemplateFile.IsProjectType templateFileName -> - match TemplateFile.Load(templateFileName, lockFile, None, Seq.empty |> Map.ofSeq).Contents with - | CompleteInfo(_) -> - yield! getPackages proj - | ProjectInfo(core, _) -> - let name = - match core.Id with - | Some name -> name - | None -> proj.GetAssemblyName().Replace(".dll","").Replace(".exe","") - - let versionConstraint = - match core.Version with - | Some v -> - let vr = if lockDependencies || pinProjectReferences then Specific v else Minimum v - VersionRequirement(vr, getPreReleaseStatus v) - | None -> VersionRequirement.AllReleases - - yield None, { Name = PackageName name; Settings = InstallSettings.Default }, Some versionConstraint + match Map.tryFind proj.FileName projectWithTemplates with + | Some ({ Contents = CompleteInfo(core, _) }, _, _) -> + let versionConstraint = + match core.Version with + | Some v -> + let vr = if lockDependencies || pinProjectReferences then Specific v else Minimum v + VersionRequirement(vr, getPreReleaseStatus v) + | None -> VersionRequirement.AllReleases + + yield None, { Name = PackageName core.Id; Settings = InstallSettings.Default }, Some versionConstraint | _ -> yield! getPackages proj - yield! getPackages project] // filter out any references that are transitive diff --git a/src/Paket.Core/Packaging/PackageProcess.fs b/src/Paket.Core/Packaging/PackageProcess.fs index 8be9d518f3..70dda5c875 100644 --- a/src/Paket.Core/Packaging/PackageProcess.fs +++ b/src/Paket.Core/Packaging/PackageProcess.fs @@ -148,41 +148,38 @@ let Pack(workingDir,dependenciesFile : DependenciesFile, packageOutputPath, buil let projDeps = (Dictionary(),Dictionary()) // load up project files and grab meta data - let projectTemplates = - let getAllProjectsFiles workingDir = - ProjectFile.FindAllProjectFiles workingDir - |> Array.choose (fun (projectFile:FileInfo) -> - match ProjectFile.FindCorrespondingFile(projectFile, Constants.TemplateFile) with - | None -> None - | Some fileName -> - match ProjectFile.tryLoad projectFile.FullName with - | Some projectFile -> Some(projectFile,TemplateFile.Load(fileName,lockFile,version,specificVersions)) - | None -> None) - |> Array.filter (fun (_,templateFile) -> + let projectTemplates = + ProjectFile.FindAllProjectFiles workingDir + |> Array.choose (fun (projectFile:FileInfo) -> + match ProjectFile.FindCorrespondingFile(projectFile, Constants.TemplateFile) with + | None -> None + | Some fileName -> + match ProjectFile.tryLoad projectFile.FullName with + | Some projectFile -> Some(projectFile,TemplateFile.Load(fileName,lockFile,version,specificVersions)) + | None -> None) + |> Array.filter (fun (_,templateFile) -> + match templateFile with + | CompleteTemplate _ -> false + | IncompleteTemplate -> true) + |> Array.filter (fun (_,templateFile) -> + match TemplateFile.tryGetId templateFile with + | Some id -> + if excludedTemplateIds.Contains id then + allTemplateFiles.Remove(templateFile.FileName) |> ignore + false + else true + | _ -> true) + |> Array.map (fun (projectFile,templateFile') -> + allTemplateFiles.Remove(templateFile'.FileName) |> ignore + + let merged = merge buildConfig buildPlatform version specificVersions projectFile templateFile' + let willBePacked = match templateFile with - | CompleteTemplate _ -> false - | IncompleteTemplate -> true) - |> Array.filter (fun (_,templateFile) -> - match TemplateFile.tryGetId templateFile with - | Some id -> - if excludedTemplateIds.Contains id then - allTemplateFiles.Remove(templateFile.FileName) |> ignore - false - else true - | _ -> true) - |> Array.map (fun (projectFile,templateFile') -> - allTemplateFiles.Remove(templateFile'.FileName) |> ignore - - let merged = merge buildConfig buildPlatform version specificVersions projectFile templateFile' - Path.GetFullPath projectFile.FileName |> normalizePath,(merged,projectFile)) - |> Map.ofArray - - match templateFile with - | Some template -> - let projects = getAllProjectsFiles (FileInfo(template).Directory.FullName) - projects - |> Map.filter (fun p (t,_) -> normalizePath (Path.GetFullPath t.FileName) = normalizePath (Path.GetFullPath template)) - | None -> getAllProjectsFiles workingDir + | Some file -> normalizePath (Path.GetFullPath file) = normalizePath (Path.GetFullPath merged.FileName) + | None -> true + + Path.GetFullPath projectFile.FileName |> normalizePath,(merged,projectFile,willBePacked)) + |> Map.ofArray // add dependencies let allTemplates = @@ -209,8 +206,9 @@ let Pack(workingDir,dependenciesFile : DependenciesFile, packageOutputPath, buil let remaining = allTemplateFiles |> Seq.collect convertRemainingTemplate |> Seq.toList projectTemplates + |> Map.filter (fun _ (_,_,willBePacked) -> willBePacked) |> Map.toList - |> Seq.collect(fun (_,(t, p)) -> + |> Seq.collect(fun (_,(t, p, _)) -> seq { for template in optWithSymbols p t do yield template, p