From d4bcc1bf98c94ffaec0d2fae82c17d3ba4e2e5a0 Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sandy@xamarin.com>
Date: Wed, 23 May 2018 14:06:13 -0700
Subject: [PATCH 1/3] Prevent annoying error in VSmac

Work around https://github.com/mono/monodevelop/issues/3859
---
 test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
index 59c6d8f6c6..203a4b1ebb 100644
--- a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
+++ b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />

From a3878292c5ebbc8cac82b514978d851276b3e9bd Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sandy@xamarin.com>
Date: Thu, 24 May 2018 08:03:56 -0700
Subject: [PATCH 2/3] Remove trailing whitespace

---
 test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj b/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj
index 735b6e1dd8..84ede33fa4 100644
--- a/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj
+++ b/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <LangVersion>7.2</LangVersion>    
+    <LangVersion>7.2</LangVersion>
     <StartupObject>Microsoft.ML.Benchmarks.Program</StartupObject>
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>

From 28ccf9eb49d4499d50bf0d6d112b740960f42f7c Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sandy@xamarin.com>
Date: Thu, 24 May 2018 08:04:27 -0700
Subject: [PATCH 3/3] Explicitly set TargetFramework on all test projects

And remove the property from Directory.Build.props for now.
---
 test/Directory.Build.props                                       | 1 -
 test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj      | 1 +
 .../Microsoft.ML.InferenceTesting.csproj                         | 1 +
 .../Microsoft.ML.Predictor.Tests.csproj                          | 1 +
 .../Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj | 1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 3544f879fd..d5a86e7fbd 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,7 +2,6 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
     <VSTestLogger>trx</VSTestLogger>
     <VSTestResultsDirectory>$(OutputPath)</VSTestResultsDirectory>
     <AssemblyOriginatorKeyFile>$(ToolsDir)Test.snk</AssemblyOriginatorKeyFile>
diff --git a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
index 1660eefce2..9f38858721 100644
--- a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
+++ b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
   
diff --git a/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj b/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj
index 4cfd1bef82..f741a32b86 100644
--- a/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj
+++ b/test/Microsoft.ML.InferenceTesting/Microsoft.ML.InferenceTesting.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
diff --git a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
index 30b51e8afb..2329491e08 100644
--- a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
+++ b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
index 155b06ce62..d9cf8a2f29 100644
--- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
+++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>