From 109806fb36cd1389c79ab08d1cd42a7477dc6cb8 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 19 Dec 2025 18:05:23 +0100 Subject: [PATCH 1/4] .net 10 --- FModel/FModel.csproj | 2 +- FModel/FModel.sln | 37 ------------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 FModel/FModel.sln diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 552ce20d..b19e2a4b 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net10.0-windows true FModel.ico 4.4.4.0 diff --git a/FModel/FModel.sln b/FModel/FModel.sln deleted file mode 100644 index 238d1b59..00000000 --- a/FModel/FModel.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31912.275 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FModel", "FModel.csproj", "{B1F494EA-90A6-4C24-800E-2F724A1884CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse", "..\CUE4Parse\CUE4Parse\CUE4Parse.csproj", "{C4620341-BBB7-4384-AC7D-5082D3E0386E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUE4Parse-Conversion", "..\CUE4Parse\CUE4Parse-Conversion\CUE4Parse-Conversion.csproj", "{D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B1F494EA-90A6-4C24-800E-2F724A1884CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1F494EA-90A6-4C24-800E-2F724A1884CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1F494EA-90A6-4C24-800E-2F724A1884CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1F494EA-90A6-4C24-800E-2F724A1884CA}.Release|Any CPU.Build.0 = Release|Any CPU - {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4620341-BBB7-4384-AC7D-5082D3E0386E}.Release|Any CPU.Build.0 = Release|Any CPU - {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0E1E8F7-F56D-469A-8E24-C2439B9FFD83}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {53DB7A15-4E15-4575-9402-0110BDF2794E} - EndGlobalSection -EndGlobal From ec15a983c132c68844a2fe7535f6829f6994a135 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 19 Dec 2025 18:06:25 +0100 Subject: [PATCH 2/4] use adonis fork instead of nuget packages --- .gitmodules | 3 +++ FModel/FModel.csproj | 4 ++-- FModel/FModel.slnx | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2221fc41..6f7f679d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "CUE4Parse"] path = CUE4Parse url = https://github.com/FabianFG/CUE4Parse +[submodule "Adonis"] + path = Adonis + url = https://github.com/FModel/adonis-ui diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index b19e2a4b..81a199a3 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -150,8 +150,6 @@ - - @@ -173,6 +171,8 @@ + + diff --git a/FModel/FModel.slnx b/FModel/FModel.slnx index ca74a91b..48be1ac4 100644 --- a/FModel/FModel.slnx +++ b/FModel/FModel.slnx @@ -1,4 +1,6 @@ + + From 874078c11b5bb82bb24e79ce1ae86ebb77b6b5e4 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 19 Dec 2025 18:14:05 +0100 Subject: [PATCH 3/4] adonis fork --- Adonis | 1 + 1 file changed, 1 insertion(+) create mode 160000 Adonis diff --git a/Adonis b/Adonis new file mode 160000 index 00000000..ca374f32 --- /dev/null +++ b/Adonis @@ -0,0 +1 @@ +Subproject commit ca374f32f71718d4662ff86bd9720c710666d5e0 From 3e4db888510e3d54e6b717a0998f9cece0ea0e61 Mon Sep 17 00:00:00 2001 From: Marlon Date: Fri, 19 Dec 2025 18:17:32 +0100 Subject: [PATCH 4/4] updated workflows to .net 10 --- .github/workflows/main.yml | 4 ++-- .github/workflows/qa.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8e8e6de..f0389930 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,10 +21,10 @@ jobs: - name: Fetch Submodules Recursively run: git submodule update --init --recursive - - name: .NET 8 Setup + - name: .NET 10 Setup uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: .NET Restore run: dotnet restore FModel diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 3898ed70..b5acda65 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -14,10 +14,10 @@ jobs: with: submodules: 'recursive' - - name: .NET 8 Setup + - name: .NET 10 Setup uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: .NET Restore run: dotnet restore "./FModel/FModel.slnx"