DependenciesFileParser now tracks inner exceptions for package sources

src/Paket.Core/DependenciesFileParser.fs

@@ -225,7 +225,13 @@ module DependenciesFileParser =
 
         match trimmed with
         | _ when String.IsNullOrWhiteSpace line -> Empty(line)
-        | String.StartsWith "source" _ as trimmed -> Remote(RemoteParserOption.PackageSource(PackageSource.Parse(trimmed)))
+        | String.StartsWith "source" _ as trimmed -> 
+            try 
+                let source = PackageSource.Parse(trimmed)
+                Remote(RemoteParserOption.PackageSource(source))
+            with e -> 
+                traceWarnfn "could not parse package source %s (%s)" trimmed e.Message
+                reraise ()
         | String.StartsWith "cache" _ as trimmed -> Remote(RemoteParserOption.Cache(Cache.Parse(trimmed)))
         | String.StartsWith "group" _ as trimmed -> Group(trimmed.Replace("group ",""))
         | String.StartsWith "nuget" trimmed -> 

src/Paket.Core/Domain.fs

@@ -94,7 +94,7 @@ let GroupName(name:string) =
 type DomainMessage = 
     | DirectoryDoesntExist of DirectoryInfo
     | DependenciesFileNotFoundInDir of DirectoryInfo
-    | DependenciesFileParseError of FileInfo
+    | DependenciesFileParseError of FileInfo * exn
     | LockFileNotFound of DirectoryInfo
     | LockFileParseError of FileInfo
     | ReferencesFileParseError of FileInfo
@@ -127,8 +127,8 @@ type DomainMessage =
             sprintf "Directory %s does not exist." di.FullName
         | DependenciesFileNotFoundInDir(di) -> 
             sprintf "Dependencies file not found in %s." di.FullName
-        | DependenciesFileParseError(fi) -> 
-            sprintf "Unable to parse %s." fi.FullName
+        | DependenciesFileParseError(fi,e) -> 
+            sprintf "Unable to parse %s. (%s)" fi.FullName e.Message
         | LockFileNotFound(di) -> 
             sprintf "Lock file not found in %s. Create lock file by running paket install." di.FullName
         | LockFileParseError(fi) -> 

src/Paket.Core/Environment.fs

@@ -33,8 +33,8 @@ module PaketEnv =
                 else
                     try
                         ok (DependenciesFile.ReadFromFile(fi.FullName))
-                    with _ ->
-                        fail (DependenciesFileParseError fi)
+                    with e ->
+                        DependenciesFileParseError(fi,e) |> fail
 
             let! lockFile =
                 let fi = FileInfo(Path.Combine(directory.FullName, Constants.LockFileName))

src/Paket.Core/NugetConvert.fs

@@ -270,7 +270,7 @@ let createDependenciesFileR (rootDirectory : DirectoryInfo) nugetEnv mode =
         try 
             DependenciesFile.ReadFromFile dependenciesFileName
             |> ok
-        with _ -> DependenciesFileParseError (FileInfo dependenciesFileName) |> fail
+        with e -> DependenciesFileParseError (FileInfo dependenciesFileName, e) |> fail
         |> lift addPackages
 
     let create() =

src/Paket.Core/Paket.Core.fsproj

@@ -85,8 +85,8 @@
     <Compile Include="Async.fs" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="CustomAssemblyInfo.fs" />
-    <Compile Include="Domain.fs" />
     <Compile Include="Logging.fsi" />
+    <Compile Include="Domain.fs" />
     <Compile Include="Logging.fs" />
     <Compile Include="Constants.fs" />
     <Compile Include="Utils.fs" />