[Arm64] Add full barrier after locking operations (#17567)

[platform/upstream/coreclr.git] / src / .nuget / dir.props

diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index 33adec2..224c6bf 100644 (file)
--- a/src/.nuget/dir.props
+++ b/src/.nuget/dir.props
@@ -67,13 +67,8 @@
     <When Condition="'$(PackageRID)' != ''" />
     <When Condition="'$(_runtimeOSFamily)' == 'win'">
       <PropertyGroup>
-        <RIDPlatform>win7</RIDPlatform>
-        <RIDPlatform Condition="'$(ArchGroup)' == 'arm'">win8</RIDPlatform>
-        <RIDPlatform Condition="'$(ArchGroup)' == 'arm64'">win10</RIDPlatform>
-        
-        <!-- Set the platform part of the RID if we are doing a portable build -->
-        <RIDPlatform Condition="'$(PortableBuild)' == 'true'">win</RIDPlatform>
-        <PackageRID>$(RIDPlatform)-$(ArchGroup)</PackageRID>
+        <!-- Note: Windows builds are always portable (-PortableBuild=false is ignored) -->
+        <PackageRID>win-$(ArchGroup)</PackageRID>
       </PropertyGroup>
     </When>
     <When Condition="'$(_runtimeOSFamily)' == 'osx'">
@@ -133,6 +128,7 @@
   <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Linux;'))">
     <OfficialBuildRID Include="linux-x64" />
     <OfficialBuildRID Include="rhel.6-x64" />
+    <OfficialBuildRID Include="alpine.3.6-x64" />
     <OfficialBuildRID Include="linux-arm">
       <Platform>arm</Platform>
     </OfficialBuildRID>