diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-03-01 22:45:59 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-03-01 22:45:59 +0300 |
| commit | 9cf5a396b57cf376c08c3b8eefa7a7e45ce024b7 (patch) | |
| tree | 6f92f517b41d8edf37b1e14b900644df36bc7dd6 /pkg/Microsoft.Private.CoreFx.UAP | |
| parent | 33acd0bf3341af4c19d881597352aa45729e1539 (diff) | |
Set correct RID in private package runtime.json
My previous change https://github.com/dotnet/corefx/commit/83ecd322e3c6190870f4855fa7104ab3ac0a6404
broke the runtime.json by putting the wrong target runtime string (it
was getting runtime package ID instead). This was happening because
MSBuild does the transform first then applies metadata and ended up
using the transformed value. Fix this by breaking it up into to steps
so that applying metadata happens before the transform.
Diffstat (limited to 'pkg/Microsoft.Private.CoreFx.UAP')
| -rw-r--r-- | pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj index 8f8e8d83e8..3cd120c9d6 100644 --- a/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj +++ b/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj @@ -29,10 +29,12 @@ <!-- force a missing file if ref build is absent --> <File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(FileToPackage)' == ''" /> - <Dependency Include="@(BuildRID->'runtime.%(Identity).$(Id)')"> + <_buildRIDWithMetadata Include="@(BuildRID)"> <TargetRuntime>%(Identity)</TargetRuntime> <Version>$(PackageVersion)</Version> - </Dependency> + </_buildRIDWithMetadata> + <Dependency Include="@(_buildRIDWithMetadata->'runtime.%(Identity).$(Id)')" /> + <Dependency Include="Microsoft.NETCore.Platforms"> <Version>$(PlatformPackageVersion)</Version> </Dependency> |