Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Package id as assembly name #404

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Package id as assembly name #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f0ecb
Use package Id as assembly name
Arlodotexe Apr 18, 2024
913675b
Fix using PackageId as AssemblyName for custom PackageIds
Arlodotexe Apr 18, 2024
6b54da1
Use PackageIdVariant in InternalsVisibleTo
Arlodotexe May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors" />

<ItemGroup>
<PackageReference Include="PolySharp" Version="1.13.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -34,4 +31,9 @@

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

<ItemGroup>
<InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Media" />
<InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Behaviors" />
</ItemGroup>
</Project>
11 changes: 7 additions & 4 deletions components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitHelpersSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
7 changes: 5 additions & 2 deletions components/ColorPicker/src/CommunityToolkit.WinUI.Controls.ColorPicker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
<ProjectReference Include="$(ToolkitAnimationsSourceProject)" />
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

<Target Name="BeforeGenerateProjectPriFile">
<ItemGroup>
<_LayoutFile Remove="@(_LayoutFile)" Condition="$([System.String]::Copy(&quot;%(_LayoutFile.TargetPath)&quot;).StartsWith('CommunityToolkit.WinUI.Controls.Segmented\'))" />
Expand Down
4 changes: 2 additions & 2 deletions components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<!-- TODO: We should figure out a better way to share internal helpers without duplication -->
<!-- e.g. Animations is using ThrowIfNull helper... -->
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Animations" />
<InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
<InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Animations" />
<InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Media" />
</ItemGroup>
</Project>
11 changes: 7 additions & 4 deletions components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -19,8 +26,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions .../LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -19,8 +26,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"></ProjectReference>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -24,8 +31,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/Segmented/src/CommunityToolkit.WinUI.Controls.Segmented.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<ItemGroup>
<ProjectReference Include="$(ToolkitTriggersSourceProject)"></ProjectReference>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -23,8 +30,4 @@
<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/TabbedCommandBar/src/CommunityToolkit.WinUI.Controls.TabbedCommandBar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
<RootNamespace>CommunityToolkit.WinUI.Controls.TabbedCommandBarRns</RootNamespace>
</PropertyGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
11 changes: 7 additions & 4 deletions components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
<ProjectReference Include="$(ToolkitPrimitivesSourceProject)" />
</ItemGroup>

<!-- Import PackageIdVariant for custom package id -->
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>

<!-- Sets this up as a toolkit component's source project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />

Expand All @@ -25,8 +32,4 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<PropertyGroup>
<PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion tooling
Open in desktop
Submodule tooling updated 1 files
+9 −3 Build-Toolkit-Docs.ps1
Loading