diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-02-23 04:47:09 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-02-23 04:47:09 +0300 |
| commit | efc7c093f9ee72373a752cdf99942da6556f1521 (patch) | |
| tree | ef9be55c00bb378451fa579b6d250c9fc2549122 /src/shims/ApiCompat.proj | |
| parent | 57d5071dc8fa5022dec20bbdc723309c6d187a5d (diff) | |
Update shim bin-placing to use binplace.targets
Also disable apicompat checks for uap* when in BuildAllConfigurations
mode because it doesn't have a RuntimePath correctly setup for those
configurations.
Diffstat (limited to 'src/shims/ApiCompat.proj')
| -rw-r--r-- | src/shims/ApiCompat.proj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shims/ApiCompat.proj b/src/shims/ApiCompat.proj index 6c640b9be5..d09bc051cd 100644 --- a/src/shims/ApiCompat.proj +++ b/src/shims/ApiCompat.proj @@ -8,11 +8,15 @@ <ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(TargetGroup).netstandard20.txt</ApiCompatNSBaselineFile> <ApiCompatImplementationDirs>$(RefPath),$(GenFacadesOutputPath)</ApiCompatImplementationDirs> <!-- If we are targeting uap or uapaot run ApiCompat against the implementation assemblies instead since they don't match the reference assemblies --> - <ApiCompatImplementationDirs Condition="'$(TargetGroup)'=='uap' or '$(TargetGroup)'=='uapaot'">$(RuntimePath),$(GenFacadesOutputPath)</ApiCompatImplementationDirs> + <ApiCompatImplementationDirs Condition="$(TargetGroup.StartsWith('uap'))">$(RuntimePath),$(GenFacadesOutputPath)</ApiCompatImplementationDirs> + <_RunApiCompat>true</_RunApiCompat> + <!-- Disable running apicompat for uap scenarios because the RuntimePath is not correctly setup in BuildAllConfigurations mode --> + <_RunApiCompat Condition="'$(BuildAllConfigurations)' == 'true' and $(TargetGroup.StartsWith('uap'))">false</_RunApiCompat> </PropertyGroup> <!-- Run ApiCompat --> <Target Name="RunApiCompat" + Condition="'$(_RunApiCompat)' == 'true'" Inputs="$(ApiCompatResponseFile);@(GenFacadesContracts)" Outputs="$(ApiCompatBaselineFile);$(ApiCompatNSBaselineFile)" > |