Update the UWP app main project name

0x5bfa · 0x5bfa · commit 004243125b63 · 2025-12-14T23:45:03.000+09:00
diff --git a/TrayIconFlyout.slnx b/TrayIconFlyout.slnx
@@ -18,14 +18,14 @@
     <Project Path="samples/TrayIconFlyout.Uwp.Sample.Packaging/TrayIconFlyout.Uwp.Sample.Packaging.wapproj" Type="c7167f0d-bc9f-4e6e-afe1-012c56b48db5" Id="8f9f53a2-0cda-4bb2-b6e9-060ce608dfb2">
       <Deploy />
     </Project>
-    <Project Path="samples/TrayIconFlyout.Uwp.Sample.TrayHost/TrayIconFlyout.Uwp.Sample.TrayHost.csproj">
-      <Platform Solution="*|ARM64" Project="arm64" />
+    <Project Path="samples/TrayIconFlyout.Uwp.Sample.App/TrayIconFlyout.Uwp.Sample.App.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
       <Deploy />
     </Project>
-    <Project Path="samples/TrayIconFlyout.Uwp.Sample.SecondaryApp/TrayIconFlyout.Uwp.Sample.SecondaryApp.csproj" Id="669afa0c-a670-4ea7-8e55-cf575002b521">
-      <Platform Solution="*|ARM64" Project="arm64" />
+    <Project Path="samples/TrayIconFlyout.Uwp.Sample.TrayHost/TrayIconFlyout.Uwp.Sample.TrayHost.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
       <Deploy />
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/App2.xaml b/samples/TrayIconFlyout.Uwp.Sample.App/App2.xaml
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/App2.xaml.cs b/samples/TrayIconFlyout.Uwp.Sample.App/App2.xaml.cs
@@ -4,6 +4,7 @@
 using System;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -41,6 +42,8 @@ protected override void OnActivated(IActivatedEventArgs args)
 
 			if (rootFrame.Content == null)
 			{
+				CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = true; 
+				
 				rootFrame.Navigate(typeof(MainPage), args.As<ProtocolActivatedEventArgs>().Data);
 			}
 
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/MainPage.xaml b/samples/TrayIconFlyout.Uwp.Sample.App/MainPage.xaml
@@ -5,7 +5,8 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:U5BFA.Libraries"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
 	mc:Ignorable="d">
 
 	<Grid>
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/MainPage.xaml.cs b/samples/TrayIconFlyout.Uwp.Sample.App/MainPage.xaml.cs
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/Properties/launchSettings.json b/samples/TrayIconFlyout.Uwp.Sample.App/Properties/launchSettings.json
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/RootView.xaml b/samples/TrayIconFlyout.Uwp.Sample.App/RootView.xaml
@@ -0,0 +1,14 @@
+﻿<UserControl
+	x:Class="U5BFA.Libraries.RootView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="using:U5BFA.Libraries"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+	<UserControl.DataContext>
+		<local:RootViewModel x:Name="ViewModel" />
+	</UserControl.DataContext>
+
+	<Grid />
+</UserControl>
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/RootView.xaml.cs b/samples/TrayIconFlyout.Uwp.Sample.App/RootView.xaml.cs
@@ -0,0 +1,15 @@
+﻿// Copyright (c) 0x5BFA. All rights reserved.
+// Licensed under the MIT license.
+
+using Windows.UI.Xaml.Controls;
+
+namespace U5BFA.Libraries
+{
+	public sealed partial class RootView : UserControl
+	{
+		public RootView()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/RootViewModel.cs b/samples/TrayIconFlyout.Uwp.Sample.App/RootViewModel.cs
@@ -0,0 +1,14 @@
+﻿// Copyright (c) 0x5BFA. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace U5BFA.Libraries
+{
+	internal partial class RootViewModel : ObservableObject
+	{
+		internal RootViewModel()
+		{
+		}
+	}
+}
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/TrayIconFlyout.Uwp.Sample.App.csproj b/samples/TrayIconFlyout.Uwp.Sample.App/TrayIconFlyout.Uwp.Sample.App.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 	
 	<PropertyGroup>
 
@@ -26,13 +26,15 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<Manifest Include="$(ApplicationManifest)" />
 		<Page Remove="App2.xaml" />
 		<ApplicationDefinition Include="App2.xaml" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.UI.Xaml" Version="2.8.7" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250402" />
 	</ItemGroup>
 
 </Project>
diff --git a/samples/TrayIconFlyout.Uwp.Sample.App/app.manifest b/samples/TrayIconFlyout.Uwp.Sample.App/app.manifest
diff --git a/samples/TrayIconFlyout.Uwp.Sample.Packaging/TrayIconFlyout.Uwp.Sample.Packaging.wapproj b/samples/TrayIconFlyout.Uwp.Sample.Packaging/TrayIconFlyout.Uwp.Sample.Packaging.wapproj
@@ -20,14 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -36,14 +28,6 @@
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@@ -71,7 +55,7 @@
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TrayIconFlyout.Uwp.Sample.SecondaryApp\TrayIconFlyout.Uwp.Sample.SecondaryApp.csproj">
+    <ProjectReference Include="..\TrayIconFlyout.Uwp.Sample.SecondaryApp\TrayIconFlyout.Uwp.Sample.App.csproj">
       <UseLowTrustEntryPoint>True</UseLowTrustEntryPoint>
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
diff --git a/samples/TrayIconFlyout.Uwp.Sample.TrayHost/TrayIconFlyout.Uwp.Sample.TrayHost.csproj b/samples/TrayIconFlyout.Uwp.Sample.TrayHost/TrayIconFlyout.Uwp.Sample.TrayHost.csproj
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\TrayIconFlyout.Uwp\TrayIconFlyout.Uwp.csproj" />
+		<ProjectReference Include="..\..\src\TrayIconFlyout.Uwp\TrayIconFlyout.Uwp.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/samples/TrayIconFlyout.Wasdk.Sample.App/RootView.xaml.cs b/samples/TrayIconFlyout.Wasdk.Sample.App/RootView.xaml.cs
@@ -1,4 +1,7 @@
-﻿using Microsoft.UI.Xaml.Controls;
+﻿// Copyright (c) 0x5BFA. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
 
 namespace U5BFA.Libraries
 {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using Windows.ApplicationModel;`
`6`	`6`	`using Windows.ApplicationModel.Activation;`
	`7`	`+using Windows.ApplicationModel.Core;`
`7`	`8`	`using Windows.UI.Xaml;`
`8`	`9`	`using Windows.UI.Xaml.Controls;`
`9`	`10`	`using Windows.UI.Xaml.Navigation;`
`@@ -41,6 +42,8 @@ protected override void OnActivated(IActivatedEventArgs args)`
`41`	`42`
`42`	`43`	`if (rootFrame.Content == null)`
`43`	`44`	`{`
	`45`	`+ CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = true;`
	`46`	`+`
`44`	`47`	`rootFrame.Navigate(typeof(MainPage), args.As<ProtocolActivatedEventArgs>().Data);`
`45`	`48`	`}`
`46`	`49`