Skip to content

Commit 2c9670d

Browse files
authored
Create arch neutral packages when building inside the VMR (#10405)
* Create arch neutral packages when building inside the VMR * Update packaging rules for platform neutral packages
1 parent 43f4bc5 commit 2c9670d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

packaging/Directory.Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
Set $(IsPackable) = true, except when
1717
$(CreateArchNeutralPackage) == true && $(Platform) != x86
1818
The idea here is that for arch-neutral packages, only the x86 build phase will generate the nuget package
19-
The platform/RID specific packages will be generated in their respective $(Platform) specific build phases
19+
The platform/RID specific packages will be generated in their respective $(Platform) specific build phases.
20+
Platform neutral packages should always get generated when building the product (DotNetBuild=true).
2021
-->
2122
<IsPackable>true</IsPackable>
22-
<IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true'">false</IsPackable>
23+
<IsPackable Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32' and '$(Platform)'!='x86') and '$(CreateArchNeutralPackage)'=='true' and '$(DotNetBuild)' != 'true'">false</IsPackable>
2324
</PropertyGroup>
2425

2526
<PropertyGroup>

0 commit comments

Comments
 (0)