From 4a646047a9510b69d5f8b3a98a60becb908f0455 Mon Sep 17 00:00:00 2001
From: webwarrior <reg@webwarrior.ws>
Date: Mon, 25 Nov 2024 12:54:18 +0100
Subject: [PATCH] Frontend.Maui,.gitmodules,scripts: use Mali pckgs

Reference Mali nuget packages instead of projects in maui
submodule.

Remove maui submodule that is no longer used.
---
 .gitmodules                                   |  3 ---
 dependencies/maui                             |  1 -
 scripts/prepare_maui_gtk.sh                   |  4 ----
 scripts/sanitycheck.fsx                       |  3 +--
 .../GWallet.Frontend.Maui.fsproj              | 23 ++++++++-----------
 5 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 160000 dependencies/maui

diff --git a/.gitmodules b/.gitmodules
index fc4f30f5f..6eeb6f830 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "scripts/fsx"]
 	path = scripts/fsx
 	url = https://github.com/nblockchain/fsx.git
-[submodule "dependencies/maui"]
-	path = dependencies/maui
-	url = https://github.com/nblockchain/Mali.git
diff --git a/dependencies/maui b/dependencies/maui
deleted file mode 160000
index 8f182da5a..000000000
--- a/dependencies/maui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f182da5aa02d9ccf4e2c5c8c0cf793ba28156a7
diff --git a/scripts/prepare_maui_gtk.sh b/scripts/prepare_maui_gtk.sh
index 333746ed7..acf8cff7a 100755
--- a/scripts/prepare_maui_gtk.sh
+++ b/scripts/prepare_maui_gtk.sh
@@ -13,7 +13,3 @@ chmod 764 $WORKLOAD_MANIFEST_DIR/*
 dotnet workload search
 dotnet workload install gtk --skip-manifest-update
 
-#Add Maui Nuget source
-cd dependencies/maui
-dotnet nuget add source --name nuget https://api.nuget.org/v3/index.json
-cd ../..
diff --git a/scripts/sanitycheck.fsx b/scripts/sanitycheck.fsx
index e97373cdb..e532580c3 100755
--- a/scripts/sanitycheck.fsx
+++ b/scripts/sanitycheck.fsx
@@ -94,8 +94,7 @@ let FindOffendingPrintfUsage () =
             "src{1}GWallet.Frontend.Console{0}" +
             "src{1}GWallet.Frontend.Maui{0}" +
             "src{1}GWallet.Backend.Tests{0}" +
-            "src{1}GWallet.Backend{1}FSharpUtil.fs{0}" +
-            "dependencies",
+            "src{1}GWallet.Backend{1}FSharpUtil.fs{0}",
             Path.PathSeparator,
             Path.DirectorySeparatorChar
         )
diff --git a/src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj b/src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj
index 649828fe6..0e683b12d 100644
--- a/src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj
+++ b/src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj
@@ -48,22 +48,19 @@
 
   <PropertyGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
     <UseMaui>false</UseMaui>
-    <MauiSubmodulePath>$(MSBuildProjectDirectory)\..\..\dependencies\maui\</MauiSubmodulePath>
-    <_MauiBuildTasksLocation>$(MauiSubmodulePath).nuspec\</_MauiBuildTasksLocation>
     <GtkProjectFolder>Platforms\Gtk\</GtkProjectFolder>
   </PropertyGroup>
 
   <ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Essentials\src\Essentials.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Controls\src\Core\Controls.Core.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Controls\src\Xaml\Controls.Xaml.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Core\src\Core.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Compatibility\Core\src\Compatibility.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Controls\Foldable\src\Controls.Foldable.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\Controls\Maps\src\Controls.Maps.csproj" />
+    <PackageReference Include="Mali.AspNetCore.Components.WebView" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Essentials" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Controls.Core" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Controls.Xaml" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Core" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Controls.Compatibility" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.Controls.Foldable" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
   </ItemGroup>
 
   <ItemGroup>
@@ -224,8 +221,8 @@
   </ItemGroup>
   
   <ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
-    <ProjectReference Include="$(MauiSubmodulePath)src\ZXing.Net.Maui\ZXing.Net.MAUI\ZXing.Net.MAUI.csproj" />
-    <ProjectReference Include="$(MauiSubmodulePath)src\ZXing.Net.Maui\ZXing.Net.MAUI.Controls\ZXing.Net.MAUI.Controls.csproj" />
+    <PackageReference Include="Mali.ZXing" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
+    <PackageReference Include="Mali.ZXing.Controls" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
@@ -275,7 +272,5 @@
   <ItemGroup>
     <ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj" />
   </ItemGroup>
-  
-  <Import Condition="$(TargetPlatformIdentifier) == 'gtk'" Project="$(MauiSubmodulePath)src\Maui.InTree.props" />
 
 </Project>