From 449c8df11e77993b24d95fd2713a1bf7a6089918 Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Tue, 30 Apr 2019 13:21:37 -0700
Subject: [PATCH 1/7] introduce API Compat tool in ML.NET

---
 Directory.Build.props                         | 10 ++++++
 Microsoft.ML.sln                              | 15 +++++++++
 src/Directory.Build.targets                   | 25 +++++++++++++++
 .../Microsoft.ML.Analyzer.csproj              |  3 +-
 .../Microsoft.ML.Core.csproj                  |  2 +-
 .../Microsoft.ML.CpuMath.csproj               |  1 +
 .../Microsoft.ML.Data.csproj                  |  1 +
 .../Microsoft.ML.DataView.csproj              |  2 +-
 .../Microsoft.ML.FastTree.csproj              |  1 +
 .../Microsoft.ML.ImageAnalytics.csproj        |  1 +
 .../Microsoft.ML.KMeansClustering.csproj      |  3 +-
 .../Microsoft.ML.LightGbm.csproj              |  2 +-
 .../Microsoft.ML.Mkl.Components.csproj        |  2 +-
 src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj  |  3 +-
 .../Microsoft.ML.StandardTrainers.csproj      |  1 +
 .../Microsoft.ML.Transforms.csproj            |  1 +
 .../Microsoft.ML.StableApi.csproj             | 31 +++++++++++++++++++
 17 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj

diff --git a/Directory.Build.props b/Directory.Build.props
index e4d0adac46..f17547cc75 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -124,4 +124,14 @@
   <PropertyGroup>
     <CustomAfterMicrosoftCommonTargets>$(RepoRoot)build\AfterCommonTargets.targets</CustomAfterMicrosoftCommonTargets>
   </PropertyGroup>
+  
+  <!-- API Compat -->
+  <PropertyGroup>
+    <!-- only validate that the current implementation is compatible
+         with the old one, not vice-versa (since latest may have new
+         API missing from old) -->
+    <RunApiCompatForSrc>true</RunApiCompatForSrc>
+    <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
+    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
+  </PropertyGroup>
 </Project>
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 6b0b880210..b0b8f8c123 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -274,6 +274,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.FastTree", "Mi
 		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StableApi", "tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj", "{C1884169-7330-42DF-B401-9427C6EFB092}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -968,6 +970,18 @@ Global
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1055,6 +1069,7 @@ Global
 		{AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{B1B3F284-FA3D-4D76-A712-FF04495D244B} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
+		{C1884169-7330-42DF-B401-9427C6EFB092} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 2c6ae691d4..3f8ddbbd61 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -26,4 +26,29 @@
 
   </Target>
 
+  <!-- API Compat -->
+  <PropertyGroup Condition="'$(RunApiCompat)' == 'true'">
+    <!-- resolve contract for APICompat as part of resolve references -->
+    <ResolveReferencesDependsOn>
+      $(ResolveReferencesDependsOn);
+      ResolveMatchingContract
+    </ResolveReferencesDependsOn>
+    
+    <StabelApiProject>$(RepoRoot)tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj</StabelApiProject>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(RunApiCompat)' == 'true'">
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" 
+                      Version="$(MicrosoftDotNetApiCompatPackageVersion)" 
+                      PrivateAssets="All" />
+  </ItemGroup>
+  
+  <Target Name="ResolveMatchingContract">
+    <MSBuild Projects="$(StabelApiProject)"
+             Targets="GetContract"
+             Properties="ContractName=$(AssemblyName);TargetFramework=$(TargetFramework)">
+      <Output TaskParameter="TargetOutputs" ItemName="ResolvedMatchingContract"/>
+    </MSBuild>
+  </Target>
+
 </Project>
diff --git a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
index b14b62f354..089bb38958 100644
--- a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
+++ b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
index cc342e96e1..81a5ddf656 100644
--- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
+++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -6,11 +6,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
     <RootNamespace>Microsoft.ML</RootNamespace>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.DataView\Microsoft.ML.DataView.csproj" />
-    
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 938b2b2d5a..1650c8d6f8 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -7,6 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
     <LangVersion>7.3</LangVersion>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
index f3e7d96b59..6a677319be 100644
--- a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
+++ b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
@@ -5,6 +5,7 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index 718deb356e..8bfa381bef 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,5 +14,4 @@
   <ItemGroup>
     <Compile Include="..\Microsoft.ML.Core\Utilities\ArrayUtils.cs" />
   </ItemGroup>
-  
 </Project>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 9ba56bf8f6..7b8218969d 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -5,6 +5,7 @@
     <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index db04a98c57..71c454f906 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.ImageAnalytics</IncludeInPackage>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
index f7e24f9457..0719748742 100644
--- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
+++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 46e628fd26..27b0ddb2a9 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 907b75e11f..9b91466c28 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
index f7e24f9457..0719748742 100644
--- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
+++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
index f3b20954de..2d04fdc00c 100644
--- a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
+++ b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
index 4aa4a4eb79..229b44f5bf 100644
--- a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
+++ b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
@@ -5,6 +5,7 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
new file mode 100644
index 0000000000..a463c8f0a8
--- /dev/null
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <!-- needs to contain all frameworks which src projects wish to restore -->
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ML" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.0.0-preview-27625-16"/>
+  </ItemGroup>
+
+  <!-- The purpose of this target is to return a path from a referenced
+       package / project -->
+  <Target Name="GetContract"
+          DependsOnTargets="ResolveReferences"
+          Returns="@(_contractReferencePath)">
+    <Error Condition="'$(ContractName)' == ''" Text="ContractName must be specified" />
+    <ItemGroup>
+      <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
+    </ItemGroup>
+    <Error Condition="'$(ContractName)' == ''" Text="Could not locate $(ContractName)" />
+  </Target>
+
+</Project>

From f0ebe3159dea38c67b1291cf3d1442dbd8bfca69 Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Tue, 30 Apr 2019 15:15:41 -0700
Subject: [PATCH 2/7] addressing review comments

---
 Directory.Build.props                          |  1 -
 Microsoft.ML.sln                               |  1 -
 build/Dependencies.props                       |  1 +
 src/Directory.Build.props                      |  4 +++-
 src/Directory.Build.targets                    |  4 ++--
 .../Microsoft.ML.Analyzer.csproj               |  3 +--
 src/Microsoft.ML.Core/Microsoft.ML.Core.csproj |  2 +-
 .../Microsoft.ML.CpuMath.csproj                |  2 +-
 src/Microsoft.ML.Data/Microsoft.ML.Data.csproj |  2 +-
 .../Microsoft.ML.DataView.csproj               |  2 +-
 .../Microsoft.ML.FastTree.csproj               |  2 +-
 .../Microsoft.ML.ImageAnalytics.csproj         |  2 +-
 .../Microsoft.ML.KMeansClustering.csproj       |  2 +-
 .../Microsoft.ML.LightGbm.csproj               |  2 +-
 .../Microsoft.ML.Mkl.Components.csproj         |  2 +-
 src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj   |  2 +-
 .../Microsoft.ML.StandardTrainers.csproj       |  2 +-
 .../Microsoft.ML.Transforms.csproj             |  2 +-
 .../Microsoft.ML.StableApi.csproj              | 18 +++++++++---------
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f17547cc75..a91e56eb31 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -132,6 +132,5 @@
          API missing from old) -->
     <RunApiCompatForSrc>true</RunApiCompatForSrc>
     <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
-    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index b0b8f8c123..b2c979e366 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -971,7 +971,6 @@ Global
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
 		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
 		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
diff --git a/build/Dependencies.props b/build/Dependencies.props
index 17f25a17a3..963fecead7 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -36,6 +36,7 @@
     <CodecovVersion>1.1.1</CodecovVersion>
     <CoverletVersion>2.6.0</CoverletVersion>
     <ReportGeneratorVersion>4.0.9</ReportGeneratorVersion>
+    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
   </PropertyGroup>
 
   <!-- Test-only Dependencies -->
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index be6d1d53bc..8564a9334c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,6 +19,8 @@
     <PackageRid Condition="'$(OS)' != 'Windows_NT'">linux</PackageRid>
     <PackageRid Condition="$([MSBuild]::IsOSPlatform('osx'))">osx</PackageRid>
     <PackageRid>$(PackageRid)-$(TargetArchitecture)</PackageRid>
+
+    <RunApiCompat Condition="'$(RunApiCompat)' == ''">$(IsStableProject)</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,5 +39,5 @@
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
-
+  
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 3f8ddbbd61..b339fbe2b0 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -34,7 +34,7 @@
       ResolveMatchingContract
     </ResolveReferencesDependsOn>
     
-    <StabelApiProject>$(RepoRoot)tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj</StabelApiProject>
+    <StableApiProject>$(RepoRoot)tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj</StableApiProject>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(RunApiCompat)' == 'true'">
@@ -44,7 +44,7 @@
   </ItemGroup>
   
   <Target Name="ResolveMatchingContract">
-    <MSBuild Projects="$(StabelApiProject)"
+    <MSBuild Projects="$(StableApiProject)"
              Targets="GetContract"
              Properties="ContractName=$(AssemblyName);TargetFramework=$(TargetFramework)">
       <Output TaskParameter="TargetOutputs" ItemName="ResolvedMatchingContract"/>
diff --git a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
index 089bb38958..b14b62f354 100644
--- a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
+++ b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard1.3</TargetFramework>
     <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
-    <RunApiCompat>true</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
index 81a5ddf656..8858dced3f 100644
--- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
+++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -6,7 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
     <RootNamespace>Microsoft.ML</RootNamespace>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 1650c8d6f8..6c748b9c12 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -7,7 +7,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
     <LangVersion>7.3</LangVersion>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
index 6a677319be..c40fbacaf8 100644
--- a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
+++ b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
@@ -5,7 +5,7 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index 8bfa381bef..d0b6d89840 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 7b8218969d..121a261288 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -5,7 +5,7 @@
     <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index 71c454f906..a3415f977d 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.ImageAnalytics</IncludeInPackage>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
index 0719748742..a4246c33cd 100644
--- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
+++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 27b0ddb2a9..12f5fa765d 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 9b91466c28..7af08f8c2c 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
index 0719748742..a4246c33cd 100644
--- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
+++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
index 2d04fdc00c..a14883a5c2 100644
--- a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
+++ b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
index 229b44f5bf..8696495636 100644
--- a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
+++ b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
@@ -5,7 +5,7 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunApiCompat>true</RunApiCompat>
+    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index a463c8f0a8..d4a9c5f965 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ML" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.DataView" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview-27625-16"/>
-    <PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.0.0-preview-27625-16"/>
+    <PackageReference Include="Microsoft.ML" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.0.0-preview-27630-5"/>
   </ItemGroup>
 
   <!-- The purpose of this target is to return a path from a referenced
@@ -25,7 +25,7 @@
     <ItemGroup>
       <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
     </ItemGroup>
-    <Error Condition="'$(ContractName)' == ''" Text="Could not locate $(ContractName)" />
+    <Error Condition="'@(_contractReferencePath)' == ''" Text="Could not locate $(ContractName)" />
   </Target>
 
 </Project>

From 4e93cf3f2451342d3ad5a236ffd76fb4d9f38a3f Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Tue, 30 Apr 2019 16:22:18 -0700
Subject: [PATCH 3/7] remove redundant IsStableProject definition

---
 src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj         | 3 +++
 src/Microsoft.ML.Core/Microsoft.ML.Core.csproj                 | 2 +-
 src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj           | 1 -
 src/Microsoft.ML.Data/Microsoft.ML.Data.csproj                 | 1 -
 src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj         | 2 +-
 src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj         | 3 +--
 .../Microsoft.ML.ImageAnalytics.csproj                         | 1 -
 .../Microsoft.ML.KMeansClustering.csproj                       | 1 -
 src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj         | 2 +-
 .../Microsoft.ML.Mkl.Components.csproj                         | 2 +-
 src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj                   | 1 -
 .../Microsoft.ML.StandardTrainers.csproj                       | 1 -
 src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj     | 1 -
 13 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
index b14b62f354..dcc1c1dc83 100644
--- a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
+++ b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
@@ -3,6 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
+
+    <!-- No public surface in this assembly -->
+    <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
index 8858dced3f..c3ceb6b5c8 100644
--- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
+++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -6,11 +6,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
     <RootNamespace>Microsoft.ML</RootNamespace>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.DataView\Microsoft.ML.DataView.csproj" />
+
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
index 6c748b9c12..938b2b2d5a 100644
--- a/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
+++ b/src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj
@@ -7,7 +7,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>
     <LangVersion>7.3</LangVersion>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
index c40fbacaf8..f3e7d96b59 100644
--- a/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
+++ b/src/Microsoft.ML.Data/Microsoft.ML.Data.csproj
@@ -5,7 +5,6 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>CORECLR</DefineConstants>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index d0b6d89840..adfad08e9b 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,4 +13,5 @@
   <ItemGroup>
     <Compile Include="..\Microsoft.ML.Core\Utilities\ArrayUtils.cs" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index 121a261288..f954a0b1b9 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -5,7 +5,6 @@
     <IncludeInPackage>Microsoft.ML.FastTree</IncludeInPackage>
     <DefineConstants>$(DefineConstants);USE_FASTTREENATIVE;NO_STORE;CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,5 +12,5 @@
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
index a3415f977d..db04a98c57 100644
--- a/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
+++ b/src/Microsoft.ML.ImageAnalytics/Microsoft.ML.ImageAnalytics.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.ImageAnalytics</IncludeInPackage>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
index a4246c33cd..eb905095b8 100644
--- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
+++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 12f5fa765d..6a25945385 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 7af08f8c2c..49267a9e60 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
index a4246c33cd..eb905095b8 100644
--- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
+++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
index a14883a5c2..f3b20954de 100644
--- a/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
+++ b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
index 8696495636..4aa4a4eb79 100644
--- a/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
+++ b/src/Microsoft.ML.Transforms/Microsoft.ML.Transforms.csproj
@@ -5,7 +5,6 @@
     <IncludeInPackage>Microsoft.ML</IncludeInPackage>
     <DefineConstants>CORECLR</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <IsStableProject>true</IsStableProject>
   </PropertyGroup>
 
   <ItemGroup>

From 1ba081c96659c908b0639295b5ccd2bfc0b21816 Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Thu, 2 May 2019 17:35:14 -0700
Subject: [PATCH 4/7] review comments

---
 Directory.Build.props                         |  9 ------
 Microsoft.ML.sln                              | 31 ++++++++++---------
 src/Directory.Build.props                     | 12 +++++--
 src/Directory.Build.targets                   | 11 ++++---
 .../Microsoft.ML.Analyzer.csproj              |  3 --
 .../Microsoft.ML.Core.csproj                  |  2 +-
 .../Microsoft.ML.DataView.csproj              |  2 +-
 .../Microsoft.ML.FastTree.csproj              |  2 +-
 .../Microsoft.ML.KMeansClustering.csproj      |  2 +-
 .../Microsoft.ML.LightGbm.csproj              |  2 +-
 .../Microsoft.ML.Mkl.Components.csproj        |  2 +-
 src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj  |  2 +-
 .../Microsoft.ML.StableApi.csproj             | 22 ++++++-------
 13 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a91e56eb31..e4d0adac46 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -124,13 +124,4 @@
   <PropertyGroup>
     <CustomAfterMicrosoftCommonTargets>$(RepoRoot)build\AfterCommonTargets.targets</CustomAfterMicrosoftCommonTargets>
   </PropertyGroup>
-  
-  <!-- API Compat -->
-  <PropertyGroup>
-    <!-- only validate that the current implementation is compatible
-         with the old one, not vice-versa (since latest may have new
-         API missing from old) -->
-    <RunApiCompatForSrc>true</RunApiCompatForSrc>
-    <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
-  </PropertyGroup>
 </Project>
diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index b2c979e366..7c30dc03fe 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Core", "src\Microsoft.ML.Core\Microsoft.ML.Core.csproj", "{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}"
 EndProject
@@ -274,7 +274,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.FastTree", "Mi
 		pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj = pkg\Microsoft.ML.FastTree\Microsoft.ML.FastTree.symbols.nupkgproj
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StableApi", "tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj", "{C1884169-7330-42DF-B401-9427C6EFB092}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StableApi", "tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj", "{F308DC6B-7E59-40D7-A581-834E8CD99CFE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -970,17 +970,18 @@ Global
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
-		{C1884169-7330-42DF-B401-9427C6EFB092}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1068,7 +1069,7 @@ Global
 		{AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
 		{E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
 		{B1B3F284-FA3D-4D76-A712-FF04495D244B} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
-		{C1884169-7330-42DF-B401-9427C6EFB092} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
+		{F308DC6B-7E59-40D7-A581-834E8CD99CFE} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8564a9334c..4af8b879a4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,10 +19,19 @@
     <PackageRid Condition="'$(OS)' != 'Windows_NT'">linux</PackageRid>
     <PackageRid Condition="$([MSBuild]::IsOSPlatform('osx'))">osx</PackageRid>
     <PackageRid>$(PackageRid)-$(TargetArchitecture)</PackageRid>
+  </PropertyGroup>
 
+<!-- API Compat -->
+  <PropertyGroup>
     <RunApiCompat Condition="'$(RunApiCompat)' == ''">$(IsStableProject)</RunApiCompat>
-  </PropertyGroup>
 
+    <!-- only validate that the current implementation is compatible
+         with the old one, not vice-versa (since latest may have new
+         API missing from old) -->
+    <RunApiCompatForSrc>true</RunApiCompatForSrc>
+    <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
+  </PropertyGroup>
+  
   <ItemGroup>
     <ProjectReference
       Condition="'$(UseMLCodeAnalyzer)' != 'false' and '$(MSBuildProjectExtension)' == '.csproj'"
@@ -39,5 +48,4 @@
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
-  
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index b339fbe2b0..28c54362df 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -33,22 +33,25 @@
       $(ResolveReferencesDependsOn);
       ResolveMatchingContract
     </ResolveReferencesDependsOn>
-    
+
     <StableApiProject>$(RepoRoot)tools-local\Microsoft.ML.StableApi\Microsoft.ML.StableApi.csproj</StableApiProject>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(RunApiCompat)' == 'true'">
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" 
-                      Version="$(MicrosoftDotNetApiCompatPackageVersion)" 
+    <PackageReference Include="Microsoft.DotNet.ApiCompat"
+                      Version="$(MicrosoftDotNetApiCompatPackageVersion)"
                       PrivateAssets="All" />
   </ItemGroup>
-  
+
   <Target Name="ResolveMatchingContract">
     <MSBuild Projects="$(StableApiProject)"
              Targets="GetContract"
              Properties="ContractName=$(AssemblyName);TargetFramework=$(TargetFramework)">
       <Output TaskParameter="TargetOutputs" ItemName="ResolvedMatchingContract"/>
     </MSBuild>
+    <PropertyGroup>
+      <ContractOutputPath>%(ResolvedMatchingContract.DependencyPaths)</ContractOutputPath>
+    </PropertyGroup>
   </Target>
 
 </Project>
diff --git a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
index dcc1c1dc83..b14b62f354 100644
--- a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
+++ b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
-
-    <!-- No public surface in this assembly -->
-    <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
index c3ceb6b5c8..cc342e96e1 100644
--- a/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
+++ b/src/Microsoft.ML.Core/Microsoft.ML.Core.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.DataView\Microsoft.ML.DataView.csproj" />
-
+    
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
diff --git a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
index adfad08e9b..718deb356e 100644
--- a/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
+++ b/src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj
@@ -13,5 +13,5 @@
   <ItemGroup>
     <Compile Include="..\Microsoft.ML.Core\Utilities\ArrayUtils.cs" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
index f954a0b1b9..9ba56bf8f6 100644
--- a/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
+++ b/src/Microsoft.ML.FastTree/Microsoft.ML.FastTree.csproj
@@ -12,5 +12,5 @@
     <ProjectReference Include="..\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
index eb905095b8..f7e24f9457 100644
--- a/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
+++ b/src/Microsoft.ML.KMeansClustering/Microsoft.ML.KMeansClustering.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
index 6a25945385..46e628fd26 100644
--- a/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
+++ b/src/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.csproj
@@ -5,7 +5,7 @@
     <IncludeInPackage>Microsoft.ML.LightGbm</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
index 49267a9e60..907b75e11f 100644
--- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
+++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj
@@ -5,7 +5,7 @@
     <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
diff --git a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
index eb905095b8..f7e24f9457 100644
--- a/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
+++ b/src/Microsoft.ML.PCA/Microsoft.ML.PCA.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index d4a9c5f965..ff77c746ee 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -6,24 +6,24 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ML" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.DataView" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview-27630-5"/>
-    <PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.0.0-preview-27630-5"/>
+    <PackageReference Include="Microsoft.ML" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.DataView" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.CpuMath" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
   </ItemGroup>
 
   <!-- The purpose of this target is to return a path from a referenced
        package / project -->
-  <Target Name="GetContract"
-          DependsOnTargets="ResolveReferences"
-          Returns="@(_contractReferencePath)">
+  <Target Name="GetContract" DependsOnTargets="ResolveReferences" Returns="@(_contractReferencePath)">
     <Error Condition="'$(ContractName)' == ''" Text="ContractName must be specified" />
     <ItemGroup>
       <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
+      <_allReferenceDirectories Include="%(ReferencePath.RootDir)%(ReferencePath.Directory)" />
+      <_contractReferencePath Include="@(ReferencePath)" Condition="'%(FileName)' == '$(ContractName)'" />
+      <_contractReferencePath DependencyPaths="@(_allReferenceDirectories)" />
     </ItemGroup>
     <Error Condition="'@(_contractReferencePath)' == ''" Text="Could not locate $(ContractName)" />
   </Target>

From c113ef3baba62f26103980301d159a0a39eb11e1 Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Thu, 2 May 2019 18:04:00 -0700
Subject: [PATCH 5/7] target framework 3.0

---
 .../Microsoft.ML.StableApi.csproj                | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
index ff77c746ee..e1b569a026 100644
--- a/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
+++ b/tools-local/Microsoft.ML.StableApi/Microsoft.ML.StableApi.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <!-- needs to contain all frameworks which src projects wish to restore -->
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework Condition="'$(UseIntrinsics)' != 'true'">netstandard2.0</TargetFramework>
+    <TargetFrameworks Condition="'$(UseIntrinsics)' == 'true'">netstandard2.0;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,4 +29,17 @@
     <Error Condition="'@(_contractReferencePath)' == ''" Text="Could not locate $(ContractName)" />
   </Target>
 
+  <Target Name="Build">
+    <!-- This will override the default Build target. -->
+  </Target>
+  <Target Name="Rebuild">
+    <!-- This will override the default Rebuild target. -->
+  </Target>
+  <Target Name="BuildAndTest">
+    <!-- This will override the default BuildAndTest target. -->
+  </Target>
+  <Target Name="RebuildAndTest">
+    <!-- This will override the default RebuildAndTest target. -->
+  </Target>
+
 </Project>

From 455ab08fd743402dc052a1fd493a54403790a94d Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Thu, 2 May 2019 21:34:26 -0700
Subject: [PATCH 6/7] fix dotnet not found

---
 src/Directory.Build.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4af8b879a4..f7ef5ae42b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -24,6 +24,8 @@
 <!-- API Compat -->
   <PropertyGroup>
     <RunApiCompat Condition="'$(RunApiCompat)' == ''">$(IsStableProject)</RunApiCompat>
+    <ToolHostCmd Condition="'$(OS)' != 'Windows_NT'">$(ToolsDir)dotnetcli/dotnet</ToolHostCmd>
+
 
     <!-- only validate that the current implementation is compatible
          with the old one, not vice-versa (since latest may have new

From b9d2fac72f4b161cdadd9e7c7b05a3b2670f2162 Mon Sep 17 00:00:00 2001
From: Artidoro Pagnoni <arpagnon@microsoft.com>
Date: Fri, 3 May 2019 15:56:52 -0700
Subject: [PATCH 7/7] revert solution file change to version

---
 Microsoft.ML.sln | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln
index 7c30dc03fe..c9aae84314 100644
--- a/Microsoft.ML.sln
+++ b/Microsoft.ML.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Core", "src\Microsoft.ML.Core\Microsoft.ML.Core.csproj", "{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A}"
 EndProject