Clean up project files and setup script

btcpayserver · Feb 20, 2025 · a9da978 · a9da978
1 parent d29bef6
commit a9da978
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 152 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -76,7 +76,7 @@ jobs:
         with:
           name: android build
           path: |
-            publish/android
+            publish/android/*Signed.apk*
 
   # build-desktop-win:
   #   runs-on: windows-latest

diff --git a/BTCPayApp.Core/BTCPayApp.Core.csproj b/BTCPayApp.Core/BTCPayApp.Core.csproj
@@ -1,46 +1,39 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
-    <PropertyGroup>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="AsyncKeyedLock" Version="7.1.4" />
-      <PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.1.0" />
-      <PackageReference Include="Laraue.EfCoreTriggers.SqlLite" Version="8.1.2" />
-      <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
-      <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
-      <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-      <PackageReference Include="NBitcoin" Version="7.0.48" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.11" />
-        <PackageReference Include="org.ldk" Version="0.0.123" />
-      <PackageReference Include="TypedSignalR.Client" Version="3.6.0">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.11" />
-      <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
-      <PackageReference Include="VSS" Version="1.0.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Client\BTCPayServer.Client.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Migrations\" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Client\BTCPayServer.Client.csproj"/>
+    <PackageReference Include="AsyncKeyedLock" Version="7.1.4"/>
+    <PackageReference Include="FlexLabs.EntityFrameworkCore.Upsert" Version="8.1.0"/>
+    <PackageReference Include="Laraue.EfCoreTriggers.SqlLite" Version="8.1.2"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1"/>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1"/>
+    <PackageReference Include="NBitcoin" Version="7.0.48"/>
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.11"/>
+    <PackageReference Include="org.ldk" Version="0.0.123"/>
+    <PackageReference Include="TypedSignalR.Client" Version="3.6.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.11"/>
+    <PackageReference Include="VSS" Version="1.0.1"/>
+  </ItemGroup>
 </Project>
diff --git a/BTCPayApp.Maui/BTCPayApp.Maui.csproj b/BTCPayApp.Maui/BTCPayApp.Maui.csproj
@@ -1,95 +1,94 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-    <PropertyGroup>
-        <TargetFrameworks>net8.0-ios;net8.0-android;</TargetFrameworks>
-        <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net8.0-android;</TargetFrameworks>
-        <OutputType>Exe</OutputType>
-        <RootNamespace>BTCPayApp.Maui</RootNamespace>
-        <UseMaui>true</UseMaui>
-        <Nullable>enable</Nullable>
-        <SingleProject>true</SingleProject>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <EnableDefaultCssItems>false</EnableDefaultCssItems>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-ios;net8.0-android;</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net8.0-android;</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>BTCPayApp.Maui</RootNamespace>
+    <UseMaui>true</UseMaui>
+    <Nullable>enable</Nullable>
+    <SingleProject>true</SingleProject>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <EnableDefaultCssItems>false</EnableDefaultCssItems>
 
-        <!-- Display name -->
-        <ApplicationTitle>BTCPay Server</ApplicationTitle>
+    <!-- Display name -->
+    <ApplicationTitle>BTCPay Server</ApplicationTitle>
 
-        <!-- App Identifier -->
-        <ApplicationId>org.btcpayserver.BTCPayApp</ApplicationId>
-        <ApplicationIdGuid>8DD71ACC-C78F-44AB-937A-6B3A19D7E78E</ApplicationIdGuid>
-        <RunAOTCompilation>false</RunAOTCompilation>
+    <!-- App Identifier -->
+    <ApplicationId>org.btcpayserver.BTCPayApp</ApplicationId>
+    <ApplicationIdGuid>8DD71ACC-C78F-44AB-937A-6B3A19D7E78E</ApplicationIdGuid>
+    <RunAOTCompilation>false</RunAOTCompilation>
 
-        <!-- Versions -->
-        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-        <ApplicationVersion>1</ApplicationVersion>
+    <!-- Versions -->
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <ApplicationVersion>1</ApplicationVersion>
 
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
-    </PropertyGroup>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-        <ArchiveOnBuild>true</ArchiveOnBuild>
-        <RuntimeIdentifiers>ios-arm64</RuntimeIdentifiers>
-        <UseInterpreter>True</UseInterpreter>
-        <EnableAssemblyILStripping>false</EnableAssemblyILStripping>
-    </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+    <ArchiveOnBuild>true</ArchiveOnBuild>
+    <RuntimeIdentifiers>ios-arm64</RuntimeIdentifiers>
+    <UseInterpreter>True</UseInterpreter>
+    <EnableAssemblyILStripping>false</EnableAssemblyILStripping>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-        <AndroidUseAapt2>True</AndroidUseAapt2>
-        <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
-        <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
-        <AndroidPackageFormat>apk</AndroidPackageFormat>
-        <EmbedAssempbliesIntoApk>True</EmbedAssempbliesIntoApk>
-        <Optimize>False</Optimize>
-        <PublishTrimmed>False</PublishTrimmed>
-    </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+    <AndroidUseAapt2>True</AndroidUseAapt2>
+    <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
+    <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
+    <AndroidPackageFormat>apk</AndroidPackageFormat>
+    <Optimize>False</Optimize>
+    <PublishTrimmed>False</PublishTrimmed>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' And $(Configuration) == 'Debug'">
-        <DebugSymbols>True</DebugSymbols>
-    </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' And $(Configuration) == 'Debug'">
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' And '$(Configuration)' == 'Release'">
-        <AndroidKeyStore>True</AndroidKeyStore>
-        <AndroidSigningKeyStore>../btcpayapp.keystore</AndroidSigningKeyStore>
-        <AndroidSigningKeyAlias>btcpayapp</AndroidSigningKeyAlias>
-        <AndroidSigningKeyPass>env:ANDROID_SIGNING_PASSWORD</AndroidSigningKeyPass>
-        <AndroidSigningStorePass>env:ANDROID_SIGNING_PASSWORD</AndroidSigningStorePass>
-    </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' And '$(Configuration)' == 'Release'">
+    <AndroidKeyStore>True</AndroidKeyStore>
+    <AndroidSigningKeyStore>../btcpayapp.keystore</AndroidSigningKeyStore>
+    <AndroidSigningKeyAlias>btcpayapp</AndroidSigningKeyAlias>
+    <AndroidSigningKeyPass>env:ANDROID_SIGNING_PASSWORD</AndroidSigningKeyPass>
+    <AndroidSigningStorePass>env:ANDROID_SIGNING_PASSWORD</AndroidSigningStorePass>
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <!-- App Icon -->
-        <!-- Splash Screen -->
-        <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF"/>
-        <!-- Images -->
-        <MauiImage Include="Resources\Images\*"/>
-        <!-- Custom Fonts -->
-        <MauiFont Include="Resources\Fonts\*"/>
-        <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)"/>
-    </ItemGroup>
+  <ItemGroup>
+    <!-- App Icon -->
+    <!-- Splash Screen -->
+    <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#FFFFFF"/>
+    <!-- Images -->
+    <MauiImage Include="Resources\Images\*"/>
+    <!-- Custom Fonts -->
+    <MauiFont Include="Resources\Fonts\*"/>
+    <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj"/>
-        <ProjectReference Include="..\BTCPayApp.UI\BTCPayApp.UI.csproj"/>
-    </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"/>
+  </ItemGroup>
 
-    <ItemGroup>
-        <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)"/>
-    </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"/>
-    </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+    <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"/>
+  </ItemGroup>
 </Project>
diff --git a/BTCPayApp.UI/BTCPayApp.UI.csproj b/BTCPayApp.UI/BTCPayApp.UI.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
@@ -8,28 +7,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SupportedPlatform Include="browser" />
+    <SupportedPlatform Include="browser"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="blazor-dragdrop" Version="2.6.1" />
-    <PackageReference Include="Fluxor.Blazor.Web" Version="6.1.0" />
-    <PackageReference Include="Fluxor.Blazor.Web.ReduxDevTools" Version="6.1.0" />
-    <PackageReference Include="LNURL" Version="0.0.36" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="8.0.11" />
-    <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="ReactorBlazorQRCodeScanner" Version="1.0.7" />
-    <PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
+    <EmbeddedResource Include="Util\Currencies.json"/>
+    <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj"/>
+    <PackageReference Include="blazor-dragdrop" Version="2.6.1"/>
+    <PackageReference Include="Fluxor.Blazor.Web" Version="6.1.0"/>
+    <PackageReference Include="Fluxor.Blazor.Web.ReduxDevTools" Version="6.1.0"/>
+    <PackageReference Include="LNURL" Version="0.0.36"/>
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.11"/>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="8.0.11"/>
+    <PackageReference Include="QRCoder" Version="1.6.0"/>
+    <PackageReference Include="ReactorBlazorQRCodeScanner" Version="1.0.7"/>
+    <PackageReference Include="Plugin.Fingerprint" Version="3.0.0-beta.1"/>
   </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <EmbeddedResource Include="Util\Currencies.json" />
-    </ItemGroup>
 </Project>
diff --git a/BTCPayServer.Plugins.App/BTCPayServer.Plugins.App.csproj b/BTCPayServer.Plugins.App/BTCPayServer.Plugins.App.csproj
@@ -33,7 +33,10 @@
     <ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Client\BTCPayServer.Client.csproj" />
     <ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Data\BTCPayServer.Data.csproj" />
     <ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
-    <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj" />
+    <ProjectReference Include="..\BTCPayApp.Core\BTCPayApp.Core.csproj">
+      <Private>true</Private>
+      <ExcludeAssets>none</ExcludeAssets>
+    </ProjectReference>
     <EmbeddedResource Include="Resources\**" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.65.0"/>
     <PackageReference Include="Laraue.EfCoreTriggers.PostgreSql" Version="8.0.3" />

diff --git a/setup.sh b/setup.sh
@@ -14,11 +14,7 @@ if [ ! -f $appsettings ]; then
     echo '{ "DEBUG_PLUGINS": "../../../BTCPayServer.Plugins.App/bin/Debug/net8.0/BTCPayServer.Plugins.App.dll" }' > $appsettings
 fi
 
-# Build the core and plugin to share their dependencies with the server
-cd BTCPayApp.Core
-dotnet publish -c Debug -o ../BTCPayServer.Plugins.App/bin/Debug/net8.0
-cd -
-
+# Publish plugin to share its dependencies with the server
 cd BTCPayServer.Plugins.App
 dotnet publish -c Debug -o bin/Debug/net8.0
 cd -