From 74e6cf5dbffecebe2de66d30e04a002d330d924b Mon Sep 17 00:00:00 2001 From: Pear-231 <61670316+Pear-231@users.noreply.github.com> Date: Sun, 2 Nov 2025 20:59:22 +0000 Subject: [PATCH] Change Notes: - Updated to .NET 10. --- AssetEditor/AssetEditor.csproj | 2 +- AssetEditor/Properties/PublishProfiles/FolderProfile.pubxml | 2 +- Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj | 2 +- Editors/AnimationMeta/Editors.AnimationMeta.csproj | 2 +- .../Editors.AnimatioReTarget/Editors.AnimatioReTarget.csproj | 2 +- .../Test.AnimatioReTarget/Test.AnimatioReTarget.csproj | 2 +- Editors/Audio/Editors.Audio.csproj | 2 +- .../Editors.DatabaseEditor/Editors.DatabaseEditor.csproj | 2 +- .../Utility.DatabaseSchemaGenerator.csproj | 2 +- .../Editors.ImportExport/Editors.ImportExport.csproj | 2 +- .../Test.ImportExport/Test.ImportExport.csproj | 2 +- .../Kitbashing/KitbasherEditor/Editors.KitbasherEditor.csproj | 2 +- .../Kitbashing/Test.KitbashEditor/Test.KitbashEditor.csproj | 2 +- Editors/Reports/Editors.Reports.csproj | 2 +- Editors/Shared/Editors.Shared.Core/Editors.Shared.Core.csproj | 2 +- .../Editors.AnimationTextEditors.csproj | 2 +- .../Editor.VisualSkeletonEditor.csproj | 2 +- .../Test.SkeletonEditor/Test.SkeletonEditor.csproj | 2 +- Editors/TextureEditor/Editors.TextureEditor.csproj | 2 +- Editors/TwuiEditor/Editor.Twui/Editors.Twui.csproj | 2 +- GameWorld/ContentProject/ContentProject.csproj | 2 +- GameWorld/MeshDecimator/MeshDecimator.csproj | 2 +- GameWorld/View3D/GameWorld.Core.csproj | 2 +- Shared/EmbeddedResources/Shared.EmbeddedResources.csproj | 2 +- Shared/GameFiles/Shared.GameFormats.csproj | 2 +- Shared/SharedCore/Shared.Core.csproj | 2 +- Shared/SharedUI/Shared.Ui.csproj | 2 +- Testing/E2EVerification/Test.E2EVerification.csproj | 2 +- Testing/GameWorld.Core.Test/Test.GameWorld.Core.csproj | 2 +- Testing/Shared.Core.Test/Test.Shared.Core.csproj | 2 +- Testing/Shared/Shared/WpfGameMock.cs | 4 ++-- Testing/Shared/Test.TestingUtility.csproj | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/AssetEditor/AssetEditor.csproj b/AssetEditor/AssetEditor.csproj index 8c81e80bb..4b8f2463c 100644 --- a/AssetEditor/AssetEditor.csproj +++ b/AssetEditor/AssetEditor.csproj @@ -2,7 +2,7 @@ Exe preview - net9.0-windows + net10.0-windows true AssetEditorIcon.ico true diff --git a/AssetEditor/Properties/PublishProfiles/FolderProfile.pubxml b/AssetEditor/Properties/PublishProfiles/FolderProfile.pubxml index 3ba6d2a8d..945bac00c 100644 --- a/AssetEditor/Properties/PublishProfiles/FolderProfile.pubxml +++ b/AssetEditor/Properties/PublishProfiles/FolderProfile.pubxml @@ -4,7 +4,7 @@ Any CPU ..\Publish\AssetEditor FileSystem - net9.0-windows + net10.0-windows true win-x64 true diff --git a/Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj b/Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj index db8efd6c8..ff5af88d7 100644 --- a/Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj +++ b/Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/AnimationMeta/Editors.AnimationMeta.csproj b/Editors/AnimationMeta/Editors.AnimationMeta.csproj index a32d0e574..b515da389 100644 --- a/Editors/AnimationMeta/Editors.AnimationMeta.csproj +++ b/Editors/AnimationMeta/Editors.AnimationMeta.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true diff --git a/Editors/AnimationReTarget/Editors.AnimatioReTarget/Editors.AnimatioReTarget.csproj b/Editors/AnimationReTarget/Editors.AnimatioReTarget/Editors.AnimatioReTarget.csproj index 3de513c05..820d37dc5 100644 --- a/Editors/AnimationReTarget/Editors.AnimatioReTarget/Editors.AnimatioReTarget.csproj +++ b/Editors/AnimationReTarget/Editors.AnimatioReTarget/Editors.AnimatioReTarget.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/AnimationReTarget/Test.AnimatioReTarget/Test.AnimatioReTarget.csproj b/Editors/AnimationReTarget/Test.AnimatioReTarget/Test.AnimatioReTarget.csproj index 1ac233578..9bc5e5767 100644 --- a/Editors/AnimationReTarget/Test.AnimatioReTarget/Test.AnimatioReTarget.csproj +++ b/Editors/AnimationReTarget/Test.AnimatioReTarget/Test.AnimatioReTarget.csproj @@ -2,7 +2,7 @@ - net9.0-windows + net10.0-windows latest enable enable diff --git a/Editors/Audio/Editors.Audio.csproj b/Editors/Audio/Editors.Audio.csproj index 630b86b88..de1c282fa 100644 --- a/Editors/Audio/Editors.Audio.csproj +++ b/Editors/Audio/Editors.Audio.csproj @@ -2,7 +2,7 @@ - net9.0-windows + net10.0-windows true diff --git a/Editors/DatabaseEditor/Editors.DatabaseEditor/Editors.DatabaseEditor.csproj b/Editors/DatabaseEditor/Editors.DatabaseEditor/Editors.DatabaseEditor.csproj index f11a39637..cc6db8abd 100644 --- a/Editors/DatabaseEditor/Editors.DatabaseEditor/Editors.DatabaseEditor.csproj +++ b/Editors/DatabaseEditor/Editors.DatabaseEditor/Editors.DatabaseEditor.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable diff --git a/Editors/DatabaseEditor/Utility.DatabaseSchemaGenerator/Utility.DatabaseSchemaGenerator.csproj b/Editors/DatabaseEditor/Utility.DatabaseSchemaGenerator/Utility.DatabaseSchemaGenerator.csproj index feeeb9063..1691378be 100644 --- a/Editors/DatabaseEditor/Utility.DatabaseSchemaGenerator/Utility.DatabaseSchemaGenerator.csproj +++ b/Editors/DatabaseEditor/Utility.DatabaseSchemaGenerator/Utility.DatabaseSchemaGenerator.csproj @@ -2,7 +2,7 @@ Exe - net9.0-windows + net10.0-windows enable enable diff --git a/Editors/ImportExportEditor/Editors.ImportExport/Editors.ImportExport.csproj b/Editors/ImportExportEditor/Editors.ImportExport/Editors.ImportExport.csproj index bb9a9ed0f..54eea7063 100644 --- a/Editors/ImportExportEditor/Editors.ImportExport/Editors.ImportExport.csproj +++ b/Editors/ImportExportEditor/Editors.ImportExport/Editors.ImportExport.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable true diff --git a/Editors/ImportExportEditor/Test.ImportExport/Test.ImportExport.csproj b/Editors/ImportExportEditor/Test.ImportExport/Test.ImportExport.csproj index 91c832c60..c51e905be 100644 --- a/Editors/ImportExportEditor/Test.ImportExport/Test.ImportExport.csproj +++ b/Editors/ImportExportEditor/Test.ImportExport/Test.ImportExport.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows latest enable enable diff --git a/Editors/Kitbashing/KitbasherEditor/Editors.KitbasherEditor.csproj b/Editors/Kitbashing/KitbasherEditor/Editors.KitbasherEditor.csproj index 99de6c0f8..b7ec24eec 100644 --- a/Editors/Kitbashing/KitbasherEditor/Editors.KitbasherEditor.csproj +++ b/Editors/Kitbashing/KitbasherEditor/Editors.KitbasherEditor.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/Kitbashing/Test.KitbashEditor/Test.KitbashEditor.csproj b/Editors/Kitbashing/Test.KitbashEditor/Test.KitbashEditor.csproj index 969155c67..97d4ec0f5 100644 --- a/Editors/Kitbashing/Test.KitbashEditor/Test.KitbashEditor.csproj +++ b/Editors/Kitbashing/Test.KitbashEditor/Test.KitbashEditor.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/Reports/Editors.Reports.csproj b/Editors/Reports/Editors.Reports.csproj index 2280df466..2eb780511 100644 --- a/Editors/Reports/Editors.Reports.csproj +++ b/Editors/Reports/Editors.Reports.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable diff --git a/Editors/Shared/Editors.Shared.Core/Editors.Shared.Core.csproj b/Editors/Shared/Editors.Shared.Core/Editors.Shared.Core.csproj index 1d246fe61..3dd5794a2 100644 --- a/Editors/Shared/Editors.Shared.Core/Editors.Shared.Core.csproj +++ b/Editors/Shared/Editors.Shared.Core/Editors.Shared.Core.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable true diff --git a/Editors/SimpleAnimationEditors/Editors.AnimationTextEditors.csproj b/Editors/SimpleAnimationEditors/Editors.AnimationTextEditors.csproj index ff0051325..ce3f8f36a 100644 --- a/Editors/SimpleAnimationEditors/Editors.AnimationTextEditors.csproj +++ b/Editors/SimpleAnimationEditors/Editors.AnimationTextEditors.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/SkeletonEditor/Editor.VisualSkeletonEditor/Editor.VisualSkeletonEditor.csproj b/Editors/SkeletonEditor/Editor.VisualSkeletonEditor/Editor.VisualSkeletonEditor.csproj index 599a29004..e07d6d968 100644 --- a/Editors/SkeletonEditor/Editor.VisualSkeletonEditor/Editor.VisualSkeletonEditor.csproj +++ b/Editors/SkeletonEditor/Editor.VisualSkeletonEditor/Editor.VisualSkeletonEditor.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows true enable enable diff --git a/Editors/SkeletonEditor/Test.SkeletonEditor/Test.SkeletonEditor.csproj b/Editors/SkeletonEditor/Test.SkeletonEditor/Test.SkeletonEditor.csproj index 1976dd06e..ea7ed928a 100644 --- a/Editors/SkeletonEditor/Test.SkeletonEditor/Test.SkeletonEditor.csproj +++ b/Editors/SkeletonEditor/Test.SkeletonEditor/Test.SkeletonEditor.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows latest enable enable diff --git a/Editors/TextureEditor/Editors.TextureEditor.csproj b/Editors/TextureEditor/Editors.TextureEditor.csproj index cebcafd71..839200b44 100644 --- a/Editors/TextureEditor/Editors.TextureEditor.csproj +++ b/Editors/TextureEditor/Editors.TextureEditor.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true enable diff --git a/Editors/TwuiEditor/Editor.Twui/Editors.Twui.csproj b/Editors/TwuiEditor/Editor.Twui/Editors.Twui.csproj index 3552ecce0..c27ca8bb7 100644 --- a/Editors/TwuiEditor/Editor.Twui/Editors.Twui.csproj +++ b/Editors/TwuiEditor/Editor.Twui/Editors.Twui.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows preview true enable diff --git a/GameWorld/ContentProject/ContentProject.csproj b/GameWorld/ContentProject/ContentProject.csproj index ccb6f3b59..65e0d41ef 100644 --- a/GameWorld/ContentProject/ContentProject.csproj +++ b/GameWorld/ContentProject/ContentProject.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows diff --git a/GameWorld/MeshDecimator/MeshDecimator.csproj b/GameWorld/MeshDecimator/MeshDecimator.csproj index 44b7ec22b..49c1ac3e2 100644 --- a/GameWorld/MeshDecimator/MeshDecimator.csproj +++ b/GameWorld/MeshDecimator/MeshDecimator.csproj @@ -1,7 +1,7 @@ - net9.0-windows + net10.0-windows diff --git a/GameWorld/View3D/GameWorld.Core.csproj b/GameWorld/View3D/GameWorld.Core.csproj index cac973ede..9a34e94dd 100644 --- a/GameWorld/View3D/GameWorld.Core.csproj +++ b/GameWorld/View3D/GameWorld.Core.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable true enable diff --git a/Shared/EmbeddedResources/Shared.EmbeddedResources.csproj b/Shared/EmbeddedResources/Shared.EmbeddedResources.csproj index ae8e4d38f..ec2045533 100644 --- a/Shared/EmbeddedResources/Shared.EmbeddedResources.csproj +++ b/Shared/EmbeddedResources/Shared.EmbeddedResources.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable true diff --git a/Shared/GameFiles/Shared.GameFormats.csproj b/Shared/GameFiles/Shared.GameFormats.csproj index 1b3159c91..9fb842aba 100644 --- a/Shared/GameFiles/Shared.GameFormats.csproj +++ b/Shared/GameFiles/Shared.GameFormats.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable preview diff --git a/Shared/SharedCore/Shared.Core.csproj b/Shared/SharedCore/Shared.Core.csproj index be887969d..b5f64cac4 100644 --- a/Shared/SharedCore/Shared.Core.csproj +++ b/Shared/SharedCore/Shared.Core.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable enable diff --git a/Shared/SharedUI/Shared.Ui.csproj b/Shared/SharedUI/Shared.Ui.csproj index 8351ec05c..0a8b0b5e9 100644 --- a/Shared/SharedUI/Shared.Ui.csproj +++ b/Shared/SharedUI/Shared.Ui.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows true enable preview diff --git a/Testing/E2EVerification/Test.E2EVerification.csproj b/Testing/E2EVerification/Test.E2EVerification.csproj index 0eb84e2ba..ab5b2bfde 100644 --- a/Testing/E2EVerification/Test.E2EVerification.csproj +++ b/Testing/E2EVerification/Test.E2EVerification.csproj @@ -1,7 +1,7 @@ - net9.0-windows + net10.0-windows enable enable diff --git a/Testing/GameWorld.Core.Test/Test.GameWorld.Core.csproj b/Testing/GameWorld.Core.Test/Test.GameWorld.Core.csproj index d1d5d79fb..3388296df 100644 --- a/Testing/GameWorld.Core.Test/Test.GameWorld.Core.csproj +++ b/Testing/GameWorld.Core.Test/Test.GameWorld.Core.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows enable false true diff --git a/Testing/Shared.Core.Test/Test.Shared.Core.csproj b/Testing/Shared.Core.Test/Test.Shared.Core.csproj index 0c9dda87b..e04553149 100644 --- a/Testing/Shared.Core.Test/Test.Shared.Core.csproj +++ b/Testing/Shared.Core.Test/Test.Shared.Core.csproj @@ -1,7 +1,7 @@  - net9.0-windows + net10.0-windows latest enable enable diff --git a/Testing/Shared/Shared/WpfGameMock.cs b/Testing/Shared/Shared/WpfGameMock.cs index bad7aeb17..0c59cb49f 100644 --- a/Testing/Shared/Shared/WpfGameMock.cs +++ b/Testing/Shared/Shared/WpfGameMock.cs @@ -22,9 +22,9 @@ public WpfGameMock() var mock = new GraphicsDeviceServiceMock(); var services = new GameServiceContainer(); services.AddService(mock); - var fullPath = PathHelper.GetDataFolder("GameWorld\\ContentProject\\bin\\Debug\\net9.0-windows\\Content"); + var fullPath = PathHelper.GetDataFolder("GameWorld\\ContentProject\\bin\\Debug\\net10.0-windows\\Content"); - //var fullPath = Path.GetFullPath(@"..\..\..\..\..\GameWorld\ContentProject\bin\Debug\net9.0-windows\Content"); + //var fullPath = Path.GetFullPath(@"..\..\..\..\..\GameWorld\ContentProject\bin\Debug\net10.0-windows\Content"); if (Directory.Exists(fullPath) == false) { throw new Exception("Unable to determine full path of content folder"); diff --git a/Testing/Shared/Test.TestingUtility.csproj b/Testing/Shared/Test.TestingUtility.csproj index a8409c937..a04408827 100644 --- a/Testing/Shared/Test.TestingUtility.csproj +++ b/Testing/Shared/Test.TestingUtility.csproj @@ -1,7 +1,7 @@ - net9.0-windows + net10.0-windows enable enable