Create failing test for #1262

fsprojects · Nov 27, 2015 · 106215a · 106215a
1 parent 79f407f
commit 106215a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/Paket.Core/ProjectFile.fs b/src/Paket.Core/ProjectFile.fs
@@ -436,7 +436,7 @@ type ProjectFile =
             if not !hasHintPath then
                 yield node.Attributes.["Include"].InnerText.Split(',').[0] ]
 
-    member this.DeletePaketNodes(name) =    
+    member this.DeletePaketNodes(name) =
         let nodesToDelete = this.FindPaketNodes(name)
         if nodesToDelete |> Seq.isEmpty |> not then
             verbosefn "    - Deleting Paket %s nodes" name
@@ -533,7 +533,7 @@ type ProjectFile =
         if nodesToDelete <> [] then
             verbosefn "    - Deleting custom projects nodes for %O" model.PackageName
 
-        for node in nodesToDelete do            
+        for node in nodesToDelete do
             node.ParentNode.RemoveChild(node) |> ignore
 
     member private this.GenerateAnalyzersXml(model:InstallModel) =
@@ -984,7 +984,7 @@ type ProjectFile =
 
         this.GetPropertyWithDefaults "OutputPath" startingData
         |> function
-            | None -> failwithf "Unable to find %s output path node in file %s" buildConfiguration this.FileName
+            | None -> failwithf "Unable to find %s output path node in file %s." buildConfiguration this.FileName
             | Some s -> s.TrimEnd [|'\\'|] |> normalizePath
 
     member this.GetAssemblyName () =

diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -278,6 +278,9 @@
     <None Include="ProjectFile\TestData\FSharp.Core.Fluent-3.1.fsprojtest">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="ProjectFile\TestData\ReleasePath.csprojtest">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>    
     <Compile Include="ProjectFile\ConditionSpecs.fs" />
     <Compile Include="ProjectFile\TargetFrameworkSpecs.fs" />
     <Compile Include="ProjectFile\FileBuildActionSpecs.fs" />

diff --git a/tests/Paket.Tests/ProjectFile/OutputSpecs.fs b/tests/Paket.Tests/ProjectFile/OutputSpecs.fs
@@ -38,6 +38,13 @@ let ``should detect output path for proj file``
     ProjectFile.TryLoad(sprintf "./ProjectFile/TestData/%s.fsprojtest" project).Value.GetOutputDirectory configuration
     |> shouldEqual (System.IO.Path.Combine(@"bin", configuration) |> normalizePath)
 
+[<Test>]
+let ``should detect output path for csproj file``() =
+    ProjectFile.TryLoad("./ProjectFile/TestData/ReleasePath.csprojtest").Value.GetOutputDirectory("Release")
+    |> shouldEqual ("bin" |> normalizePath)
+    ()
+
+
 [<Test>]
 let ``should detect framework profile for ProjectWithConditions file`` () =
     ProjectFile.TryLoad("./ProjectFile/TestData/ProjectWithConditions.fsprojtest").Value.GetTargetProfile()

diff --git a/tests/Paket.Tests/ProjectFile/TestData/ReleasePath.csprojtest b/tests/Paket.Tests/ProjectFile/TestData/ReleasePath.csprojtest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\build\bin\dialer\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>