Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -399,3 +399,5 @@ FodyWeavers.xsd
App/Assets/installer_deps.zip
App/meloninstaller.keystore
App/keystore-pass.txt
/.idea
.DS_Store
17 changes: 9 additions & 8 deletions App/MelonLoader.Installer.App.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net9.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<AcceptAndroidSDKLicenses>true</AcceptAndroidSDKLicenses>
<RootNamespace>MelonLoader.Installer.App</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand All @@ -30,25 +31,25 @@
<AndroidSigningKeyStore>meloninstaller.keystore</AndroidSigningKeyStore>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
<ApplicationTitle>MelonLoader Installer</ApplicationTitle>
<ApplicationId>com.lavagang.melonloader.installer</ApplicationId>
<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
<AndroidKeyStore>True</AndroidKeyStore>
<AndroidKeyStore>False</AndroidKeyStore>
<SupportedOSPlatformVersion>27.0</SupportedOSPlatformVersion>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<AndroidSigningStorePass>env:LEMON_KEYSTORE_PASS</AndroidSigningStorePass>
<AndroidSigningKeyAlias>melon</AndroidSigningKeyAlias>
<AndroidSigningKeyPass>env:LEMON_KEYSTORE_PASS</AndroidSigningKeyPass>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows10.0.19041.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-windows10.0.19041.0|AnyCPU'">
<ApplicationTitle>MelonLoader Installer</ApplicationTitle>
<ApplicationId>com.lavagang.melonloader.installer</ApplicationId>
<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
<ApplicationTitle>MelonLoader Installer</ApplicationTitle>
<ApplicationId>com.lavagang.melonloader.installer</ApplicationId>
<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
Expand All @@ -61,7 +62,7 @@
<AndroidSigningKeyPass>env:LEMON_KEYSTORE_PASS</AndroidSigningKeyPass>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows10.0.19041.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-windows10.0.19041.0|AnyCPU'">
<ApplicationTitle>MelonLoader Installer</ApplicationTitle>
<ApplicationId>com.lavagang.melonloader.installer</ApplicationId>
<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
Expand Down
4 changes: 2 additions & 2 deletions App/Utils/PatchRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private static async Task PrepareAssets(string? localUnityDepsPath)

private static async Task<bool> DownloadMelonData(string destination)
{
#if DEBUG

if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "melon_data/melon_data.zip")))
{
_logger?.Log("Using local melon data");
Expand All @@ -220,7 +220,7 @@ private static async Task<bool> DownloadMelonData(string destination)
File.Copy(@"/sdcard/Download/melon_data.zip", destination);
return true;
}
#endif


_logger?.Log("Retrieving release info from GitHub");

Expand Down
2 changes: 1 addition & 1 deletion Core/MelonLoader.Installer.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>MelonLoader.Installer.Core</RootNamespace>
</PropertyGroup>
Expand Down