diff options
author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-06 01:03:56 +0300 |
---|---|---|
committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2017-01-06 01:03:56 +0300 |
commit | 44b68e694948065c1b61457cec125d3d64c1fa22 (patch) | |
tree | fc7093fb753c57f29ce42de9dd64ecc435d2e95c /dir.targets | |
parent | d4d3bbdf7b8b35b5a330c94427051582470531d0 (diff) | |
parent | 05ae65fd6b51f865750e8d400c60511fcdbbbfb5 (diff) |
Merge branch master into dev/eng
Diffstat (limited to 'dir.targets')
-rw-r--r-- | dir.targets | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/dir.targets b/dir.targets index ec87e07704..eb49097f02 100644 --- a/dir.targets +++ b/dir.targets @@ -55,13 +55,7 @@ <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> </ItemGroup> - <PropertyGroup Condition="'$(OSGroup)'=='Windows_NT' and '$(EnableDotnetAnalyzers)' == 'true'"> - <!-- Override pinvoke files from codeAnalysis.targets, to use Win32 API instead of API set --> - <ValidPinvokeMappings>$(MSBuildThisFileDirectory)PinvokeAnalyzer_OneCoreApis.txt</ValidPinvokeMappings> - <ValidPinvokeMappings Condition="'$(TargetGroup)'=='netcore50' or '$(TargetGroup)'=='netcore50aot' or '$(SupportsUWP)'=='true'">$(MSBuildThisFileDirectory)PinvokeAnalyzer_UWPApis.txt</ValidPinvokeMappings> - </PropertyGroup> - - <Target Name="ProducesPackageId" + <Target Name="ProducesPackageId" Returns="@(PackageIds)"> <ItemGroup> <PackageIds Include="$(Id)" /> |