From d4146bca46b13163785863e536023ca07b3b8c8e Mon Sep 17 00:00:00 2001
From: Kunal22shah <kunalshah606@gmail.com>
Date: Tue, 18 Jun 2024 12:26:44 -0400
Subject: [PATCH] chore: removing nested CommandBar samples

---
 .../Controls/CommandBarSamplePage.xaml.cs     | 12 +---
 .../CommandBarSample_NestedPage1.xaml         | 71 -------------------
 .../CommandBarSample_NestedPage1.xaml.cs      | 59 ---------------
 .../CommandBarSample_NestedPage2.xaml         | 42 -----------
 .../CommandBarSample_NestedPage2.xaml.cs      | 11 ---
 ...3MaterialCommandBarSample_NestedPage1.xaml | 70 ------------------
 ...terialCommandBarSample_NestedPage1.xaml.cs | 59 ---------------
 ...3MaterialCommandBarSample_NestedPage2.xaml | 41 -----------
 ...terialCommandBarSample_NestedPage2.xaml.cs | 11 ---
 .../Uno.Themes.Samples.Shared.projitems       | 28 --------
 10 files changed, 2 insertions(+), 402 deletions(-)
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs

diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
index 8180f0216..b5822bc6d 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
@@ -1,4 +1,4 @@
-using Uno.Themes.Samples.Content.NestedSamples;
+using Uno.Themes.Samples.Content.NestedSamples;
 
 namespace Uno.Themes.Samples.Content.Controls;
 
@@ -10,13 +10,5 @@ public CommandBarSamplePage()
 	{
 		this.InitializeComponent();
 	}
-	private void ShowSampleInNestedFrame(object sender, RoutedEventArgs e)
-	{
-		Shell.GetForCurrentView()?.ShowNestedSample<CommandBarSample_NestedPage1>(clearStack: true);
-	}
-
-	private void ShowM3SampleInNestedFrame(object sender, RoutedEventArgs e)
-	{
-		Shell.GetForCurrentView()?.ShowNestedSample<M3MaterialCommandBarSample_NestedPage1>(clearStack: true);
-	}
+	
 }
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
deleted file mode 100644
index ffc22c9d2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.CommandBarSample_NestedPage1"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:smtx="using:ShowMeTheXAML"
-	  xmlns:todo="what should be done"
-	  xmlns:xamarin="http://uno.ui/xamarin"
-	  mc:Ignorable="d todo xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<CommandBar Content="Material Page 1"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButton}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png"
-									ShowAsMonochrome="False" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1"
-					Margin="16">
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				You can use the back button located on the left side of the CommandBar
-				to exit this sample.
-			</TextBlock>
-
-			<Button Content="Exit sample"
-					Click="NavigateBack" />
-			<Button Content="Navigate to next page"
-					Click="NavigateToNextPage" />
-
-			<smtx:XamlPresenter ReferenceKey="CommandBarSample_NestedPage1_CommandBar" />
-
-			<Button x:Name="SeeCodeBehindButton"
-					Tag="See code behind"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				note: In order for the `MaterialCommandBarStyle` to work properly on iOS and Android,
-				you will need to present them using a `NativeDefaultFrame` in your MainPage/Shell. As shown below:
-			</TextBlock>
-
-			<smtx:XamlDisplay UniqueKey="CommandBarSample_NestedPage1_Note"
-							  Style="{StaticResource SourceOnlyXamlDisplayStyle}">
-				<Frame x:Name="ContentFrame"
-					   xamarin:Style="{StaticResource NativeDefaultFrame}" />
-			</smtx:XamlDisplay>
-
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				note: In order to support native back navigations (uwp, browser, android),
-				you will have to handle the SystemNavigationManager.BackRequested event. As shown below:
-			</TextBlock>
-			<Button x:Name="SeeAdditionSetupButton"
-					Tag="See additional setup"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
deleted file mode 100644
index 9b9091ce2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class CommandBarSample_NestedPage1 : Page
-{
-	public CommandBarSample_NestedPage1()
-	{
-		this.InitializeComponent();
-
-		this.SeeCodeBehindButton.Content = GetCodeBehind();
-		this.SeeAdditionSetupButton.Content = GetAdditionSetup();
-	}
-
-	private string GetCodeBehind()
-	{
-		return @"
-private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-	Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-private void NavigateBack(object sender, RoutedEventArgs e) =>
-	Frame.GoBack();
-".Trim("\r\n".ToCharArray());
-	}
-
-	private string GetAdditionSetup()
-	{
-		return @"
-// in the MainPage or Shell:
-public MainPage()
-{
-	this.InitializeComponent();
-
-	SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
-}
-
-private void OnBackRequested(object sender, BackRequestedEventArgs e)
-{
-	if (ContentFrame.CanGoBack)
-	{
-		ContentFrame.GoBack();
-
-		// prevent default behaviors (android: back to home screen, browser: navigate back)
-		// since we just handled in app.
-		e.Handled = true;
-	}
-}
-".Trim("\r\n".ToCharArray());
-	}
-
-	private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-		Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-	private void NavigateBack(object sender, RoutedEventArgs e)
-	{
-		// Normally we would've just called `Frame.GoBack();` if we only have a single frame.
-		// However, a nested frame is used to show-case fullscreen sample, so we need some
-		// custom handling to hide the nested frame on back navigation when the stack is empty.
-		Shell.GetForCurrentView()?.BackNavigateFromNestedSample();
-	}
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
deleted file mode 100644
index fe4f534a2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.CommandBarSample_NestedPage2"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:xamarin="http:/uno.ui/xamarin"
-	  mc:Ignorable="d xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
-		<CommandBar Content="Material Page 2"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButton}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png"
-									ShowAsMonochrome="False" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1" Margin="16">
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				You can use the back button located on the left side of the CommandBar
-				to navigate back.
-			</TextBlock>
-
-			<Button Content="Navigate Back"
-					Click="NavigateBack" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
deleted file mode 100644
index befed4902..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class CommandBarSample_NestedPage2 : Page
-{
-	public CommandBarSample_NestedPage2()
-	{
-		this.InitializeComponent();
-	}
-
-	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
deleted file mode 100644
index 374b11532..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.M3MaterialCommandBarSample_NestedPage1"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:smtx="using:ShowMeTheXAML"
-	  xmlns:todo="what should be done"
-	  xmlns:xamarin="http://uno.ui/xamarin"
-	  mc:Ignorable="d todo xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<CommandBar Content="Material Page 1"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButtonStyle}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1"
-					Margin="16">
-			<TextBlock Style="{StaticResource BodySmall}">
-				You can use the back button located on the left side of the CommandBar
-				to exit this sample.
-			</TextBlock>
-
-			<Button Content="Exit sample"
-					Click="NavigateBack" />
-			<Button Content="Navigate to next page"
-					Click="NavigateToNextPage" />
-
-			<smtx:XamlPresenter ReferenceKey="MaterialM3_CommandBarSample_NestedPage1_CommandBar" />
-
-			<Button x:Name="SeeCodeBehindButton"
-					Tag="See code behind"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-
-			<TextBlock Style="{StaticResource BodySmall}">
-				note: In order for the `MaterialCommandBarStyle` to work properly on iOS and Android,
-				you will need to present them using a `NativeDefaultFrame` in your MainPage/Shell. As shown below:
-			</TextBlock>
-
-			<smtx:XamlDisplay UniqueKey="MaterialM3_CommandBarSample_NestedPage1_Note"
-							  Style="{StaticResource SourceOnlyXamlDisplayStyle}">
-				<Frame x:Name="ContentFrame"
-					   xamarin:Style="{StaticResource NativeDefaultFrame}" />
-			</smtx:XamlDisplay>
-
-			<TextBlock Style="{StaticResource BodySmall}">
-				note: In order to support native back navigations (uwp, browser, android),
-				you will have to handle the SystemNavigationManager.BackRequested event. As shown below:
-			</TextBlock>
-			<Button x:Name="SeeAdditionSetupButton"
-					Tag="See additional setup"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
deleted file mode 100644
index 10a812476..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class M3MaterialCommandBarSample_NestedPage1 : Page
-{
-	public M3MaterialCommandBarSample_NestedPage1()
-	{
-		this.InitializeComponent();
-
-		this.SeeCodeBehindButton.Content = GetCodeBehind();
-		this.SeeAdditionSetupButton.Content = GetAdditionSetup();
-	}
-
-	private string GetCodeBehind()
-	{
-		return @"
-private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-	Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-private void NavigateBack(object sender, RoutedEventArgs e) =>
-	Frame.GoBack();
-".Trim("\r\n".ToCharArray());
-	}
-
-	private string GetAdditionSetup()
-	{
-		return @"
-// in the MainPage or Shell:
-public MainPage()
-{
-	this.InitializeComponent();
-
-	SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
-}
-
-private void OnBackRequested(object sender, BackRequestedEventArgs e)
-{
-	if (ContentFrame.CanGoBack)
-	{
-		ContentFrame.GoBack();
-
-		// prevent default behaviors (android: back to home screen, browser: navigate back)
-		// since we just handled in app.
-		e.Handled = true;
-	}
-}
-".Trim("\r\n".ToCharArray());
-	}
-
-	private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-		Frame.Navigate(typeof(M3MaterialCommandBarSample_NestedPage2));
-
-	private void NavigateBack(object sender, RoutedEventArgs e)
-	{
-		// Normally we would've just called `Frame.GoBack();` if we only have a single frame.
-		// However, a nested frame is used to show-case fullscreen sample, so we need some
-		// custom handling to hide the nested frame on back navigation when the stack is empty.
-		Shell.GetForCurrentView()?.BackNavigateFromNestedSample();
-	}
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
deleted file mode 100644
index 4c07041a1..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.M3MaterialCommandBarSample_NestedPage2"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:xamarin="http:/uno.ui/xamarin"
-	  mc:Ignorable="d xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
-		<CommandBar Content="Material Page 2"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButtonStyle}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1" Margin="16">
-			<TextBlock Style="{StaticResource BodySmall}">
-				You can use the back button located on the left side of the CommandBar
-				to navigate back.
-			</TextBlock>
-
-			<Button Content="Navigate Back"
-					Click="NavigateBack" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs
deleted file mode 100644
index 58b77bd3a..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class M3MaterialCommandBarSample_NestedPage2 : Page
-{
-	public M3MaterialCommandBarSample_NestedPage2()
-	{
-		this.InitializeComponent();
-	}
-
-	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems b/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
index b67885b51..dc6be5309 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
@@ -109,18 +109,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Content\Extensions\ControlExtensionsSamplePage.xaml.cs">
       <DependentUpon>ControlExtensionsSamplePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage1.xaml.cs">
-      <DependentUpon>M3MaterialCommandBarSample_NestedPage1.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage1.xaml.cs">
-      <DependentUpon>CommandBarSample_NestedPage1.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage2.xaml.cs">
-      <DependentUpon>M3MaterialCommandBarSample_NestedPage2.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage2.xaml.cs">
-      <DependentUpon>CommandBarSample_NestedPage2.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\MediaPlayerElementSample_NestedPage1.xaml.cs">
       <DependentUpon>MediaPlayerElementSample_NestedPage1.xaml</DependentUpon>
     </Compile>
@@ -291,22 +279,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage1.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage1.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage2.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage2.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\MediaPlayerElementSample_NestedPage1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>