Skip to content

Commit 529a23d

Browse files
committed
Upgrade to latest Microsoft.Xaml.Behaviors.Uwp.Managed and Microsoft.UI.Xaml
1 parent 01984d3 commit 529a23d

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:behaviors="using:CommunityToolkit.App.Shared.Behaviors"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
87
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
98
xmlns:local="using:CommunityToolkit.App.Shared"
109
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -104,9 +103,9 @@
104103
</StackPanel>
105104
</Button.Content>
106105
<interactivity:Interaction.Behaviors>
107-
<interactions:EventTriggerBehavior EventName="Click">
106+
<interactivity:EventTriggerBehavior EventName="Click">
108107
<behaviors:NavigateToUriAction NavigateUri="https://aka.ms/toolkit/docs" />
109-
</interactions:EventTriggerBehavior>
108+
</interactivity:EventTriggerBehavior>
110109
</interactivity:Interaction.Behaviors>
111110
</Button>
112111
<Button win:AutomationProperties.Name="Learn more on GitHub">
@@ -122,9 +121,9 @@
122121
</StackPanel>
123122
</Button.Content>
124123
<interactivity:Interaction.Behaviors>
125-
<interactions:EventTriggerBehavior EventName="Click">
124+
<interactivity:EventTriggerBehavior EventName="Click">
126125
<behaviors:NavigateToUriAction NavigateUri="https://aka.ms/toolkit/windows" />
127-
</interactions:EventTriggerBehavior>
126+
</interactivity:EventTriggerBehavior>
128127
</interactivity:Interaction.Behaviors>
129128
</Button>
130129

@@ -141,9 +140,9 @@
141140
</StackPanel>
142141
</Button.Content>
143142
<interactivity:Interaction.Behaviors>
144-
<interactions:EventTriggerBehavior EventName="Click">
143+
<interactivity:EventTriggerBehavior EventName="Click">
145144
<behaviors:NavigateToUriAction NavigateUri="https://aka.ms/wct/discord" />
146-
</interactions:EventTriggerBehavior>
145+
</interactivity:EventTriggerBehavior>
147146
</interactivity:Interaction.Behaviors>
148147
</Button>
149148
</StackPanel>

CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:behaviors="using:CommunityToolkit.App.Shared.Behaviors"
66
xmlns:converters="using:CommunityToolkit.WinUI.Converters"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8-
xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
98
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
109
xmlns:local="using:CommunityToolkit.App.Shared"
1110
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -216,9 +215,9 @@
216215
Text="API doc" />
217216
</StackPanel>
218217
<interactivity:Interaction.Behaviors>
219-
<interactions:EventTriggerBehavior EventName="Click">
218+
<interactivity:EventTriggerBehavior EventName="Click">
220219
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToGitHubUri('discussions', Metadata.DiscussionId), Mode=OneWay}" />
221-
</interactions:EventTriggerBehavior>
220+
</interactivity:EventTriggerBehavior>
222221
</interactivity:Interaction.Behaviors>
223222
</Button>-->
224223
<Button win:AutomationProperties.Name="Source code">
@@ -230,9 +229,9 @@
230229
<TextBlock Text="Source code" />
231230
</StackPanel>
232231
<interactivity:Interaction.Behaviors>
233-
<interactions:EventTriggerBehavior EventName="Click">
232+
<interactivity:EventTriggerBehavior EventName="Click">
234233
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToComponentUri(Metadata.ComponentName), Mode=OneWay}" />
235-
</interactions:EventTriggerBehavior>
234+
</interactivity:EventTriggerBehavior>
236235
</interactivity:Interaction.Behaviors>
237236
</Button>
238237
<muxc:DropDownButton win:AutomationProperties.Name="Package info">
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.8.7-ci.240911006" />
3+
<PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.8.7-prerelease.241119001" />
44
<PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Windows.CsWinRT" Version="2.1.3" PrivateAssets="all" />
5-
<PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Web.WebView2" Version="1.0.2783-prerelease" IncludeAssets="none" />
65
</ItemGroup>
76
</Project>

ProjectHeads/App.Head.Uwp.Dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project>
44
<ItemGroup>
55
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown" Version="7.1.2" />
6-
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0-local.240918" />
6+
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0-preview1" />
77
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
88
</ItemGroup>
99
</Project>

0 commit comments

Comments
 (0)