Fix NRE in #1434

fsprojects · Jan 27, 2016 · d5b99ef · d5b99ef
1 parent d0846c4
commit d5b99ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.47.3-alpha001 - 27.01.2016
+* BUGFIX: paket pack with enabled include-referenced-projects flag doesn't throwh NRE - https://github.com/fsprojects/Paket/issues/1434
+
 #### 2.47.2 - 25.01.2016
 * BUGFIX: Fixed pack package dependencies for dependent projects - https://github.com/fsprojects/Paket/issues/1429
 

diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -239,19 +239,7 @@ let findDependencies (dependencies : DependenciesFile) config platform (template
                     let projFileInfo = (FileInfo proj.FileName)
                     let tf = ProjectFile.FindTemplatesFile projFileInfo
                     match tf with
-                    | Some t ->
-                        if TemplateFile.IsProjectType tf.Value then
-                            let templateFile = TemplateFile.Load(t, lockFile, None, Seq.empty |> Map.ofSeq)
-                            match templateFile.Contents with
-                            | CompleteInfo(core, optional) ->
-                                yield! getPackages proj
-                            | ProjectInfo(core, optional) ->
-                                let pis : PackageInstallSettings = { Name = PackageName(core.Id.Value); 
-                                                                        Settings = InstallSettings.Default
-                                                                   }
-                                yield (GroupName("~~referenced-project"), pis, true)
-                        else
-                            yield! getPackages proj
+                    | Some t -> ()
                     | None ->
                         yield! getPackages proj
                 else 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -38,7 +38,7 @@
     <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartArguments>install</StartArguments>
     <StartArguments>restore</StartArguments>
-    <StartArguments>pack -v output D:\code\Paket\integrationtests\scenarios\i001429-pack-deps\temp\out</StartArguments>
+    <StartArguments>pack output "out/nuget"  version  0.9.3 releaseNotes  "[LanguageExtensions][New] New Ensure methods with exception parameter." include-referenced-projects</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
@@ -48,7 +48,7 @@
     <StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001270-net461\temp</StartWorkingDirectory>
     <StartWorkingDirectory>C:\code\restore</StartWorkingDirectory>
-    <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001429-pack-deps\temp</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\Journalist</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>