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

Cleanup project references #318

Merged
merged 10 commits into from
Jan 24, 2024
Merged

Cleanup project references #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9085fda
Use absolute paths for ProjectReference where possible
Arlodotexe Jan 19, 2024
baec558
Use ProjectReference instead of PackageReference for Behaviors
Arlodotexe Jan 19, 2024
15d3cef
Fixed typo
Arlodotexe Jan 19, 2024
105468d
Fixed component name typo in 'ToolkitExtensionSourceProject'
Arlodotexe Jan 20, 2024
55e4c78
Fixed component name typo in 'ToolkitPrimitiveSourceProject'
Arlodotexe Jan 20, 2024
21d3e1f
Fixed component name typo in 'ToolkitHelperSourceProject'
Arlodotexe Jan 20, 2024
2553131
Fixed component name typo in 'ToolkitBehaviorSourceProject'
Arlodotexe Jan 20, 2024
070c58d
Fixed component name typo in 'ToolkitAnimationSourceProject'
Arlodotexe Jan 20, 2024
c5b3095
Merge branch 'main' into cleanup/project-references
Arlodotexe Jan 23, 2024
4f5379a
Bump submodule to latest for https://github.com/CommunityToolkit/Tool…
Arlodotexe Jan 23, 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
11 changes: 6 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
<ToolingDirectory>$(RepositoryDirectory)tooling</ToolingDirectory>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<ToolkitConvertersSourceProject>$(RepositoryDirectory)components\Converters\src\CommunityToolkit.WinUI.Converters.csproj</ToolkitConvertersSourceProject>
<ToolkitExtensionSourceProject>$(RepositoryDirectory)components\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj</ToolkitExtensionSourceProject>
<ToolkitExtensionsSourceProject>$(RepositoryDirectory)components\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj</ToolkitExtensionsSourceProject>
<ToolkitTriggersSourceProject>$(RepositoryDirectory)components\Triggers\src\CommunityToolkit.WinUI.Triggers.csproj</ToolkitTriggersSourceProject>
<ToolkitSettingsControlsSourceProject>$(RepositoryDirectory)components\SettingsControls\src\CommunityToolkit.WinUI.Controls.SettingsControls.csproj</ToolkitSettingsControlsSourceProject>

<!-- TODO: See https://github.com/CommunityToolkit/Windows/issues/117 these should be removed unless needed by sample app or tests -->
<ToolkitHelperSourceProject>$(RepositoryDirectory)components\Helpers\src\CommunityToolkit.WinUI.Helpers.csproj</ToolkitHelperSourceProject>
<ToolkitBehaviorSourceProject>$(RepositoryDirectory)components\Behaviors\src\CommunityToolkit.WinUI.Behaviors.csproj</ToolkitBehaviorSourceProject>
<ToolkitAnimationSourceProject>$(RepositoryDirectory)components\Animations\src\CommunityToolkit.WinUI.Animations.csproj</ToolkitAnimationSourceProject>
<ToolkitPrimitiveSourceProject>$(RepositoryDirectory)components\Primitives\src\CommunityToolkit.WinUI.Controls.Primitives.csproj</ToolkitPrimitiveSourceProject>
<ToolkitHelpersSourceProject>$(RepositoryDirectory)components\Helpers\src\CommunityToolkit.WinUI.Helpers.csproj</ToolkitHelpersSourceProject>
<ToolkitBehaviorsSourceProject>$(RepositoryDirectory)components\Behaviors\src\CommunityToolkit.WinUI.Behaviors.csproj</ToolkitBehaviorsSourceProject>
<ToolkitAnimationsSourceProject>$(RepositoryDirectory)components\Animations\src\CommunityToolkit.WinUI.Animations.csproj</ToolkitAnimationsSourceProject>
<ToolkitPrimitivesSourceProject>$(RepositoryDirectory)components\Primitives\src\CommunityToolkit.WinUI.Controls.Primitives.csproj</ToolkitPrimitivesSourceProject>
<ToolkitSizersSourceProject>$(RepositoryDirectory)components\Sizers\src\CommunityToolkit.WinUI.Controls.Sizers.csproj</ToolkitSizersSourceProject>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
2 changes: 1 addition & 1 deletion components/Animations/samples/Animations.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitAnimationSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionSourceProject)" />
<ProjectReference Include="$(ToolkitAnimationsSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitHelperSourceProject)"/>
<ProjectReference Include="$(ToolkitHelpersSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion components/Collections/src/CommunityToolkit.WinUI.Collections.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitHelperSourceProject)"/>
<ProjectReference Include="$(ToolkitHelpersSourceProject)"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion .../LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
4 changes: 0 additions & 4 deletions components/Media/samples/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,17 @@
<Project>
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.2"/>
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.2"/>
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.2"/>
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.2"/>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions components/Media/samples/Media.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

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

<ItemGroup>
<ProjectReference Include="$(ToolkitBehaviorsSourceProject)" />
</ItemGroup>

<ItemGroup>
<None Remove="Assets\Bloom.jpg" />
Expand Down
2 changes: 1 addition & 1 deletion components/Media/src/CommunityToolkit.WinUI.Media.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitAnimationSourceProject)" />
<ProjectReference Include="$(ToolkitAnimationsSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions components/Primitives/samples/Primitives.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />

<ItemGroup>
<ProjectReference Include="..\..\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj"></ProjectReference>
<ProjectReference Include="..\..\Sizers\src\CommunityToolkit.WinUI.Controls.Sizers.csproj"></ProjectReference>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"></ProjectReference>
<ProjectReference Include="$(ToolkitSizersSourceProject)"></ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj"></ProjectReference>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"></ProjectReference>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
4 changes: 2 additions & 2 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 @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Helpers\src\CommunityToolkit.WinUI.Helpers.csproj" />
<ProjectReference Include="..\..\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj" />
<ProjectReference Include="$(ToolkitHelpersSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion components/Segmented/samples/Segmented.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- Sets this up as a toolkit component's sample project -->
<Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
<ItemGroup>
<ProjectReference Include="..\..\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>
<ItemGroup>
<None Remove="Assets\Segmented.png" />
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion components/SettingsControls/samples/SettingsControls.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />

<ItemGroup>
<ProjectReference Include="..\..\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj"></ProjectReference>
<ProjectReference Include="$(ToolkitExtensionsSourceProject)"></ProjectReference>
</ItemGroup>
<ItemGroup>
<None Remove="Assets\SettingsCard.png" />
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Triggers\src\CommunityToolkit.WinUI.Triggers.csproj"></ProjectReference>
<ProjectReference Include="$(ToolkitTriggersSourceProject)"></ProjectReference>
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
</ItemGroup>

<PropertyGroup>
Expand Down
6 changes: 3 additions & 3 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 @@ -9,9 +9,9 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitExtensionSourceProject)" />
<ProjectReference Include="$(ToolkitHelperSourceProject)" />
<ProjectReference Include="$(ToolkitPrimitiveSourceProject)" />
<ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
<ProjectReference Include="$(ToolkitHelpersSourceProject)" />
<ProjectReference Include="$(ToolkitPrimitivesSourceProject)" />
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion components/Triggers/src/CommunityToolkit.WinUI.Triggers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(ToolkitHelperSourceProject)" />
<ProjectReference Include="$(ToolkitHelpersSourceProject)" />
</ItemGroup>

<!-- Sets this up as a toolkit component's source project -->
Expand Down
2 changes: 1 addition & 1 deletion tooling
Open in desktop
Submodule tooling updated 1 files
+2 −2 ProjectHeads/Tests.Head.props
Loading