addressing review comments

artidoro · artidoro · commit 64290293c463 · 2019-04-30T15:15:41.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -38,4 +38,8 @@
     </AdditionalFiles>
   </ItemGroup>
 
+  <PropertyGroup>
+    <RunApiCompat Condition="'$(RunApiCompat)' == ''">$(IsStableProject)</RunApiCompat>
+  </PropertyGroup>
+
 </Project>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
