From 677b244a3f0d94aa27796bd990bcbb18da14bb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AC=E5=BD=A6=E8=B5=A4=E5=B1=8B=E5=85=88?=
 <kimihikoakaya@gmail.com>
Date: Mon, 11 Nov 2024 20:41:59 +0900
Subject: [PATCH] XAML resource merging fix

---
 Amethyst/Amethyst.csproj      | 14 ++++++++++++--
 Amethyst/Package.appxmanifest |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Amethyst/Amethyst.csproj b/Amethyst/Amethyst.csproj
index 32003ea..51b0fbe 100644
--- a/Amethyst/Amethyst.csproj
+++ b/Amethyst/Amethyst.csproj
@@ -28,8 +28,8 @@
 		<Description>Amethyst (Desktop) App</Description>
 		<PackageProjectUrl>k2vr.tech</PackageProjectUrl>
 		<!--AZ_BUILD_DATA<Version>AZ_BUILD_NUMBER</Version>AZ_BUILD_DATA-->
-		<FileVersion>1.2.16.0</FileVersion>
-		<AssemblyVersion>1.2.16.0</AssemblyVersion>
+		<FileVersion>1.3.0.0</FileVersion>
+		<AssemblyVersion>1.3.0.0</AssemblyVersion>
 		<RepositoryUrl>https://github.com/KinectToVR/Amethyst</RepositoryUrl>
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
 	</PropertyGroup>
@@ -235,6 +235,16 @@
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 	</ItemGroup>
+	<ItemGroup>
+		<Page Remove="$(ProjectDir)\Plugins\**\*.xaml" />
+		<Compile Remove="$(ProjectDir)\Plugins\**\*.xaml" />
+		<None Include="$(ProjectDir)\Plugins\**\*.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<Page Remove="$(ProjectDir)\Plugins\**\*.pri" />
+		<Compile Remove="$(ProjectDir)\Plugins\**\*.pri" />
+		<None Include="$(ProjectDir)\Plugins\**\*.pri" />
+	</ItemGroup>
 	<ProjectExtensions>
 		<VisualStudio>
 			<UserProperties assets_4strings_4it_1json__JsonSchema="https://api.airplane.dev/v0/schemas/task.json" />
diff --git a/Amethyst/Package.appxmanifest b/Amethyst/Package.appxmanifest
index 6c0a501..b2b1269 100644
--- a/Amethyst/Package.appxmanifest
+++ b/Amethyst/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="11835K2VRTeam.Amethyst-OpenSourceBodyTracking"
     Publisher="CN=91B2E3DA-4470-40D2-806F-0A45A7911612"
-    Version="1.2.16.0" />
+    Version="1.3.0.0" />
 
   <Properties>
     <DisplayName>Amethyst - Open Source Body Tracking</DisplayName>