Skip to content

Commit

Permalink
Frontend.Maui,.gitmodules,scripts: use Mali pckgs
Browse files Browse the repository at this point in the history
Reference Mali nuget packages instead of projects in maui
submodule.

Remove maui submodule that is no longer used.
  • Loading branch information
webwarrior-ws committed Dec 12, 2024
1 parent 6e0f7c3 commit 4a64604
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 24 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion dependencies/maui
Submodule maui deleted from 8f182d
4 changes: 0 additions & 4 deletions scripts/prepare_maui_gtk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ../..
3 changes: 1 addition & 2 deletions scripts/sanitycheck.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
23 changes: 9 additions & 14 deletions src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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'">
Expand Down Expand Up @@ -275,7 +272,5 @@
<ItemGroup>
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj" />
</ItemGroup>

<Import Condition="$(TargetPlatformIdentifier) == 'gtk'" Project="$(MauiSubmodulePath)src\Maui.InTree.props" />

</Project>

0 comments on commit 4a64604

Please sign in to comment.