From d3e7ed2952cb4017293aaa00dc3d950243855710 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 15:08:44 +0100
Subject: [PATCH 1/2] add build outoftree test

---
 test-msbuild/run-tests.targets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test-msbuild/run-tests.targets b/test-msbuild/run-tests.targets
index 21b010a..27fa7b5 100644
--- a/test-msbuild/run-tests.targets
+++ b/test-msbuild/run-tests.targets
@@ -84,6 +84,19 @@
         <Exec Command="dotnet pack" WorkingDirectory="$(ProjectDirectory)" />
     </Target>
 
+    <Target Name="TestLibraryOutOfTree">
+        <PropertyGroup>
+            <OutOfTreeDirectory>$(MSBuildThisFileDirectory)</OutOfTreeDirectory>
+            <ProjectDirectory>$(MSBuildThisFileDirectory)TestLibrary</ProjectDirectory>
+            <ProjectPath>"$(ProjectDirectory)\TestLibrary.fsproj"</ProjectPath>
+        </PropertyGroup>
+
+        <RemoveDir Directories="$(ProjectDirectory)\bin; $(ProjectDirectory)\obj" />
+        <Exec Command="dotnet restore $(ProjectPath)" WorkingDirectory="$(OutOfTreeDirectory)" />
+        <Exec Command="dotnet build $(ProjectPath)" WorkingDirectory="$(OutOfTreeDirectory)" />
+        <Exec Command="dotnet pack $(ProjectPath)" WorkingDirectory="$(OutOfTreeDirectory)" />
+    </Target>
+
     <Target Name="TestLibraryCrossGen">
         <PropertyGroup>
             <ProjectDirectory>$(MSBuildThisFileDirectory)TestLibraryCrossGen</ProjectDirectory>

From 8e2f2b00bf5c052c05c18628011fb881f5963315 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 15:35:42 +0100
Subject: [PATCH 2/2] add failing test "multiple fsproj in same dir"

---
 .../TestMultipleLibraryInSameDir/Helper.fs    | 12 +++++
 .../TestMultipleLibraryInSameDir/Helper2.fs   | 12 +++++
 .../Test1Library.fsproj                       | 46 +++++++++++++++++++
 .../Test2Library.fsproj                       | 46 +++++++++++++++++++
 test-msbuild/run-tests.targets                | 23 ++++++++++
 5 files changed, 139 insertions(+)
 create mode 100644 test-msbuild/TestMultipleLibraryInSameDir/Helper.fs
 create mode 100644 test-msbuild/TestMultipleLibraryInSameDir/Helper2.fs
 create mode 100644 test-msbuild/TestMultipleLibraryInSameDir/Test1Library.fsproj
 create mode 100644 test-msbuild/TestMultipleLibraryInSameDir/Test2Library.fsproj

diff --git a/test-msbuild/TestMultipleLibraryInSameDir/Helper.fs b/test-msbuild/TestMultipleLibraryInSameDir/Helper.fs
new file mode 100644
index 0000000..a29f6ac
--- /dev/null
+++ b/test-msbuild/TestMultipleLibraryInSameDir/Helper.fs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace TestLibrary
+
+open Lib
+
+type Helper() =
+
+    static member GetMessage () = Lib.message ()
+
+    static member SayHi () = Lib.sayHi ()
diff --git a/test-msbuild/TestMultipleLibraryInSameDir/Helper2.fs b/test-msbuild/TestMultipleLibraryInSameDir/Helper2.fs
new file mode 100644
index 0000000..6d374f7
--- /dev/null
+++ b/test-msbuild/TestMultipleLibraryInSameDir/Helper2.fs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+module Lib
+
+open System
+
+let message () =
+    "This string came from the test library!"
+
+let sayHi () =
+    Console.WriteLine("Hello there!")
diff --git a/test-msbuild/TestMultipleLibraryInSameDir/Test1Library.fsproj b/test-msbuild/TestMultipleLibraryInSameDir/Test1Library.fsproj
new file mode 100644
index 0000000..86f57cf
--- /dev/null
+++ b/test-msbuild/TestMultipleLibraryInSameDir/Test1Library.fsproj
@@ -0,0 +1,46 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <Import Project="..\TestSuite.props" />
+  
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>1.0.0-preview3</Version>
+    <Authors>Enrico Sada</Authors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Helper2.fs" />
+    <Compile Include="Helper.fs" />
+    <EmbeddedResource Include="**\*.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library">
+      <Version>1.6.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.FSharp.Core.netcore">
+      <Version>$(MicrosoftFSharpCorenetcoreVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Sdk">
+      <Version>$(MicrosoftNETSdkVersion)</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FSharp.NET.Sdk">
+      <Version>$(FSharpNETSdkVersion)</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-compile-fsc">
+      <Version>1.0.0-preview2-020000</Version>
+    </DotNetCliToolReference>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+
+</Project>
diff --git a/test-msbuild/TestMultipleLibraryInSameDir/Test2Library.fsproj b/test-msbuild/TestMultipleLibraryInSameDir/Test2Library.fsproj
new file mode 100644
index 0000000..86f57cf
--- /dev/null
+++ b/test-msbuild/TestMultipleLibraryInSameDir/Test2Library.fsproj
@@ -0,0 +1,46 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+
+  <Import Project="..\TestSuite.props" />
+  
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>1.0.0-preview3</Version>
+    <Authors>Enrico Sada</Authors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Helper2.fs" />
+    <Compile Include="Helper.fs" />
+    <EmbeddedResource Include="**\*.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library">
+      <Version>1.6.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.FSharp.Core.netcore">
+      <Version>$(MicrosoftFSharpCorenetcoreVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Sdk">
+      <Version>$(MicrosoftNETSdkVersion)</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FSharp.NET.Sdk">
+      <Version>$(FSharpNETSdkVersion)</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-compile-fsc">
+      <Version>1.0.0-preview2-020000</Version>
+    </DotNetCliToolReference>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+
+</Project>
diff --git a/test-msbuild/run-tests.targets b/test-msbuild/run-tests.targets
index 27fa7b5..c7c93b1 100644
--- a/test-msbuild/run-tests.targets
+++ b/test-msbuild/run-tests.targets
@@ -97,6 +97,23 @@
         <Exec Command="dotnet pack $(ProjectPath)" WorkingDirectory="$(OutOfTreeDirectory)" />
     </Target>
 
+
+    <Target Name="TestMultipleLibraryInSameDir">
+        <PropertyGroup>
+            <ProjectDirectory>$(MSBuildThisFileDirectory)TestMultipleLibraryInSameDir</ProjectDirectory>
+            <Project1FileName>Test1Library.fsproj</Project1FileName>
+            <Project2FileName>Test2Library.fsproj</Project2FileName>
+        </PropertyGroup>
+
+        <RemoveDir Directories="$(ProjectDirectory)\bin; $(ProjectDirectory)\obj" />
+        <Exec Command="dotnet restore $(Project1FileName)" WorkingDirectory="$(ProjectDirectory)" />
+        <Exec Command="dotnet build $(Project1FileName)" WorkingDirectory="$(ProjectDirectory)" />
+        <Exec Command="dotnet pack $(Project1FileName)" WorkingDirectory="$(ProjectDirectory)" />
+        <Exec Command="dotnet restore $(Project2FileName)" WorkingDirectory="$(ProjectDirectory)" />
+        <Exec Command="dotnet build $(Project2FileName)" WorkingDirectory="$(ProjectDirectory)" />
+        <Exec Command="dotnet pack $(Project2FileName)" WorkingDirectory="$(ProjectDirectory)" />
+    </Target>
+
     <Target Name="TestLibraryCrossGen">
         <PropertyGroup>
             <ProjectDirectory>$(MSBuildThisFileDirectory)TestLibraryCrossGen</ProjectDirectory>
@@ -183,12 +200,18 @@
         <AllTests Include="SmokeTestExamplesPreview3" />
     </ItemGroup>
 
+    <ItemGroup>
+        <FailingTests Include="TestMultipleLibraryInSameDir" />
+    </ItemGroup>
+
     <Target Name="PrepareTests">
         <MakeDir Directories="$(ProjectDirectory)src\FSharp.NET.Sdk\bin\Debug" />
     </Target>
 
     <Target Name="Test" DependsOnTargets="PrepareTests; @(AllTests)" />
 
+    <Target Name="FailingTest" DependsOnTargets="PrepareTests; @(FailingTests)" />
+
     <Target Name="TestSuiteInfo">
         <ItemGroup>
             <TestLI Include="@(AllTests -> '- %(Identity)%0A')" />