React to ApiCompat and GenAPI cmd changes

Commit migrated from https://github.com/dotnet/corefx/commit/bffbb115f0c02051836ca72790b85d3a2c8aa71f

diff --git a/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj b/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
index b53eb98..7465b69 100644 (file)
--- a/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
+++ b/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
@@ -70,9 +70,6 @@
   </Target>
 
   <Target Name="RunApiCompat" DependsOnTargets="BuildDependenciesProject">
-    <PropertyGroup>
-      <ApiCompatCmd>$(ToolHostCmd) "$(ToolsDir)ApiCompat.exe"</ApiCompatCmd>
-    </PropertyGroup>
 
     <!-- Exclude Roslyn assemblies as they don't live in our packages any longer -->
     <ItemGroup>
@@ -89,37 +86,37 @@
     <MakeDir Directories="$(IntermediateOutputPath)" />
 
     <!-- Microsoft.NETCore.App Ref vs. runtime packages -->
-    <Exec Command="$(ApiCompatCmd) &quot;$(SharedFrameworkValidationRefPath)&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkValidationRuntimePath)&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(SharedFrameworkValidationRefPath)&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkValidationRuntimePath)&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />
     
     <!-- Netstandard.Library vs. Microsoft.NETCore.App Ref -->
-    <Exec Command="$(ApiCompatCmd) &quot;$(NetStandardRefPath)/netstandard.dll&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkValidationRefPath)&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(NetStandardRefPath)/netstandard.dll&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkValidationRefPath)&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />
 
     <!-- Last shipped Microsoft.NETCore.App Ref vs. current Microsoft.NETCore.App Ref -->
-    <Exec Command="$(ApiCompatCmd) &quot;$(RefRootPath)SharedFrameworkValidation.LKG&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkValidationRefPath)&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(RefRootPath)SharedFrameworkValidation.LKG&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkValidationRefPath)&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />
 
     <!-- Last shipped runtime packages vs current runtime packages -->
-    <Exec Command="$(ApiCompatCmd) &quot;@(_SharedFrameworkLKGAssemblies)&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkValidationRuntimePath)&quot; -baseline:&quot;$(MSBuildThisFileDirectory)ApiCompatBaseline.LKGRuntime.CurrentRuntime.txt&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;@(_SharedFrameworkLKGAssemblies)&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkValidationRuntimePath)&quot; --baseline &quot;$(MSBuildThisFileDirectory)ApiCompatBaseline.LKGRuntime.CurrentRuntime.txt&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />
 
     <!-- Microsoft.NETCore.App Ref vs. shared framework -->
-    <Exec Command="$(ApiCompatCmd) &quot;$(PackagesDir)microsoft.netcore.app/$(MicrosoftNETCoreAppPackageVersion)/ref/netcoreapp2.0&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkExtractPath)&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(PackagesDir)microsoft.netcore.app/$(MicrosoftNETCoreAppPackageVersion)/ref/netcoreapp2.0&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkExtractPath)&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />
 
     <!-- Last shipped shared framework vs. current shared framework -->
-    <Exec Command="$(ApiCompatCmd) &quot;@(_LKGSharedFrameworkAssemblies)&quot; $(ApiCompatArgs) -implDirs:&quot;$(SharedFrameworkExtractPath)&quot; -baseline:&quot;$(MSBuildThisFileDirectory)ApiCompatBaseline.LKGSharedFramework.CurrentSharedFramework.txt&quot;"
+    <Exec Command="$(_ApiCompatCommand) &quot;@(_LKGSharedFrameworkAssemblies)&quot; $(ApiCompatArgs) --impl-dirs &quot;$(SharedFrameworkExtractPath)&quot; --baseline &quot;$(MSBuildThisFileDirectory)ApiCompatBaseline.LKGSharedFramework.CurrentSharedFramework.txt&quot;"
           CustomErrorRegularExpression="Total Issues: [^0]"
           IgnoreStandardErrorWarningFormat="true"
           StandardOutputImportance="Low" />

diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index 0d5b642..63eeecc 100644 (file)
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -38,22 +38,20 @@
   <Target Name="RunApiCompat"
           Condition="'$(_RunApiCompat)' == 'true'"
           Inputs="$(ApiCompatResponseFile);@(GenFacadesContracts)"
-          Outputs="$(ApiCompatBaselineFile);$(ApiCompatNSBaselineFile)"
-  >
+          Outputs="$(ApiCompatBaselineFile);$(ApiCompatNSBaselineFile)">
+
     <PropertyGroup>
-      <ApiCompatArgs>$(ApiCompatArgs) -implDirs:"$(ApiCompatImplementationDirs)"</ApiCompatArgs>
-      <ApiCompatArgs Condition="'$(ApiCompatExcludeAttributeList)' != ''">$(ApiCompatArgs) -excludeAttributes:"$(ApiCompatExcludeAttributeList)"</ApiCompatArgs>
-      <BaselineApiCompatArgs Condition="Exists($(ApiCompatBaselineIgnoreFile))">-baseline:"$(ApiCompatBaselineIgnoreFile)"</BaselineApiCompatArgs>
+      <ApiCompatArgs Condition="'$(ApiCompatExcludeAttributeList)' != ''">$(ApiCompatArgs) --exclude-attributes "$(ApiCompatExcludeAttributeList)"</ApiCompatArgs>
+      <ApiCompatArgs>$(ApiCompatArgs) --impl-dirs "$(ApiCompatImplementationDirs)"</ApiCompatArgs>
+      <BaselineApiCompatArgs Condition="Exists($(ApiCompatBaselineIgnoreFile))">--baseline "$(ApiCompatBaselineIgnoreFile)"</BaselineApiCompatArgs>
       <ApiCompatExitCode>0</ApiCompatExitCode>
-
-      <ApiCompatCmd>$(_ApiCompatCommand)</ApiCompatCmd>
     </PropertyGroup>
 
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <WriteLinesToFile File="$(ApiCompatResponseFile)" Lines="$(ApiCompatArgs)" Overwrite="true" />
 
-    <Exec Command="$(ApiCompatCmd) &quot;@(NetFxReference->'$(NetFxRefPath)%(Identity).dll')&quot; $(BaselineApiCompatArgs) @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
-          Condition="'$(TargetGroup)'=='netcoreapp' and '$(BaselineApiCompat)' == 'true'"
+    <Exec Command="$(_ApiCompatCommand) &quot;@(NetFxReference -> '$(NetFxRefPath)%(Identity).dll')&quot; $(BaselineApiCompatArgs) @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
+          Condition="'$(TargetGroup)' == 'netcoreapp' and '$(BaselineApiCompat)' == 'true'"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
           IgnoreExitCode="true"
@@ -69,7 +67,7 @@
       <NETStandard20OnlyRef Condition="'$(TargetGroup)' == 'netcoreapp'">$(NETStandard20OnlyRef);$(RefPath)\System.Runtime.dll</NETStandard20OnlyRef>
     </PropertyGroup>
 
-    <Exec Command="$(ApiCompatCmd) &quot;$(NETStandard20OnlyRef)&quot; @&quot;$(ApiCompatResponseFile)&quot; -baseline:$(ApiCompatNSOnlyBaselineFile)"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(NETStandard20OnlyRef)&quot; @&quot;$(ApiCompatResponseFile)&quot; --baseline $(ApiCompatNSOnlyBaselineFile)"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
           IgnoreExitCode="true"
@@ -79,7 +77,7 @@
 
     <Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing netstandard.dll to $(TargetGroup)" />
 
-    <Exec Command="$(ApiCompatCmd) &quot;$(NetStandardRefPath)&quot; @&quot;$(ApiCompatResponseFile)&quot; -baseline:$(ApiCompatNSBaselineFile)"
+    <Exec Command="$(_ApiCompatCommand) &quot;$(NetStandardRefPath)&quot; --baseline &quot;$(ApiCompatNSBaselineFile)&quot; @&quot;$(ApiCompatResponseFile)&quot;"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
           IgnoreExitCode="true"