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.

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

Infra: Multi-platform support #36

Draft
wants to merge 54 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
5af849e
create new core lib for multi platform
NoobNotFound Jul 8, 2024
c749d5a
add some files to CoreX
NoobNotFound Jul 8, 2024
f33b9e4
Moved to .Net 8
NoobNotFound Jul 8, 2024
85bb0d3
Remove win10 runtime condition
Lamparter Jul 12, 2024
7867dab
[CodeFactor] Apply fixes
code-factor Jul 12, 2024
caa5fe4
Update README.md
Lamparter Jul 13, 2024
7aa85c9
Update Emerald.App.csproj
0x5bfa Jul 13, 2024
13c2ffb
Merge branch 'main' into cross-platform
Lamparter Jul 13, 2024
20ed0cd
Merge branch 'main' into cross-platform
Lamparter Jul 14, 2024
4f0ce52
Merge branch 'main' into cross-platform
Lamparter Jul 14, 2024
9ec98d8
Merge branch 'main' into cross-platform
Lamparter Jul 14, 2024
00d6049
Merge branch 'main' into cross-platform
Lamparter Jul 14, 2024
d05fb35
Add fluent themed blank Uno app (maccatalyst, desktop)
NoobNotFound Jul 17, 2024
0642c5a
Remove Uno Platform project
Lamparter Jul 18, 2024
28eb041
Add universal solution
Lamparter Jul 18, 2024
4cce0a3
Rename CI
Lamparter Jul 18, 2024
3859bb1
Modify solution to include projects
Lamparter Jul 18, 2024
e5313a5
Update gitignore
Lamparter Jul 18, 2024
4a72c70
Rename CI
Lamparter Jul 18, 2024
e54b196
Rename CI
Lamparter Jul 18, 2024
d0dd261
Rename CI
Lamparter Jul 18, 2024
71bb783
Completely modify the modrinth store managing system
NoobNotFound Aug 8, 2024
6b9caab
[CodeFactor] Apply fixes
code-factor Aug 8, 2024
e7d8b84
add suppport for loading different categories to different types in s…
NoobNotFound Aug 8, 2024
5310d98
apply code fix
NoobNotFound Aug 8, 2024
5e1476f
undo 1 change
NoobNotFound Aug 8, 2024
05b9a09
👷 Implement central package management (#42)
Lamparter Aug 22, 2024
da23505
declare verison in InstallerPage
NoobNotFound Aug 22, 2024
e38d23a
remove the need of `GithubClientID`
NoobNotFound Aug 22, 2024
ae1f893
fix some typos in mod downloader, update some dependencies
HymnalTeminal Aug 22, 2024
2e9e7a4
[CodeFactor] Apply fixes
code-factor Aug 22, 2024
6f9843c
👔 Fix header identity typo
Lamparter Aug 24, 2024
d99d1b9
Merge branch 'main' into cross-platform
Lamparter Aug 25, 2024
56c1770
Merge branch 'main' into cross-platform
Lamparter Aug 25, 2024
bbbba85
➕ Upgrade from Newtonsoft.Json to System.Text.Json (#45)
Lamparter Aug 25, 2024
30945be
Merge branch 'main' into cross-platform
Lamparter Aug 28, 2024
4744f3e
add summaries to Mod stores methods
HymnalTeminal Aug 30, 2024
03233e4
Merge branch 'cross-platform' of https://github.com/RiversideValley/E…
NoobNotFound Aug 30, 2024
00254c1
update dependencies
NoobNotFound Aug 30, 2024
2f8a808
improve the stability of the mod downloader by creating a helper file…
NoobNotFound Aug 30, 2024
a41cb82
[CodeFactor] Apply fixes (#49)
codefactor-io[bot] Sep 1, 2024
117778b
🔀 📸 Add hero image to `README.md` (#51)
Lamparter Sep 2, 2024
af4d4c2
Merge branch 'main' into cross-platform
Lamparter Sep 2, 2024
3b8b4ba
rename IMinecraftStore to IModrinthStore
NoobNotFound Sep 2, 2024
567a207
fix a bug in `CoreX.Helpers.FileDownloader`, `VerifyFileIntegrityAsy…
NoobNotFound Sep 2, 2024
44018f3
remove unwanted file
NoobNotFound Sep 2, 2024
f151c66
🔀 Merge branch 'main' into cross-platform
Lamparter Sep 13, 2024
ac23225
some updates on Uno UI
NoobNotFound Oct 6, 2024
c3739c3
apply fixes for Navview in Uno
NoobNotFound Oct 7, 2024
19469e0
navbar changes
NoobNotFound Oct 14, 2024
a3228d3
Fix label not unloading Navviews
NoobNotFound Oct 24, 2024
4a0fb60
add converters to Uno app
NoobNotFound Oct 28, 2024
ddb892d
Rename Emerald namsepace to Emerald.Uno + Some updates
NoobNotFound Oct 29, 2024
ea84310
Undo namespace rename
NoobNotFound Oct 29, 2024
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
5 changes: 3 additions & 2 deletions Emerald.App/Emerald.App/Emerald.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>Emerald.WinUI</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
NoobNotFound marked this conversation as resolved.
Show resolved Hide resolved
<UseWinUI>true</UseWinUI>
<Configurations>Debug;Release</Configurations>
<Nullable>enable</Nullable>
Expand Down
25 changes: 10 additions & 15 deletions Emerald.Core/Emerald.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows10.0.22000.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Emerald.Core</RootNamespace>
<Configurations>Debug;Release</Configurations>
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
<RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CmlLib.Core" Version="3.3.10" />
<PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
<PackageReference Include="ProjBobcat" Version="1.16.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CmlLib.Core" Version="3.3.10" />
<PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" />
<PackageReference Include="ProjBobcat" Version="1.16.0" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion Emerald.Core/Launcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Emerald.Core.Tasks;
using ProjBobcat.Class.Model.Optifine;
using System.ComponentModel;
using Windows.System;
using ProgressChangedEventArgs = Emerald.Core.Args.ProgressChangedEventArgs;

namespace Emerald.Core
Expand Down
13 changes: 13 additions & 0 deletions Emerald.CoreX/Core.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Microsoft.Extensions.Logging;
using CmlLib.Core;
using CmlLib.Core.VersionMetadata;
namespace Emerald.CoreX;

public class Core(ILogger logger)
{
public MinecraftLauncher Launcher { get; set; }
public void InitializeLauncher()
{
Launcher = new MinecraftLauncher();
}
}
15 changes: 15 additions & 0 deletions Emerald.CoreX/Emerald.CoreX.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Lamparter marked this conversation as resolved.
Show resolved Hide resolved
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CmlLib.Core" Version="4.0.0" />
<PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="ProjBobcat" Version="1.16.0" />
</ItemGroup>
</Project>
18 changes: 18 additions & 0 deletions Emerald.CoreX/Enums/MCVersionType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Enums
{
public enum MCVersionType
{
Vanilla,
Fabric,
Lite,
Forge,
Optifine,
Undefined
}
}
12 changes: 12 additions & 0 deletions Emerald.CoreX/Installers/Fabric.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Installers
{
internal class Fabric : IModLoaderInstaller
{
}
}
12 changes: 12 additions & 0 deletions Emerald.CoreX/Installers/Forge.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Installers
{
internal class Forge : IModLoaderInstaller
{
}
}
13 changes: 13 additions & 0 deletions Emerald.CoreX/Installers/IModLoaderInstaller.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Installers
{
internal interface IModLoaderInstaller
{

Check notice on line 10 in Emerald.CoreX/Installers/IModLoaderInstaller.cs

View check run for this annotation

codefactor.io / CodeFactor

Emerald.CoreX/Installers/IModLoaderInstaller.cs#L10

An opening brace should not be followed by a blank line. (SA1505)

}

Check notice on line 12 in Emerald.CoreX/Installers/IModLoaderInstaller.cs

View check run for this annotation

codefactor.io / CodeFactor

Emerald.CoreX/Installers/IModLoaderInstaller.cs#L12

A closing brace should not be preceded by a blank line. (SA1508)
}
12 changes: 12 additions & 0 deletions Emerald.CoreX/Installers/LiteLoader.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Installers
{
internal class LiteLoader: IModLoaderInstaller
{
}
}
12 changes: 12 additions & 0 deletions Emerald.CoreX/Installers/Optifine.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Installers
{
internal class Optifine : IModLoaderInstaller
{
}
}
30 changes: 30 additions & 0 deletions Emerald.CoreX/Models/MCVersion.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using CmlLib.Core.Version;
using CmlLib.Core.VersionMetadata;
using CommunityToolkit.Mvvm.ComponentModel;
using Emerald.CoreX.Enums;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX.Models
{
public partial class MCVersion
{
public MCVersionType Type { get; private set; }
public MVersionType ReleaseType { get; private set; }

public string Name { get; private set; }

public string DisplayName { get; set; }

public IVersionMetadata Metadata { get; private set; }

public bool Local { get; private set; }

public MCVersion[] Subversions { get; private set; }

}

Check notice on line 29 in Emerald.CoreX/Models/MCVersion.cs

View check run for this annotation

codefactor.io / CodeFactor

Emerald.CoreX/Models/MCVersion.cs#L29

A closing brace should not be preceded by a blank line. (SA1508)
}
12 changes: 12 additions & 0 deletions Emerald.CoreX/Modrinth.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Emerald.CoreX
{
internal class Modrinth
{
}
}
22 changes: 22 additions & 0 deletions Emerald.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{2BB1
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib", "CMLLib\CmlLib\CmlLib.csproj", "{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emerald.CoreX", "Emerald.CoreX\Emerald.CoreX.csproj", "{13795E09-8131-4716-9EBC-970952E9F360}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -123,6 +125,26 @@ Global
{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x64.Build.0 = Release|Any CPU
{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.ActiveCfg = Release|Any CPU
{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.Build.0 = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.ActiveCfg = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.Build.0 = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.Build.0 = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.ActiveCfg = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.Build.0 = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.ActiveCfg = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.Build.0 = Debug|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.ActiveCfg = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.Build.0 = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.ActiveCfg = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.Build.0 = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.ActiveCfg = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.Build.0 = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.ActiveCfg = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.Build.0 = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.ActiveCfg = Release|Any CPU
{13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading