Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

these are the changes the successfully build for android #153

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −22
Open

these are the changes the successfully build for android #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Net;
using System.Net;
using System.Net.WebSockets;
using BTCPayApp.Core.Auth;
using BTCPayApp.Core.Backup;
Expand All @@ -20,7 +20,7 @@
ILogger<BTCPayConnectionManager> logger,
BTCPayAppServerClient btcPayAppServerClient,
IBTCPayAppHubClient btcPayAppServerClientInterface,
ISecureConfigProvider secureProvider,

Check warning on line 23 in BTCPayApp.Core/BTCPayServer/BTCPayConnectionManager.cs

View workflow job for this annotation

GitHub Actions / test-desktop 

Parameter 'secureProvider' is unread.
ConfigProvider configProvider,
SyncService syncService)
: BaseHostedService(logger), IHubConnectionObserver
Expand Down
52 changes: 31 additions & 21 deletions BTCPayApp.Maui/BTCPayApp.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ApplicationTitle>BTCPay Server</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>org.btcpayserver.BTCPayApp</ApplicationId>
<ApplicationId>org.btcpayserver.BTCPayApp.test</ApplicationId>
<ApplicationIdGuid>8DD71ACC-C78F-44AB-937A-6B3A19D7E78E</ApplicationIdGuid>
<RunAOTCompilation>false</RunAOTCompilation>

Expand Down Expand Up @@ -56,40 +56,50 @@
<AndroidSigningStorePass>env:ANDROID_SIGNING_PASSWORD</AndroidSigningStorePass>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<DebugSymbols>False</DebugSymbols>
<AndroidKeyStore>False</AndroidKeyStore>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF"/>
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF" />
<!-- Images -->
<MauiImage Include="Resources\Images\*"/>
<MauiImage Include="Resources\Images\*" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*"/>
<MauiFont Include="Resources\Fonts\*" />
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)"/>
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj"/>
<ProjectReference Include="..\BTCPayApp.UI\BTCPayApp.UI.csproj"/>
<PackageReference Include="org.ldk" Version="0.0.123"/>
<PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2"/>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100"/>
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.100"/>
<ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj" />
<ProjectReference Include="..\BTCPayApp.UI\BTCPayApp.UI.csproj" />
<PackageReference Include="org.ldk" Version="0.0.123" />
<PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.100" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<Compile Remove="**\iOS\**\*.cs"/>
<None Include="**\iOS\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
<Compile Remove="**\iOS\**\*.cs" />
<None Include="**\iOS\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
<Compile Remove="**\Android\**\*.cs"/>
<None Include="**\Android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10"/>
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.10"/>
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10"/>
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10"/>
<Compile Remove="**\Android\**\*.cs" />
<None Include="**\Android\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.core" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
</ItemGroup>
</Project>
Loading