From ab2a2cb4543afe6045720431ddc3112f917fd939 Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Thu, 13 Jun 2024 17:32:05 -0500
Subject: [PATCH] Use UIX.Asm from submodule

---
 ZuneShell.sln              | 19 +++++++++++++++++++
 ZuneShell/ZuneShell.csproj |  6 +++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ZuneShell.sln b/ZuneShell.sln
index 762c581..b169906 100644
--- a/ZuneShell.sln
+++ b/ZuneShell.sln
@@ -23,6 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIX.Asm", "..\..\yoshiask\ZuneUIXTools\libs\UIX.Asm\UIX.Asm.csproj", "{9589AAC1-D006-4985-87BD-960F90867482}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,22 @@ Global
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x64.Build.0 = Release|Any CPU
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.ActiveCfg = Release|Any CPU
 		{90A89707-927E-48D2-BFEB-84F95F531258}.Release|x86.Build.0 = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|ARM32.ActiveCfg = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|ARM32.Build.0 = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x64.Build.0 = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Debug|x86.Build.0 = Debug|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|ARM32.ActiveCfg = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|ARM32.Build.0 = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|x64.ActiveCfg = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|x64.Build.0 = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|x86.ActiveCfg = Release|Any CPU
+		{9589AAC1-D006-4985-87BD-960F90867482}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -155,6 +173,7 @@ Global
 		{78A8B08C-C0E9-4BAC-9AF6-58D3A55C05C9} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 		{CB2B7609-C7B8-4E2A-82D8-DD631B70B621} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 		{90A89707-927E-48D2-BFEB-84F95F531258} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
+		{9589AAC1-D006-4985-87BD-960F90867482} = {7640D6FE-600E-44BE-A59F-E90602FA7754}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6B948258-B457-4B3D-955E-05ED3F03CF36}
diff --git a/ZuneShell/ZuneShell.csproj b/ZuneShell/ZuneShell.csproj
index 51c3173..753f572 100644
--- a/ZuneShell/ZuneShell.csproj
+++ b/ZuneShell/ZuneShell.csproj
@@ -12,6 +12,8 @@
         <FileAlignment>512</FileAlignment>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        
+        <DefineConstants>$(DefineConstants);DEBUG_TRANSPORT</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
@@ -22,6 +24,7 @@
         <Reference Include="UIXControls">
             <HintPath>C:\Program Files\Zune\UIXcontrols.dll</HintPath>
         </Reference>
+
         <ProjectReference Include="..\libs\MicrosoftIris\UIX\UIX.csproj" />
 
         <!--
@@ -33,7 +36,8 @@
             <HintPath>C:\Program Files\Zune\ZuneDBApi.dll</HintPath>
         </Reference>
 
-        <PackageReference Include="UIX.Asm" Version="0.0.1-beta" />
+        <ProjectReference Include="..\..\..\yoshiask\ZuneUIXTools\libs\UIX.Asm\UIX.Asm.csproj" />
+        <!--<PackageReference Include="UIX.Asm" Version="0.0.2-beta" />-->
         
         <PackageReference Include="StrixMusic.Sdk" Version="0.1.0-alpha" />
         <Reference Include="StrixMusic.Cores.Storage">