From 8ca82f5fc52efd05aa5a85e8923a444795ab0331 Mon Sep 17 00:00:00 2001
From: Ivan Matantsev <ivmatan@microsoft.com>
Date: Mon, 25 Feb 2019 14:51:11 -0800
Subject: [PATCH 1/4] Remove Ensemble from Microsoft.ML

---
 src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 55e8f69114..837d0659a2 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
 

From 25ac5a72ee627966f123c78dd2765c4bd9bc3eb4 Mon Sep 17 00:00:00 2001
From: Ivan Matantsev <ivmatan@microsoft.com>
Date: Tue, 26 Feb 2019 14:31:06 -0800
Subject: [PATCH 2/4] FastTree and Ensemble packages

---
 Microsoft.ML.sln                                   | 14 ++++++++++++++
 .../Microsoft.ML.Ensemble.nupkgproj                |  5 +++++
 .../Microsoft.ML.Ensemble.symbols.nupkgproj        | 12 ++++++++++++
 .../Microsoft.ML.FastTree.nupkgproj                |  5 +++++
 .../Microsoft.ML.FastTree.symbols.nupkgproj        | 12 ++++++++++++
 .../Microsoft.ML.Ensemble.csproj                   |  1 +
 .../Microsoft.ML.FastTree.csproj                   |  6 +++---
 7 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
 create mode 100644 pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
 create mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
 create mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index bb969fde73..288793d166 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -260,6 +260,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.DataView", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteExecutorConsoleApp", "test\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj", "{5E920CAC-5A28-42FB-936E-49C472130953}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Ensemble", "Microsoft.ML.Ensemble", "{AD7058C9-5608-49A8-BE23-58C33A74EE91}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.nupkgproj = pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.nupkgproj
+		pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.symbols.nupkgproj = pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.symbols.nupkgproj
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.FastTree", "Microsoft.ML.FastTree", "{273823D2-042D-4F98-B7D2-FCC5E74D1586}"
+	ProjectSection(SolutionItems) = preProject
+		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.nupkgproj
+		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1026,6 +1038,8 @@ Global
 		{85D0CAFD-2FE8-496A-88C7-585D35B94243} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{31D38B21-102B-41C0-9E0A-2FE0BF68D123} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{5E920CAC-5A28-42FB-936E-49C472130953} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
+		{AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
+		{273823D2-042D-4F98-B7D2-FCC5E74D1586} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
new file mode 100644
index 0000000000..8e21d77633
--- /dev/null
+++ b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Pack">
+
+  <Import Project="Microsoft.ML.Ensemble.nupkgproj" />
+
+</Project>
diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
new file mode 100644
index 0000000000..67c4a68fea
--- /dev/null
+++ b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>ML.NET component for Ensembles</PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
new file mode 100644
index 0000000000..9f4c5712ff
--- /dev/null
+++ b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
@@ -0,0 +1,5 @@
+<Project DefaultTargets="Pack">
+
+  <Import Project="Microsoft.ML.FastTree.nupkgproj" />
+
+</Project>
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
new file mode 100644
index 0000000000..a0b0d19b4e
--- /dev/null
+++ b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>ML.NET component for FastTree</PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
index 837d0659a2..ddd4557788 100644
--- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
+++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <IncludeInPackage>Microsoft.ML.Ensemble</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 3f4be7a321..9ba56bf8f6 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
-	<DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
+    <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
+    <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

From b40f37599686826be813ab8be95e54e7034dd78f Mon Sep 17 00:00:00 2001
From: Ivan Matantsev <ivmatan@microsoft.com>
Date: Tue, 26 Feb 2019 15:32:54 -0800
Subject: [PATCH 3/4] switch content

---
 .../Microsoft.ML.Ensemble.nupkgproj                | 13 ++++++++++---
 .../Microsoft.ML.Ensemble.symbols.nupkgproj        | 13 ++-----------
 .../Microsoft.ML.FastTree.nupkgproj                | 13 ++++++++++---
 .../Microsoft.ML.FastTree.symbols.nupkgproj        | 14 +++-----------
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
index 8e21d77633..f8b8082047 100644
--- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
+++ b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.nupkgproj
@@ -1,5 +1,12 @@
-<Project DefaultTargets="Pack">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
 
-  <Import Project="Microsoft.ML.Ensemble.nupkgproj" />
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>ML.NET component for Ensembles</PackageDescription>
+  </PropertyGroup>
 
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
index 67c4a68fea..bb48a51cab 100644
--- a/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
+++ b/pkg/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.symbols.nupkgproj
@@ -1,12 +1,3 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for Ensembles</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
+<Project DefaultTargets="Pack">
+  <Import Project="Microsoft.ML.Ensemble.nupkgproj" />
 </Project>
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
index 9f4c5712ff..cd508d0548 100644
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
+++ b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
@@ -1,5 +1,12 @@
-<Project DefaultTargets="Pack">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
 
-  <Import Project="Microsoft.ML.FastTree.nupkgproj" />
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>ML.NET component for FastTree</PackageDescription>
+  </PropertyGroup>
 
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
index a0b0d19b4e..c72abdbef6 100644
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
+++ b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
@@ -1,12 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for FastTree</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
+<Project DefaultTargets="Pack">
+  <Import Project="Microsoft.ML.FastTree.nupkgproj" />
 </Project>
+

From 75f53c6d19ac69d2b45cc5d42561efb95ef88f67 Mon Sep 17 00:00:00 2001
From: Ivan Matantsev <ivmatan@microsoft.com>
Date: Tue, 26 Feb 2019 16:20:48 -0800
Subject: [PATCH 4/4] revert fast tree

---
 Microsoft.ML.sln                                     |  7 -------
 .../Microsoft.ML.FastTree.nupkgproj                  | 12 ------------
 .../Microsoft.ML.FastTree.symbols.nupkgproj          |  4 ----
 .../Microsoft.ML.FastTree.csproj                     |  2 +-
 4 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
 delete mode 100644 pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 288793d166..2d10df0f1a 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -266,12 +266,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Ensemble", "Mi
 		pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.symbols.nupkgproj = pkg\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.symbols.nupkgproj
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.FastTree", "Microsoft.ML.FastTree", "{273823D2-042D-4F98-B7D2-FCC5E74D1586}"
-	ProjectSection(SolutionItems) = preProject
-		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.nupkgproj
-		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1039,7 +1033,6 @@ Global
 		{31D38B21-102B-41C0-9E0A-2FE0BF68D123} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{5E920CAC-5A28-42FB-936E-49C472130953} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
 		{AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
-		{273823D2-042D-4F98-B7D2-FCC5E74D1586} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
deleted file mode 100644
index cd508d0548..0000000000
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.nupkgproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageDescription>ML.NET component for FastTree</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj b/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
deleted file mode 100644
index c72abdbef6..0000000000
--- a/pkg/Microsoft.ML.FastTree/Microsoft.ML.FastTree.symbols.nupkgproj
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project DefaultTargets="Pack">
-  <Import Project="Microsoft.ML.FastTree.nupkgproj" />
-</Project>
-
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 9ba56bf8f6..6bf95bd119 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
+    <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>