Merge remote-tracking branch 'origin/master' into sourcelink2

.paket/Paket.Restore.targets

@@ -12,7 +12,7 @@
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
   </PropertyGroup>
 
-  <Target Name="PaketRestore" BeforeTargets="_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+  <Target Name="PaketRestore" BeforeTargets="_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
 
     <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" ' />
 
@@ -45,7 +45,7 @@
       <ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec>
     </PropertyGroup>
   </Target>
-  
+
   <Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" >
     <PropertyGroup>
       <PaketReferencesFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references</PaketReferencesFilePath>
@@ -57,7 +57,7 @@
     </ItemGroup>
 
     <Exec Command='$(PaketCommand) fix-nuspec file "@(_NuspecFiles)" references-file "$(PaketReferencesFilePath)" ' />
-    
+
     <ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
       <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
     </ConvertToAbsolutePath>

Paket.sln

@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60
 		LICENSE.txt = LICENSE.txt
 		paket.dependencies = paket.dependencies
 		paket.lock = paket.lock
+		.paket\Paket.Restore.targets = .paket\Paket.Restore.targets
 		nuget\paket.template = nuget\paket.template
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md

RELEASE_NOTES.md

@@ -1,3 +1,19 @@
+#### 4.4.0 - 12.04.2017
+* BUGFIX: Import .props/.targets better - https://github.com/fsprojects/Paket/pull/2234
+* BUGFIX: Don't download boostrapper in auto-restore magic mode - https://github.com/fsprojects/Paket/pull/2235
+* BUGFIX: Only include dlls in analyzers - https://github.com/fsprojects/Paket/pull/2236
+* USABILITY: Fix rotating app.config entries when generating redirects - https://github.com/fsprojects/Paket/pull/2230
+
+#### 4.3.0 - 10.04.2017
+* BUGFIX: Check if a references file exists on disk - https://github.com/fsprojects/Paket/pull/2224
+
+#### 4.2.0 - 09.04.2017
+* BUGFIX: Improved output of the outdated warning and fix underlying bug - https://github.com/fsprojects/Paket/pull/2223
+* BUGFIX: Make Paket.Restore.targets be called in more situations
+* BUGFIX: Fix to handle weird malformed portable-only libraries - https://github.com/fsprojects/Paket/pull/2215
+* BUGFIX: Detect changes in redirects settings
+* BUGFIX: Workaround for TFS dependency resolution - https://github.com/fsprojects/Paket/pull/2214
+
 #### 4.1.3 - 30.03.2017
 * Support for dotnet pack
 * BUGFIX: Handle empty references files for .NET Core

integrationtests/Paket.IntegrationTests/LoadingScriptGenerationTests.fs

@@ -210,7 +210,7 @@ let ``generates script on install`` () =
 
 [<Test; Category("scriptgen dependencies")>]
 let ``issue 2156 netstandard`` () =
-    let scenario = "issue-2156-netstandard"
+    let scenario = "issue-2156"
     paket "install" scenario |> ignore
     directPaket "generate-load-scripts" scenario |> ignore
     // note: no assert for now, I don't know what we are exactly expecting

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -103,7 +103,6 @@
     <Compile Include="TestHelper.fs" />
     <Compile Include="InitSpecs.fs" />
     <Compile Include="OutdatedSpecs.fs" />
-    <Compile Include="GroupSpecs.fs" />
     <Compile Include="FullGitSpecs.fs" />
     <Compile Include="FrameworkRestrictionsSpecs.fs" />
     <Compile Include="NuGetV3Specs.fs" />
@@ -115,7 +114,6 @@
     <Compile Include="InstallSpecs.fs" />
     <Compile Include="AutoRestoreSpec.fs" />
     <Compile Include="FrameworkRestrictionsSpecs.fs" />
-    <Compile Include="GroupSpecs.fs" />
     <Compile Include="HttpSpecs.fs" />
     <Compile Include="PaketCoreSpecs.fs" />
     <Compile Include="BasicResolverSpecs.fs" />

integrationtests/Paket.IntegrationTests/UpdateGroupsSpecs.fs

@@ -10,28 +10,6 @@ open Paket
 open Paket.Domain
 
 
-[<Test>]
-let ``#1018 update main group``() =
-    paket "update group Main" "i001018-legacy-groups-update" |> ignore
-    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001018-legacy-groups-update","paket.lock"))
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "6.0.3")
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "NUnit"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "2.6.1")
-    lockFile.Groups.[GroupName "Legacy"].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldEqual (SemVer.Parse "5.0.2")
-
-[<Test>]
-let ``#1018 update group legacy``() =
-    paket "update group leGacy" "i001018-legacy-groups-update" |> ignore
-    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001018-legacy-groups-update","paket.lock"))
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldEqual (SemVer.Parse "6.0.3")
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "NUnit"].Version
-    |> shouldEqual (SemVer.Parse "2.6.1")
-    lockFile.Groups.[GroupName "Legacy"].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "5.0.2")
-
 [<Test>]
 let ``#1711 update main group with correct source``() =
     update "i001711-wrong-source" |> ignore

integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs

@@ -21,39 +21,6 @@ open Paket
 open Paket.Domain
 open Paket.Requirements
 
-[<Test>]
-let ``#1018 update package in main group``() =
-    paket "update nuget Newtonsoft.json" "i001018-legacy-groups-update" |> ignore
-    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001018-legacy-groups-update","paket.lock"))
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "6.0.3")
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "NUnit"].Version
-    |> shouldEqual (SemVer.Parse "2.6.1")
-    lockFile.Groups.[GroupName "Legacy"].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldEqual (SemVer.Parse "5.0.2")
-
-[<Test>]
-let ``#1018 update package in explicit main group``() =
-    paket "update nuget Newtonsoft.json group Main" "i001018-legacy-groups-update" |> ignore
-    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001018-legacy-groups-update","paket.lock"))
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "6.0.3")
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "NUnit"].Version
-    |> shouldEqual (SemVer.Parse "2.6.1")
-    lockFile.Groups.[GroupName "Legacy"].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldEqual (SemVer.Parse "5.0.2")
-
-[<Test>]
-let ``#1018 update package in group``() =
-    paket "update nuget Newtonsoft.json group leGacy" "i001018-legacy-groups-update" |> ignore
-    let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001018-legacy-groups-update","paket.lock"))
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldEqual (SemVer.Parse "6.0.3")
-    lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "NUnit"].Version
-    |> shouldEqual (SemVer.Parse "2.6.1")
-    lockFile.Groups.[GroupName "Legacy"].Resolution.[PackageName "Newtonsoft.Json"].Version
-    |> shouldBeGreaterThan (SemVer.Parse "5.0.2")
-
 [<Test>]
 let ``#1178 update specific package``() =
     paket "update nuget NUnit" "i001178-update-with-regex" |> ignore

integrationtests/scenarios/i001487-stable-props/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.props" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.props')" Label="Paket" />
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -69,15 +70,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.6')">
-      <PropertyGroup>
-        <__paket__MultiTarget_props>MultiTarget</__paket__MultiTarget_props>
-        <__paket__MultiTarget_targets>MultiTarget</__paket__MultiTarget_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_props).props')" Label="Paket" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -120,5 +112,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets" Condition="Exists('..\..\packages\MultiTarget\build\$(__paket__MultiTarget_targets).targets')" Label="Paket" />
+  <Import Project="..\..\packages\MultiTarget\build\MultiTarget.targets" Condition="Exists('..\..\packages\MultiTarget\build\MultiTarget.targets')" Label="Paket" />
 </Project>

integrationtests/scenarios/i001585-websharper-props/before/xUnitTests/xUnitTests.expected.csprojtemplate

@@ -56,13 +56,6 @@
     </Otherwise>
   </Choose>
   <Import Project="$(FSharpTargetsPath)" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
-      <PropertyGroup>
-        <__paket__WebSharper_targets>WebSharper</__paket__WebSharper_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -126,5 +119,5 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets" Condition="Exists('..\packages\WebSharper\build\$(__paket__WebSharper_targets).targets')" Label="Paket" />
+  <Import Project="..\packages\WebSharper\build\WebSharper.targets" Condition="Exists('..\packages\WebSharper\build\WebSharper.targets')" Label="Paket" />
 </Project>

src/Paket.Bootstrapper/Properties/AssemblyInfo.cs

@@ -4,16 +4,16 @@
 [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")]
 [assembly: AssemblyProductAttribute("Paket")]
 [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")]
-[assembly: AssemblyVersionAttribute("4.1.3")]
-[assembly: AssemblyFileVersionAttribute("4.1.3")]
-[assembly: AssemblyInformationalVersionAttribute("4.1.3")]
+[assembly: AssemblyVersionAttribute("4.4.0")]
+[assembly: AssemblyFileVersionAttribute("4.4.0")]
+[assembly: AssemblyInformationalVersionAttribute("4.4.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const System.String AssemblyTitle = "Paket.Bootstrapper";
         internal const System.String AssemblyProduct = "Paket";
         internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories.";
-        internal const System.String AssemblyVersion = "4.1.3";
-        internal const System.String AssemblyFileVersion = "4.1.3";
-        internal const System.String AssemblyInformationalVersion = "4.1.3";
+        internal const System.String AssemblyVersion = "4.4.0";
+        internal const System.String AssemblyFileVersion = "4.4.0";
+        internal const System.String AssemblyInformationalVersion = "4.4.0";
     }
 }

src/Paket.Core/AssemblyInfo.fs

@@ -6,16 +6,16 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyCompanyAttribute("Paket team")>]
 [<assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")>]
-[<assembly: AssemblyVersionAttribute("4.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("4.1.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("4.1.3")>]
+[<assembly: AssemblyVersionAttribute("4.4.0")>]
+[<assembly: AssemblyFileVersionAttribute("4.4.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("4.4.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Paket.Core"
     let [<Literal>] AssemblyProduct = "Paket"
     let [<Literal>] AssemblyCompany = "Paket team"
     let [<Literal>] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."
-    let [<Literal>] AssemblyVersion = "4.1.3"
-    let [<Literal>] AssemblyFileVersion = "4.1.3"
-    let [<Literal>] AssemblyInformationalVersion = "4.1.3"
+    let [<Literal>] AssemblyVersion = "4.4.0"
+    let [<Literal>] AssemblyFileVersion = "4.4.0"
+    let [<Literal>] AssemblyInformationalVersion = "4.4.0"

src/Paket.Core/BindingRedirects.fs

@@ -156,8 +156,9 @@ let private applyBindingRedirects isFirstGroup cleanBindingRedirects (allKnownLi
     nsManager.AddNamespace("bindings", bindingNs)
     config.XPathSelectElements("//bindings:assemblyBinding", nsManager)
     |> Seq.collect (fun e -> e.Elements(XName.Get("dependentAssembly", bindingNs)))
-    |> Seq.filter (fun e -> isFirstGroup && (cleanBindingRedirects || isMarked e) && libIsContained e)
-    |> Seq.iter (fun e -> e.Remove())
+    |> List.ofSeq // strict evaluation, as otherwise e.Remove() also changes the order!
+    |> List.filter (fun e -> isFirstGroup && (cleanBindingRedirects || isMarked e) && libIsContained e)
+    |> List.iter (fun e -> e.Remove())
 
     let config = Seq.fold setRedirect config bindingRedirects
     indentAssemblyBindings config
@@ -170,19 +171,19 @@ let private applyBindingRedirects isFirstGroup cleanBindingRedirects (allKnownLi
 /// Applies a set of binding redirects to all .config files in a specific folder.
 let applyBindingRedirectsToFolder isFirstGroup createNewBindingFiles cleanBindingRedirects rootPath allKnownLibs bindingRedirects =
     let applyBindingRedirects projectFile =
-        let bindingRedirects = bindingRedirects projectFile
+        let bindingRedirects = bindingRedirects projectFile |> Seq.toList
         let path = Path.GetDirectoryName projectFile.FileName
         match getConfig Directory.GetFiles path with
         | Some c -> Some c
         | None -> 
-            match createNewBindingFiles, Seq.isEmpty bindingRedirects with
+            match createNewBindingFiles, List.isEmpty bindingRedirects with
             | true, false ->
                 let config = createAppConfigInDirectory path
                 addConfigFileToProject projectFile
                 Some config
             | _ -> None
         |> Option.iter (applyBindingRedirects isFirstGroup cleanBindingRedirects allKnownLibs bindingRedirects)
-
+    
     rootPath
     |> getProjectFilesWithPaketReferences Directory.GetFiles
     |> Seq.map ProjectFile.TryLoad