diff options
author | Ashish Jain (NUGET) <asja@microsoft.com> | 2017-03-02 02:38:05 +0300 |
---|---|---|
committer | Ashish Jain (NUGET) <asja@microsoft.com> | 2017-03-02 02:38:05 +0300 |
commit | 1a297edb491990e3dde2191a49594374bbd8658b (patch) | |
tree | 5dd8961dcbb3429861a6fb93fdedb9ee94a79014 | |
parent | 5a8c149e9b88a975e6311b024d0ecdf5994673ab (diff) |
Set RuntimeIdentifier same as BaseNuGetRuntimeIdentifier when set explicitly
-rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets | 6 |
1 files changed, 6 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..332c2e0 100644 --- a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets +++ b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets @@ -70,6 +70,12 @@ Copyright (c) .NET Foundation. All rights reserved. <PropertyGroup> <ResolveNuGetPackages Condition="'$(ResolveNuGetPackages)' == '' and '$(MSBuildProjectExtension)' != '.xproj'">true</ResolveNuGetPackages> + <!-- + if BaseNuGetRuntimeIdentifier is defined then simply use it as RuntimeIdentifier, otherwise + we'll set RuntimeIdentifiers to default value later on. + --> + <RuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' != ''">$(BaseNuGetRuntimeIdentifier)</RuntimeIdentifier> + <BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == '' and '$(TargetPlatformIdentifier)' == 'UAP'">win10</BaseNuGetRuntimeIdentifier> <BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == ''">win</BaseNuGetRuntimeIdentifier> |