Skip to content

Commit b622bfe

Browse files
committed
Frontend.Maui: use Mali packages
Reference Mali nuget packages instead of projects in maui submodule.
1 parent 182695e commit b622bfe

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/GWallet.Frontend.Maui/GWallet.Frontend.Maui.fsproj

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,19 @@
4848

4949
<PropertyGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
5050
<UseMaui>false</UseMaui>
51-
<MauiSubmodulePath>$(MSBuildProjectDirectory)\..\..\dependencies\maui\</MauiSubmodulePath>
52-
<_MauiBuildTasksLocation>$(MauiSubmodulePath).nuspec\</_MauiBuildTasksLocation>
5351
<GtkProjectFolder>Platforms\Gtk\</GtkProjectFolder>
5452
</PropertyGroup>
5553

5654
<ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
5755
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
5856
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
59-
<ProjectReference Include="$(MauiSubmodulePath)src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj" />
60-
<ProjectReference Include="$(MauiSubmodulePath)src\Essentials\src\Essentials.csproj" />
61-
<ProjectReference Include="$(MauiSubmodulePath)src\Controls\src\Core\Controls.Core.csproj" />
62-
<ProjectReference Include="$(MauiSubmodulePath)src\Controls\src\Xaml\Controls.Xaml.csproj" />
63-
<ProjectReference Include="$(MauiSubmodulePath)src\Core\src\Core.csproj" />
64-
<ProjectReference Include="$(MauiSubmodulePath)src\Compatibility\Core\src\Compatibility.csproj" />
65-
<ProjectReference Include="$(MauiSubmodulePath)src\Controls\Foldable\src\Controls.Foldable.csproj" />
66-
<ProjectReference Include="$(MauiSubmodulePath)src\Controls\Maps\src\Controls.Maps.csproj" />
57+
<PackageReference Include="Mali.AspNetCore.Components.WebView" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
58+
<PackageReference Include="Mali.Essentials" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
59+
<PackageReference Include="Mali.Controls.Core" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
60+
<PackageReference Include="Mali.Controls.Xaml" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
61+
<PackageReference Include="Mali.Core" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
62+
<PackageReference Include="Mali.Controls.Compatibility" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
63+
<PackageReference Include="Mali.Controls.Foldable" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
6764
</ItemGroup>
6865

6966
<ItemGroup>
@@ -224,8 +221,8 @@
224221
</ItemGroup>
225222

226223
<ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
227-
<ProjectReference Include="$(MauiSubmodulePath)src\ZXing.Net.Maui\ZXing.Net.MAUI\ZXing.Net.MAUI.csproj" />
228-
<ProjectReference Include="$(MauiSubmodulePath)src\ZXing.Net.Maui\ZXing.Net.MAUI.Controls\ZXing.Net.MAUI.Controls.csproj" />
224+
<PackageReference Include="Mali.ZXing" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
225+
<PackageReference Include="Mali.ZXing.Controls" Version="8.0.41--date20241204-0106.git-8c7b4d5" />
229226
</ItemGroup>
230227

231228
<ItemGroup Condition="$(TargetPlatformIdentifier) == 'gtk'">
@@ -275,7 +272,5 @@
275272
<ItemGroup>
276273
<ProjectReference Include="..\GWallet.Backend\GWallet.Backend.fsproj" />
277274
</ItemGroup>
278-
279-
<Import Condition="$(TargetPlatformIdentifier) == 'gtk'" Project="$(MauiSubmodulePath)src\Maui.InTree.props" />
280275

281276
</Project>

0 commit comments

Comments
 (0)