diff options
| author | Ashish Jain <asja@microsoft.com> | 2016-12-13 04:45:23 +0300 |
|---|---|---|
| committer | Ashish Jain <asja@microsoft.com> | 2016-12-13 23:06:02 +0300 |
| commit | e44c01772fb06ed8a982e1cfbd26a8337e3becb5 (patch) | |
| tree | c4a2edf05658e9169832fa9ea46c59aaced3758a | |
| parent | 4a57a0ef4bee31f122d50a39fe3dddd4ca03fb07 (diff) | |
Added RuntimeIdentifiers property for non-UAP projects for PackageReference scenarios.
| -rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets index 252dd8d..53b500d 100644 --- a/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets +++ b/src/Microsoft.NuGet.Build.Tasks/Microsoft.NuGet.targets @@ -63,6 +63,11 @@ Copyright (c) .NET Foundation. All rights reserved. <NuGetRuntimeIdentifier Condition="'$(UseDotNetNativeToolchain)' == 'true'">$(_NuGetRuntimeIdentifierWithoutAot)-aot</NuGetRuntimeIdentifier> </PropertyGroup> + <!-- If RuntimeIdentifiers weren't already specified for non-UAP projects, then generate it --> + <PropertyGroup Condition="'$(BaseNuGetRuntimeIdentifier)' == 'win' and '$(NuGetRuntimeIdentifier)' != '' and '$(RuntimeIdentifiers)' == '' and '$(RuntimeIdentifier)' == ''"> + <RuntimeIdentifiers>win;win-x86;win-x64</RuntimeIdentifiers> + </PropertyGroup> + <ItemGroup> <!-- If we are resolving from project.lock.json, we need to consider any edit to it as something that forces a rebuild --> <CustomAdditionalCompileInputs Include="$(ProjectLockFile)" Condition="'$(ResolveNuGetPackages)' == 'true' and Exists('$(ProjectLockFile)')" /> |