summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Keldorph <Russ.Keldorph@microsoft.com>2018-04-12 16:12:43 -0700
committerRuss Keldorph <russ.keldorph@microsoft.com>2018-04-14 07:21:02 -0700
commit04948f708746e3507771f08dfe36e33b4e9afcb8 (patch)
tree7a75a7c6a1b4a98f3ea97ded1a77291911765194 /src
parent7253416dd6790ade4d90e65c3aec1d4cab4f1970 (diff)
downloadcoreclr-04948f708746e3507771f08dfe36e33b4e9afcb8.tar.gz
coreclr-04948f708746e3507771f08dfe36e33b4e9afcb8.tar.bz2
coreclr-04948f708746e3507771f08dfe36e33b4e9afcb8.zip
Make Windows builds always portable
Apparently there is little or no need for a non-portable Windows build, so rather than trying to figure out which version of Windows we are building on, just ignore -PortableBuild=false. We can add a warning or refuse to accept the switch later if necessary, but for now we need to continue accepting it to avoid build breaks. Fixes #14291
Diffstat (limited to 'src')
-rw-r--r--src/.nuget/dir.props9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props
index 3f0936a662..224c6bf1be 100644
--- 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'">