diff options
author | Nat Ayewah <natidea@users.noreply.github.com> | 2017-10-06 09:21:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-06 09:21:23 +0300 |
commit | 4c59873476d6cd74944986f88a6a03901776af47 (patch) | |
tree | fb9d2fafdb31b6b36c490ed9fb28b7c3602ec289 | |
parent | 8316e6a9ffcec0c0f8ae6a99f1f39bac5417b4e3 (diff) | |
parent | 423710ffd0b7d104fc937fc28fbee06d96854e86 (diff) |
Merge pull request #42 from NuGet/natidea-updateInjectionFlag
Update Framework Injection check to support JavaScript UWP apps
-rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets index 8659d36..ff8b695 100644 --- a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets +++ b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets @@ -272,6 +272,8 @@ Copyright (c) .NET Foundation. All rights reserved. <_PackagingOutputsIncludesFramework Condition="'%(PackagingOutputs.FileName)%(PackagingOutputs.Extension)' == 'System.Runtime.dll'">true</_PackagingOutputsIncludesFramework> <_AppContainsManagedCodeForInjection Condition="'%(PackagingOutputs.Identity)' == '$(_TargetPlatformSdkDir)UnionMetadata\Windows.winmd'">true</_AppContainsManagedCodeForInjection> <_AppContainsManagedCodeForInjection Condition="'%(PackagingOutputs.Identity)' == '$(WindowsSDK_UnionMetadataPath)\Windows.winmd'">true</_AppContainsManagedCodeForInjection> + <!-- In some scenarios (e.g. JavaScript UWP apps) the WindowsSDK_UnionMetadataPath may not be set. Check the target for completeness. --> + <_AppContainsManagedCodeForInjection Condition="'%(PackagingOutputs.TargetPath)' == '$(WinMetadataDir)\Windows.winmd'">true</_AppContainsManagedCodeForInjection> </PropertyGroup> <PropertyGroup> |