Bye bye Microsoft.Xaml.Interactions.Core

files-community · Feb 8, 2025 · c836c1d · c836c1d
1 parent 5390298
commit c836c1d
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 93 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,6 +26,7 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
     <PackageVersion Include="Sentry" Version="5.1.0" />
     <PackageVersion Include="SevenZipSharp" Version="1.0.2" />
     <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />

diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml b/src/Files.App/Dialogs/DynamicDialog.xaml
@@ -6,7 +6,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	Title="{x:Bind ViewModel.TitleText, Mode=OneWay}"
 	CloseButtonClick="ContentDialog_CloseButtonClick"
@@ -53,9 +52,9 @@
 			Content="{x:Bind ViewModel.DisplayControl, Mode=OneWay}">
 			<i:Interaction.Behaviors>
 				<!--  No need to specify CommandParameter - `e` is passed by default  -->
-				<icore:EventTriggerBehavior EventName="Loaded">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.DisplayControlOnLoadedCommand, Mode=OneWay}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Loaded">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.DisplayControlOnLoadedCommand, Mode=OneWay}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</ContentControl>
 

diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
@@ -83,6 +83,7 @@
         <PackageReference Include="Microsoft.Extensions.Hosting" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+        <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
         <PackageReference Include="Sentry" />
         <PackageReference Include="SevenZipSharp" />
         <PackageReference Include="SQLitePCLRaw.bundle_green" />

diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml b/src/Files.App/UserControls/PathBreadcrumb.xaml
@@ -3,7 +3,6 @@
 	x:Class="Files.App.UserControls.PathBreadcrumb"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:core="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:dataitem="using:Files.App.Data.Items"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -34,12 +33,12 @@
 					Spacing="4"
 					Tag="{x:Bind Path, Mode=OneWay}">
 					<i:Interaction.Behaviors>
-						<core:EventTriggerBehavior EventName="PointerEntered">
-							<core:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
-						</core:EventTriggerBehavior>
-						<core:EventTriggerBehavior EventName="PointerExited">
-							<core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
-						</core:EventTriggerBehavior>
+						<i:EventTriggerBehavior EventName="PointerEntered">
+							<i:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
+						</i:EventTriggerBehavior>
+						<i:EventTriggerBehavior EventName="PointerExited">
+							<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
+						</i:EventTriggerBehavior>
 					</i:Interaction.Behaviors>
 
 					<!--  Header  -->
@@ -74,12 +73,12 @@
 						Tapped="PathBoxItem_Tapped"
 						Text="{x:Bind Title, Mode=OneWay}">
 						<i:Interaction.Behaviors>
-							<core:EventTriggerBehavior EventName="PointerEntered">
-								<core:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
-							</core:EventTriggerBehavior>
-							<core:EventTriggerBehavior EventName="PointerExited">
-								<core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
-							</core:EventTriggerBehavior>
+							<i:EventTriggerBehavior EventName="PointerEntered">
+								<i:ChangePropertyAction PropertyName="Opacity" Value="0.7" />
+							</i:EventTriggerBehavior>
+							<i:EventTriggerBehavior EventName="PointerExited">
+								<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
+							</i:EventTriggerBehavior>
 						</i:Interaction.Behaviors>
 					</TextBlock>
 

diff --git a/src/Files.App/Views/HomePage.xaml b/src/Files.App/Views/HomePage.xaml
@@ -8,15 +8,14 @@
 	xmlns:dataitems="using:Files.App.Data.Items"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	DataContext="{x:Bind ViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
 	<i:Interaction.Behaviors>
-		<icore:EventTriggerBehavior EventName="Loaded">
-			<icore:InvokeCommandAction Command="{x:Bind ViewModel.HomePageLoadedCommand, Mode=OneWay}" />
-		</icore:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="Loaded">
+			<i:InvokeCommandAction Command="{x:Bind ViewModel.HomePageLoadedCommand, Mode=OneWay}" />
+		</i:EventTriggerBehavior>
 	</i:Interaction.Behaviors>
 
 	<UserControl.Resources>

diff --git a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml
@@ -6,17 +6,16 @@
 	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.Views.Layouts"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	x:Name="PageRoot"
 	HighContrastAdjustment="None"
 	mc:Ignorable="d">
 
 	<i:Interaction.Behaviors>
-		<icore:EventTriggerBehavior EventName="PointerPressed">
-			<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
-		</icore:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="PointerPressed">
+			<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
+		</i:EventTriggerBehavior>
 	</i:Interaction.Behaviors>
 
 	<local:BaseLayoutPage.Resources>

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
@@ -11,7 +11,6 @@
 	xmlns:filesystem="using:Files.App.Utils"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.Views.Layouts"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:storage="using:Files.App.Utils.Storage"
@@ -24,12 +23,12 @@
 	mc:Ignorable="d">
 
 	<i:Interaction.Behaviors>
-		<icore:EventTriggerBehavior EventName="PointerWheelChanged">
-			<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
-		</icore:EventTriggerBehavior>
-		<icore:EventTriggerBehavior EventName="PointerPressed">
-			<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
-		</icore:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="PointerWheelChanged">
+			<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
+		</i:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="PointerPressed">
+			<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
+		</i:EventTriggerBehavior>
 	</i:Interaction.Behaviors>
 
 	<local:BaseGroupableLayoutPage.Resources>

diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
@@ -11,7 +11,6 @@
 	xmlns:filesystem="using:Files.App.Utils"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.Views.Layouts"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:storage="using:Files.App.Utils.Storage"
@@ -24,12 +23,12 @@
 	mc:Ignorable="d">
 
 	<i:Interaction.Behaviors>
-		<icore:EventTriggerBehavior EventName="PointerWheelChanged">
-			<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
-		</icore:EventTriggerBehavior>
-		<icore:EventTriggerBehavior EventName="PointerPressed">
-			<icore:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
-		</icore:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="PointerWheelChanged">
+			<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.PointerWheelChangedCommand}" />
+		</i:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="PointerPressed">
+			<i:InvokeCommandAction Command="{x:Bind CommandsViewModel.ItemPointerPressedCommand}" />
+		</i:EventTriggerBehavior>
 	</i:Interaction.Behaviors>
 
 	<local:BaseGroupableLayoutPage.Resources>

diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
@@ -8,7 +8,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:sidebar="using:Files.App.UserControls.Sidebar"
 	xmlns:tabbar="using:Files.App.UserControls.TabBar"
@@ -56,65 +55,65 @@
 	<Page.KeyboardAccelerators>
 		<KeyboardAccelerator Key="Number1" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number2" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number3" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number4" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number5" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number6" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number7" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number8" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 		<KeyboardAccelerator Key="Number9" Modifiers="Control">
 			<i:Interaction.Behaviors>
-				<icore:EventTriggerBehavior EventName="Invoked">
-					<icore:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
-				</icore:EventTriggerBehavior>
+				<i:EventTriggerBehavior EventName="Invoked">
+					<i:InvokeCommandAction Command="{x:Bind ViewModel.NavigateToNumberedTabKeyboardAcceleratorCommand}" />
+				</i:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</KeyboardAccelerator>
 	</Page.KeyboardAccelerators>

diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml b/src/Files.App/Views/Properties/GeneralPage.xaml
@@ -3,8 +3,7 @@
 	x:Class="Files.App.Views.Properties.GeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
-	xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
+	xmlns:i="using:Microsoft.Xaml.Interactivity"
 	xmlns:controls="using:Files.App.UserControls.Settings"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
@@ -120,14 +119,14 @@
 								Glyph="&#xE70F;" />
 						</Border>
 
-						<Interactivity:Interaction.Behaviors>
-							<Core:EventTriggerBehavior EventName="PointerEntered">
-								<Core:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
-							</Core:EventTriggerBehavior>
-							<Core:EventTriggerBehavior EventName="PointerExited">
-								<Core:ChangePropertyAction PropertyName="Opacity" Value="0" />
-							</Core:EventTriggerBehavior>
-						</Interactivity:Interaction.Behaviors>
+						<i:Interaction.Behaviors>
+							<i:EventTriggerBehavior EventName="PointerEntered">
+								<i:ChangePropertyAction PropertyName="Opacity" Value="1.0" />
+							</i:EventTriggerBehavior>
+							<i:EventTriggerBehavior EventName="PointerExited">
+								<i:ChangePropertyAction PropertyName="Opacity" Value="0" />
+							</i:EventTriggerBehavior>
+						</i:Interaction.Behaviors>
 					</Button>
 				</Grid>
 

diff --git a/src/Files.App/Views/Settings/ActionsPage.xaml b/src/Files.App/Views/Settings/ActionsPage.xaml
@@ -7,7 +7,6 @@
 	xmlns:dataitems="using:Files.App.Data.Items"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:keyboard="using:Files.App.UserControls.KeyboardShortcut"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
@@ -16,9 +15,9 @@
 	mc:Ignorable="d">
 
 	<i:Interaction.Behaviors>
-		<icore:EventTriggerBehavior EventName="Loaded">
-			<icore:InvokeCommandAction Command="{x:Bind ViewModel.LoadAllActionsCommand, Mode=OneWay}" />
-		</icore:EventTriggerBehavior>
+		<i:EventTriggerBehavior EventName="Loaded">
+			<i:InvokeCommandAction Command="{x:Bind ViewModel.LoadAllActionsCommand, Mode=OneWay}" />
+		</i:EventTriggerBehavior>
 	</i:Interaction.Behaviors>
 
 	<Page.Resources>

diff --git a/src/Files.App/Views/Settings/AdvancedPage.xaml b/src/Files.App/Views/Settings/AdvancedPage.xaml
@@ -7,7 +7,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:vm="using:Files.App.ViewModels.Settings"
@@ -105,9 +104,9 @@
 						IsOn="{x:Bind ViewModel.OpenOnWindowsStartup, Mode=TwoWay}"
 						Style="{StaticResource RightAlignedToggleSwitchStyle}">
 						<i:Interaction.Behaviors>
-							<icore:EventTriggerBehavior EventName="Toggled">
-								<icore:InvokeCommandAction Command="{x:Bind ViewModel.OpenFilesOnWindowsStartupCommand, Mode=OneWay}" />
-							</icore:EventTriggerBehavior>
+							<i:EventTriggerBehavior EventName="Toggled">
+								<i:InvokeCommandAction Command="{x:Bind ViewModel.OpenFilesOnWindowsStartupCommand, Mode=OneWay}" />
+							</i:EventTriggerBehavior>
 						</i:Interaction.Behaviors>
 					</ToggleSwitch>
 				</local:SettingsBlockControl>
@@ -157,9 +156,9 @@
 					IsOn="{x:Bind ViewModel.IsSetAsDefaultFileManager, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}">
 					<i:Interaction.Behaviors>
-						<icore:EventTriggerBehavior EventName="Toggled">
-							<icore:InvokeCommandAction Command="{x:Bind ViewModel.SetAsDefaultExplorerCommand, Mode=OneWay}" />
-						</icore:EventTriggerBehavior>
+						<i:EventTriggerBehavior EventName="Toggled">
+							<i:InvokeCommandAction Command="{x:Bind ViewModel.SetAsDefaultExplorerCommand, Mode=OneWay}" />
+						</i:EventTriggerBehavior>
 					</i:Interaction.Behaviors>
 				</ToggleSwitch>
 			</local:SettingsBlockControl>
@@ -178,9 +177,9 @@
 					IsOn="{x:Bind ViewModel.IsSetAsOpenFileDialog, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}">
 					<i:Interaction.Behaviors>
-						<icore:EventTriggerBehavior EventName="Toggled">
-							<icore:InvokeCommandAction Command="{x:Bind ViewModel.SetAsOpenFileDialogCommand, Mode=OneWay}" />
-						</icore:EventTriggerBehavior>
+						<i:EventTriggerBehavior EventName="Toggled">
+							<i:InvokeCommandAction Command="{x:Bind ViewModel.SetAsOpenFileDialogCommand, Mode=OneWay}" />
+						</i:EventTriggerBehavior>
 					</i:Interaction.Behaviors>
 				</ToggleSwitch>
 			</local:SettingsBlockControl>

diff --git a/src/Files.App/Views/Settings/DevToolsPage.xaml b/src/Files.App/Views/Settings/DevToolsPage.xaml
@@ -7,7 +7,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:uc="using:Files.App.UserControls"

diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml b/src/Files.App/Views/Settings/GeneralPage.xaml
@@ -6,7 +6,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:items="using:Files.App.Data.Items"
 	xmlns:local="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"