Skip to content

Commit 61ca149

Browse files
committed
Fixed dependencies for Uno
1 parent 4b2ef29 commit 61ca149

File tree

3 files changed

+8
-26
lines changed

3 files changed

+8
-26
lines changed

components/Marquee/samples/Dependencies.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
<Project>
1212
<!-- WinUI 2 / UWP -->
1313
<ItemGroup Condition="'$(IsUwp)' == 'true'">
14-
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
14+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250402"/>
1515
</ItemGroup>
1616

1717
<!-- WinUI 2 / Uno -->
1818
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
19-
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
19+
<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Behaviors" Version="7.1.11"/>
2020
</ItemGroup>
2121

2222
<!-- WinUI 3 / WinAppSdk -->
2323
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
24-
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
24+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402"/>
2525
</ItemGroup>
2626

2727
<!-- WinUI 3 / Uno -->
2828
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
29-
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
29+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Behaviors" Version="7.1.204"/>
3030
</ItemGroup>
3131
</Project>

components/Marquee/samples/MarqueeBehaviorSample.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
22
<Page x:Class="MarqueeExperiment.Samples.MarqueeBehaviorSample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
45
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
66
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
99
xmlns:local="MarqueeExperiment.Samples"
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1111
mc:Ignorable="d">
1212

13-
<StackPanel Padding="16">
13+
<win:StackPanel Padding="16">
1414
<TextBlock FontWeight="Bold"
1515
Text="This Marquee will loop once when hovered." />
1616
<controls:Marquee x:Name="Loop1Marquee"
@@ -52,5 +52,5 @@
5252
</interactivity:EventTriggerBehavior>
5353
</interactivity:Interaction.Behaviors>
5454
</controls:Marquee>
55-
</StackPanel>
55+
</win:StackPanel>
5656
</Page>

components/Marquee/samples/MarqueeText.Samples.csproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,5 @@
66

77
<!-- Sets this up as a toolkit component's sample project -->
88
<Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
9-
<ItemGroup>
10-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
11-
</ItemGroup>
12-
13-
<ItemGroup>
14-
<Compile Update="MarqueeBehaviorSampl.xaml.cs">
15-
<DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
16-
</Compile>
17-
<Compile Update="MarqueeBehaviorSample.xaml.cs">
18-
<DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
19-
</Compile>
20-
<Compile Update="MarqueeTextSample.xaml.cs">
21-
<DependentUpon>MarqueeTextSample.xaml</DependentUpon>
22-
</Compile>
23-
<Compile Update="MarqueeSample.xaml.cs">
24-
<DependentUpon>MarqueeSample.xaml</DependentUpon>
25-
</Compile>
26-
</ItemGroup>
279

2810
</Project>

0 commit comments

Comments
 (0)