From 7e963408f6aa9f1a9be2d98b1e73ab712eb7bca0 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Wed, 30 Mar 2016 09:22:53 +0200
Subject: [PATCH 1/2] Property Definitions: placed after non-paket imports if
 they directly follow the top property groups #1537

---
 .../MyClassLibrary/MyClassLibrary.csprojtemplate            | 2 +-
 .../before/xUnitTests/xUnitTests.csprojtemplate             | 2 +-
 .../before/xUnitTests/xUnitTests.expected.csprojtemplate    | 1 +
 src/Paket.Core/ProjectFile.fs                               | 6 +++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/integrationtests/scenarios/i001233-props-files/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate b/integrationtests/scenarios/i001233-props-files/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
index 7e7b218ad9..d5e1518dec 100644
--- a/integrationtests/scenarios/i001233-props-files/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
+++ b/integrationtests/scenarios/i001233-props-files/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
@@ -29,6 +29,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5.1'">
       <PropertyGroup>
@@ -68,7 +69,6 @@
     <Compile Include="Class1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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">
diff --git a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.csprojtemplate b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.csprojtemplate
index 7e2f1b1c5f..c1c4ad7076 100644
--- a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.csprojtemplate
+++ b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.csprojtemplate
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -43,7 +44,6 @@
     <None Include="packages.config" />
     <None Include="paket.references" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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">
diff --git a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
index fdcb62af4e..558e47a1a5 100644
--- a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
+++ b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
@@ -29,6 +29,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <PropertyGroup>
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
index e2b35daa21..7cb6d170c6 100644
--- a/src/Paket.Core/ProjectFile.fs
+++ b/src/Paket.Core/ProjectFile.fs
@@ -947,7 +947,11 @@ module ProjectFile =
                 incr j
 
             let k = ref !j
-            while !k < project.ProjectNode.ChildNodes.Count && String.startsWithIgnoreCase  "<PropertyGroup" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) do
+            while !k < project.ProjectNode.ChildNodes.Count &&
+                (String.startsWithIgnoreCase  "<PropertyGroup" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) ||
+                 (String.startsWithIgnoreCase  "<import" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) &&
+                  not (String.containsIgnoreCase "label" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString()) &&
+                       String.containsIgnoreCase "paket" (project.ProjectNode.ChildNodes.[!k].OuterXml.ToString())))) do
                 incr k
 
             let addProps() =

From 17c07bbf35371cb32b22dd1b3a1df861003b6406 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Wed, 30 Mar 2016 10:29:19 +0200
Subject: [PATCH 2/2] Integration Test: fix test which was updated incompletely
 in the parent commit

---
 .../before/xUnitTests/xUnitTests.expected.csprojtemplate         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
index 558e47a1a5..d737034ec4 100644
--- a/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
+++ b/integrationtests/scenarios/i001233-props-fw-files/before/xUnitTests/xUnitTests.expected.csprojtemplate
@@ -51,7 +51,6 @@
     <None Include="packages.config" />
     <None Include="paket.references" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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">