diff options
| author | Tom Meschter <tomescht@microsoft.com> | 2017-03-10 02:32:03 +0300 |
|---|---|---|
| committer | Tom Meschter <tomescht@microsoft.com> | 2017-03-10 02:32:03 +0300 |
| commit | 34ef7159534ae7872206ef4149b8581dbc5d7014 (patch) | |
| tree | 3347f3af6606fa75a31075585fc781a1515ddceb | |
| parent | 5a8c149e9b88a975e6311b024d0ecdf5994673ab (diff) | |
Add a missing scenario for Framework injection
Whenever a UWP app contains managed code we need to be sure to inject the .NET Core Framework assemblies. This is obviously the case when the app itself is written in C# or VB. However, we also need to handle the case where the app is written in C++ but references a WinRT component written in managed code.
We detect the latter case by looking for the use of the union Windows.winmd assembly. We assume the assembly is in a path that ends with "UnionMetadata\Windows.winmd", but this isn't always the case. Sometimes the path will include the Windows SDK version number, like "UnionMetadata\10.0.15000.0\Windows.winmd"; in this case we won't realize that the framework is needed, and .NET Native compilation will fail.
The fix here is to check for these other locations by making use of the WindowsSDK_UnionMetadataPath property.
| -rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets index f56dfca..54ed535 100644 --- a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets +++ b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets @@ -284,6 +284,7 @@ Copyright (c) .NET Foundation. All rights reserved. <PropertyGroup> <_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> </PropertyGroup> <PropertyGroup> |