diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2021-02-20 15:18:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 15:18:35 +0300 |
| commit | dcacc4dafe72eb1e12e4360ea2e69b4eebd231ba (patch) | |
| tree | ea404252ef789e775974872f9a3a295cd19e5019 /eng/targetingpacks.targets | |
| parent | 064a4a3dc37d39f9761b9750c98c8f09cbbf62a1 (diff) | |
Update hardcoded rids for targeting/runtime pks (#48459)
* Update hardcoded rids for targeting/runtime pks
Diffstat (limited to 'eng/targetingpacks.targets')
| -rw-r--r-- | eng/targetingpacks.targets | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index cbd1cdd3aa5..2c73dd46c1e 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -1,4 +1,8 @@ <Project> + <PropertyGroup> + <SharedFrameworkName Condition="'$(SharedFrameworkName)' == ''">Microsoft.NETCore.App</SharedFrameworkName> + </PropertyGroup> + <PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))"> @@ -15,7 +19,7 @@ LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimeFrameworkName="$(SharedFrameworkName)" RuntimePackNamePatterns="$(SharedFrameworkName).Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;android-arm64;android-arm;android-x64;android-x86;browser-wasm" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="$(SharedFrameworkName).Ref" TargetingPackVersion="$(ProductVersion)" @@ -23,7 +27,7 @@ <KnownAppHostPack Include="$(SharedFrameworkName)" AppHostPackNamePattern="$(SharedFrameworkName).Host.**RID**" AppHostPackVersion="$(ProductVersion)" - AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86" + AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64" TargetFramework="$(NetCoreAppCurrent)" Condition="'@(KnownAppHostPack)' == '' or !@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))" /> <KnownCrossgen2Pack Include="$(SharedFrameworkName).Crossgen2" |