Skip to content

Commit 7aca99b

Browse files
committed
Fix Ribbon control PackageId evaluation order
Move Import statement before PackageId PropertyGroup to ensure $(PackageIdVariant) is defined when PackageId is evaluated. Previously, PackageId referenced $(PackageIdVariant) before the Import that defines it, resulting in malformed package identifiers like 'CommunityToolkit..Controls.Ribbon' (with empty variable). This prevented Ribbon packages from being published to NuGet feeds. All other controls have Import before PackageId and work correctly. This aligns Ribbon with the established pattern. Fixes #739
1 parent 5438e4d commit 7aca99b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

components/Ribbon/src/CommunityToolkit.WinUI.Controls.Ribbon.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
</PropertyGroup>
1212

13+
<!-- Sets this up as a toolkit component's source project -->
14+
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
15+
1316
<PropertyGroup>
1417
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
1518
</PropertyGroup>
1619

17-
<!-- Sets this up as a toolkit component's source project -->
18-
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
1920
<ItemGroup>
2021
<UpToDateCheckInput Remove="RibbonStyle.xaml" />
2122
</ItemGroup>

0 commit comments

Comments
 (0)