Remove all Paket entries from projects which have no paket.references -

fixes #1097
fsprojects · Sep 29, 2015 · 069f9ec · 069f9ec
1 parent 129faae
commit 069f9ec
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,8 @@
+#### 2.4.11 - 29.09.2015
+* Remove all Paket entries from projects which have no paket.references - https://github.com/fsprojects/Paket/issues/1097
+
 #### 2.4.10 - 29.09.2015
-* Állow to format VersionRequirements in NuGet syntax
+* Allow to format VersionRequirements in NuGet syntax
 
 #### 2.4.9 - 29.09.2015
 * BUGFIX: Fix KeyNotFoundException when project is net4.0-client - https://github.com/fsprojects/Paket/issues/1095

diff --git a/src/Paket.Core/InstallProcess.fs b/src/Paket.Core/InstallProcess.fs
@@ -176,14 +176,20 @@ let private applyBindingRedirects (loadedLibs:Dictionary<_,_>) createNewBindingF
 let findAllReferencesFiles root =
     root
     |> ProjectFile.FindAllProjects
-    |> Array.choose (fun p -> ProjectFile.FindReferencesFile(FileInfo(p.FileName))
-                                |> Option.map (fun r -> p, r))
-    |> Array.map (fun (project,file) ->
-        try
-            ok <| (project, ReferencesFile.FromFile(file))
-        with _ ->
-            fail <| ReferencesFileParseError (FileInfo(file)))
-    |> collect
+    |> Array.map (fun p ->         
+        match ProjectFile.FindReferencesFile(FileInfo p.FileName) with
+        | Some fileName -> 
+                try
+                    ok <| (p, ReferencesFile.FromFile fileName)
+                with _ ->
+                    fail <| ReferencesFileParseError (FileInfo fileName)
+        | None ->
+            let fileName = 
+                let fi = FileInfo(p.FileName)
+                Path.Combine(fi.Directory.FullName,Constants.ReferencesFile)
+
+            ok <| (p, ReferencesFile.New fileName))
+     |> collect
 
 /// Installs all packages from the lock file.
 let InstallIntoProjects(options : InstallerOptions, dependenciesFile, lockFile : LockFile, projects : (ProjectFile * ReferencesFile) list) =    

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -34,11 +34,11 @@
     <StartWorkingDirectory>c:\code\Paket09x</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Pakettest</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paketkopie</StartWorkingDirectory>
-    <StartArguments>update nuget Vetserve.Appointments.Interop -v</StartArguments>
+    <StartArguments>install</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
-    <StartWorkingDirectory>d:\code\Paketrepro</StartWorkingDirectory>
+    <StartWorkingDirectory>d:\code\PaketKopie</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>