Some improvements

docs/content/commands/restriction.md

@@ -0,0 +1,36 @@
+# paket restriction
+
+Determine how a restriction formula is interpreted by paket.
+
+```sh
+paket restriction <restriction formula>
+
+RESTRICTION:
+
+    <restriction formula> A paket formula representing a restriction
+
+OPTIONS:
+
+    --silent, -s          suppress console output
+    --verbose, -v         print detailed information to the console
+    --log-file <path>     print output to a file
+    --from-bootstrapper   call coming from the '--run' feature of the bootstrapper
+    --help                display this list of options.
+```
+
+> Note if your formula contains spaces (which it will most likely) you need to escape with quotes
+
+## Example
+
+```
+$ ./paket.exe restriction "|| (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0))"
+Paket version 5.145.1
+Restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
+Simplified: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
+Frameworks: [
+   netcoreapp2.0
+]
+Performance:
+ - Runtime: 763 milliseconds
+```
+

docs/tools/templates/template.cshtml

@@ -129,6 +129,7 @@
             <li><a href="@Root/paket-show-installed-packages.html">paket show-installed-packages</a></li>
             <li><a href="@Root/paket-update.html">paket update</a></li>
             <li><a href="@Root/paket-why.html">paket why</a></li>
+            <li><a href="@Root/paket-restriction.html">paket restriction</a></li>
           </ul>
         </div>
       </div>

integrationtests/Paket.IntegrationTests/LoadingScriptGenerationTests.fs

@@ -80,7 +80,7 @@ let assertNhibernateForFramework35IsThere scenario =
         "iesi.collections.csx", ["Net35/Iesi.Collections.dll"]
         "iesi.collections.fsx", ["Net35/Iesi.Collections.dll"]
         "nhibernate.csx", ["Net35/NHibernate.dll";"#load \"iesi.collections.csx\""]
-        "nhibernate.fsx", ["Net35/NHibernate.dll";"#load @\"iesi.collections.fsx\""]
+        "nhibernate.fsx", ["Net35/NHibernate.dll";"#load \"iesi.collections.fsx\""]
     ]
     let folder = getLoadScriptDefaultFolder scenario
     let failures = getScriptContentsFailedExpectations folder expectations
@@ -202,7 +202,7 @@ let ``mscorlib excluded from f# script`` () =
     Assert.False hasFilesWithMsCorlib
 
     // Important to have the correct relative path
-    let expectedContent = "#load @\"Microsoft.Rest.ClientRuntime.Azure.fsx\""
+    let expectedContent = "#load \"Microsoft.Rest.ClientRuntime.Azure.fsx\""
     let scriptPath = Path.Combine(scriptRootDir.FullName, "net46", "Microsoft.Azure.Management.ResourceManager.fsx")
     let scriptContent = File.ReadAllText(scriptPath)
     Assert.IsTrue(scriptContent.Contains expectedContent, sprintf "Should contain '%s' but script content was:\n%s" expectedContent scriptContent)

integrationtests/scenarios/i001505-conditionals/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csproj.expected

@@ -89,7 +89,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3')">
       <ItemGroup>
         <Reference Include="Microsoft.Diagnostics.Tracing.EventSource">
           <HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist\lib\net40\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>

src/Paket.Core/Installation/ScriptGeneration.fs

@@ -111,16 +111,16 @@ module ScriptGeneration =
                 else libFile.FullName
 
             // create the approiate load string for the target resource
-            let refString (reference:ReferenceType)  = 
+            let refString (reference:ReferenceType)  =
+                let escapeString (s:string) =
+                    s.Replace("\\", "\\\\").Replace("\"", "\\\"")
                 match reference, self.Lang with
                 | Assembly file, _ ->
-                     sprintf """#r "%s" """ (relativePath scriptFile file)
-                | LoadScript script, ScriptType.FSharp ->
-                     sprintf """#load @"%s" """ (relativePath scriptFile ((baseDirectory.FullName </> script) |> FileInfo))
-                | LoadScript script, ScriptType.CSharp ->     
-                     sprintf """#load "%s" """ (relativePath scriptFile ((baseDirectory.FullName </> script) |> FileInfo))
+                     sprintf """#r "%s" """ (relativePath scriptFile file |> escapeString)
+                | LoadScript script, _ ->
+                     sprintf """#load "%s" """ (relativePath scriptFile ((baseDirectory.FullName </> script) |> FileInfo) |> escapeString)
                 | Framework name,_ ->
-                     sprintf """#r "%s" """ name
+                     sprintf """#r "%s" """ (escapeString name)
 
             self.Input |> Seq.map refString |> Seq.distinct |> String.concat "\n"
 

src/Paket.Core/PaketConfigFiles/ProjectFile.fs

@@ -278,6 +278,15 @@ module ProjectFile =
     let private appendMap first second =
         Map.fold (fun state key value -> Map.add key value state) first second
 
+    let inline getPackageIdAttribute (pf:ProjectFile) (node:XmlNode) =
+        let maybePackageId =
+            node
+            |> getAttribute "Include"
+            |> Option.orElseWith (fun _ -> node |> getAttribute "Update")
+        match maybePackageId with
+        | Some id -> id
+        | None -> failwithf "project file '%s' contains a reference without 'Include' or 'Update' attribute" pf.FileName
+
     let private calculatePropertyMap (projectFile:ProjectFile) defaultProperties =
         let defaultProperties = appendMap defaultProperties (getReservedProperties projectFile)
 
@@ -1460,10 +1469,10 @@ module ProjectFile =
         |> List.filter (getDescendants "PrivateAssets" >>
                         List.exists (fun x -> x.InnerText = "All") >>
                         not)
-        
+
     let getPackageReferences project =
         packageReferencesNoPrivateAssets project
-        |> List.map (getAttribute "Include" >> Option.get)
+        |> List.map (getPackageIdAttribute project)
 
     let getCliReferences project =
         cliToolsNoPrivateAssets project
@@ -1635,8 +1644,7 @@ module ProjectFile =
                     VersionRange.AtLeast (v.Replace("*","0"))
                 else
                     VersionRange.Exactly v
-
-            { NugetPackage.Id = node |> getAttribute "Include" |> Option.get
+            { NugetPackage.Id = getPackageIdAttribute projectFile node
               VersionRange = versionRange
               Kind = NugetPackageKind.Package
               TargetFramework = None })

src/Paket.Core/Versioning/ConfigFile.fs

@@ -160,13 +160,7 @@ let GetAuthenticationForUrl =
         getSourceNodes credentialsNode source "credential" @ getSourceNodes credentialsNode source "token"
 
     match sourceNodes with
-    | sourceNode :: _ ->
-        let auth = getAuthFromNode sourceNode
-        if checkCredentials (url, Some auth) then 
-            Some auth
-        else 
-            failwithf "Credentials from authentication store for %s are invalid" source
-            None
+    | sourceNode :: _ -> Some (getAuthFromNode sourceNode)
     | _ -> None)
 
 /// Get the authentication from the authentication store for a specific source

src/Paket/Commands.fs

@@ -597,6 +597,14 @@ with
 
         | Details -> "display detailed information with all paths, versions and framework restrictions"
 
+type RestrictionArgs =
+    | [<ExactlyOnce;MainCommand>] Restriction of restrictionRaw:string
+with
+  interface IArgParserTemplate with
+      member this.Usage =
+        match this with
+        | Restriction(_) -> "The restriction to resolve"
+
 type Command =
     // global options
     |                                                   Version
@@ -630,6 +638,7 @@ type Command =
     | [<Hidden;CustomCommandLine("generate-include-scripts")>] GenerateIncludeScripts of ParseResults<GenerateLoadScriptsArgs>
     | [<CustomCommandLine("generate-load-scripts")>]    GenerateLoadScripts of ParseResults<GenerateLoadScriptsArgs>
     | [<CustomCommandLine("why")>]                      Why of ParseResults<WhyArgs>
+    | [<CustomCommandLine("restriction")>]              Restriction of ParseResults<RestrictionArgs>
     | [<CustomCommandLine("info")>]                     Info of ParseResults<InfoArgs>
 with
     interface IArgParserTemplate with
@@ -660,6 +669,7 @@ with
             | GenerateIncludeScripts _ -> "[obsolete]"
             | GenerateLoadScripts _ -> "generate F# and C# include scripts that reference installed packages in a interactive environment like F# Interactive or ScriptCS"
             | Why _ -> "determine why a dependency is required"
+            | Restriction _ -> "resolve a framework restriction and show details"
             | Info _ -> "info"
             | Log_File _ -> "print output to a file"
             | Silent -> "suppress console output"

src/Paket/Program.fs

@@ -569,6 +569,8 @@ let findPackages silent (results : ParseResults<_>) =
 
 #nowarn "44" // because FixNuspecs is deprecated and we have warnaserror
 
+open Paket.Requirements
+
 let fixNuspecs silent (results : ParseResults<_>) =
     let nuspecFiles =
         results.GetResult <@ FixNuspecsArgs.Files @>
@@ -741,6 +743,22 @@ let why (results: ParseResults<WhyArgs>) =
 
     Why.ohWhy(packageName, directDeps, lockFile, groupName, results.Parser.PrintUsage(), options)
 
+let restriction (results: ParseResults<RestrictionArgs>) =
+    let restrictionRaw = results.GetResult <@ RestrictionArgs.Restriction @>
+    let restriction, parseProblems = Requirements.parseRestrictions restrictionRaw
+
+    for problem in parseProblems |> Seq.map (fun x -> x.AsMessage) do
+        Logging.traceWarnfn "Problem: %s" problem
+
+    Logging.tracefn "Restriction: %s" restrictionRaw
+    Logging.tracefn "Simplified: %s" (restriction.ToString())
+    Logging.tracefn "Frameworks: [ "
+    for framework in restriction.RepresentedFrameworks do
+        Logging.tracefn "   %s" framework.CompareString
+    Logging.tracefn "]"
+
+
+
 let waitForDebugger () =
     while not(System.Diagnostics.Debugger.IsAttached) do
         System.Threading.Thread.Sleep(100)
@@ -776,6 +794,7 @@ let handleCommand silent command =
     | GenerateLoadScripts r -> processCommand silent generateLoadScripts r
     | GenerateNuspec r -> processCommand silent generateNuspec r
     | Why r -> processCommand silent why r
+    | Restriction r -> processCommand silent restriction r
     | Info r -> processCommand silent info r
     // global options; list here in order to maintain compiler warnings
     // in case of new subcommands added