From 5196ca4acedcc7a0b0ea55ccb543b743c5454b6e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 18 Dec 2025 20:33:30 +0000 Subject: [PATCH 1/4] Initial plan From 443a0c15457fab52e2e3c24581cfc7d89d71bc41 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 18 Dec 2025 20:40:57 +0000 Subject: [PATCH 2/4] Add .NET 10 compatibility for static web assets in Web projects Co-authored-by: sven-n <5238610+sven-n@users.noreply.github.com> --- src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj | 1 + src/Web/Map/MUnique.OpenMU.Web.Map.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj index 59a7d88ac..9bb05a803 100644 --- a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj +++ b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj @@ -6,6 +6,7 @@ nullable;CS4014;VSTHRD110;VSTHRD100 false false + _content/$(MSBuildProjectName) diff --git a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj index 752906b59..35b429818 100644 --- a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj +++ b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj @@ -9,6 +9,7 @@ false True + _content/$(MSBuildProjectName) From f939dc9b8e6ab37d39151906d0a291c47f9c10da Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 18 Dec 2025 21:12:14 +0000 Subject: [PATCH 3/4] Add comments explaining StaticWebAssetBasePath workaround for .NET 10 compatibility Co-authored-by: sven-n <5238610+sven-n@users.noreply.github.com> --- src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj | 4 ++++ src/Web/Map/MUnique.OpenMU.Web.Map.csproj | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj index 9bb05a803..89d24d171 100644 --- a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj +++ b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj @@ -6,6 +6,10 @@ nullable;CS4014;VSTHRD110;VSTHRD100 false false + _content/$(MSBuildProjectName) diff --git a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj index 35b429818..f001d5929 100644 --- a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj +++ b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj @@ -9,6 +9,10 @@ false True + _content/$(MSBuildProjectName) From 9028016e4e3976f1cdcc7253f22032dc1deaadb7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 18 Dec 2025 21:16:26 +0000 Subject: [PATCH 4/4] Clarify comments: fix applies to both .NET 9 conflicts and .NET 10+ compatibility Co-authored-by: sven-n <5238610+sven-n@users.noreply.github.com> --- src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj | 5 +++-- src/Web/Map/MUnique.OpenMU.Web.Map.csproj | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj index 89d24d171..b27f7cdc2 100644 --- a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj +++ b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj @@ -7,8 +7,9 @@ false false _content/$(MSBuildProjectName) diff --git a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj index f001d5929..d65660477 100644 --- a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj +++ b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj @@ -10,8 +10,9 @@ True _content/$(MSBuildProjectName)