diff --git a/Source/Full/.vscode/launch.json b/Source/Full/.vscode/launch.json index 3ce19bd..8bc621b 100644 --- a/Source/Full/.vscode/launch.json +++ b/Source/Full/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "buildDesktopGL", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net6/GameName.dll", + "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net8/GameName.dll", "args": [], "cwd": "${workspaceFolder}/Platforms/DesktopGL", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window @@ -23,7 +23,7 @@ "request": "launch", "preLaunchTask": "buildWindowsDX", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net6-windows/GameName.dll", + "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net8-windows/GameName.dll", "args": [], "cwd": "${workspaceFolder}/Platforms/WindowsDX", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window @@ -36,7 +36,7 @@ "request": "launch", "preLaunchTask": "buildPipeline", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Platforms/Pipeline/bin/Debug/net6/Pipeline.dll", + "program": "${workspaceFolder}/Platforms/Pipeline/bin/Debug/net8/Pipeline.dll", "args": ["-i", "Game/Assets", "-r", "Platforms/Pipeline/bin", "-o", "Assets", "-l", "Game/Layer1"], "cwd": "${workspaceFolder}", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window diff --git a/Source/Full/Game/Layer1/GameRoot.cs b/Source/Full/Game/Layer1/GameRoot.cs index 9125cbb..c46684e 100644 --- a/Source/Full/Game/Layer1/GameRoot.cs +++ b/Source/Full/Game/Layer1/GameRoot.cs @@ -10,8 +10,9 @@ namespace GameProject { public class GameRoot : Game { public GameRoot() { - _graphics = new GraphicsDeviceManager(this); - _graphics.GraphicsProfile = GraphicsProfile.HiDef; + _graphics = new GraphicsDeviceManager(this) { + GraphicsProfile = GraphicsProfile.HiDef + }; IsMouseVisible = true; Content.RootDirectory = "Content"; @@ -190,10 +191,5 @@ private void RestoreWindow() { new KeyboardCondition(Keys.Enter) ); ICondition _toggleBorderless = new KeyboardCondition(Keys.F11); - - private static JsonSerializerOptions _options = new JsonSerializerOptions { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - WriteIndented = true, - }; } } diff --git a/Source/Full/Game/Layer1/Settings.cs b/Source/Full/Game/Layer1/Settings.cs index 9ad57ba..66c8650 100644 --- a/Source/Full/Game/Layer1/Settings.cs +++ b/Source/Full/Game/Layer1/Settings.cs @@ -12,7 +12,7 @@ public class Settings { public bool IsBorderless { get; set; } = false; } - [JsonSourceGenerationOptionsAttribute( + [JsonSourceGenerationOptions( PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase, WriteIndented = true)] [JsonSerializable(typeof(Settings))] diff --git a/Source/Full/Platforms/DesktopGL/DesktopGL.csproj b/Source/Full/Platforms/DesktopGL/DesktopGL.csproj index e08b9d0..e276835 100644 --- a/Source/Full/Platforms/DesktopGL/DesktopGL.csproj +++ b/Source/Full/Platforms/DesktopGL/DesktopGL.csproj @@ -2,7 +2,7 @@ WinExe - net6 + net8 GameName Icon.ico app.manifest @@ -10,7 +10,7 @@ true false false - win10-x64;linux-x64;osx-x64 + win-x64;linux-x64;osx-x64 diff --git a/Source/Full/Platforms/Pipeline/Pipeline.csproj b/Source/Full/Platforms/Pipeline/Pipeline.csproj index b4fbec5..167b162 100644 --- a/Source/Full/Platforms/Pipeline/Pipeline.csproj +++ b/Source/Full/Platforms/Pipeline/Pipeline.csproj @@ -2,7 +2,7 @@ Exe - net6 + net8 diff --git a/Source/Full/Platforms/WindowsDX/WindowsDX.csproj b/Source/Full/Platforms/WindowsDX/WindowsDX.csproj index 4febc21..953e582 100644 --- a/Source/Full/Platforms/WindowsDX/WindowsDX.csproj +++ b/Source/Full/Platforms/WindowsDX/WindowsDX.csproj @@ -2,7 +2,7 @@ WinExe - net6-windows + net8-windows GameName Icon.ico app.manifest diff --git a/Source/Simple/.vscode/launch.json b/Source/Simple/.vscode/launch.json index 32b1222..e11347b 100644 --- a/Source/Simple/.vscode/launch.json +++ b/Source/Simple/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "buildDesktopGL", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net6/GameName.dll", + "program": "${workspaceFolder}/Platforms/DesktopGL/bin/Debug/net8/GameName.dll", "args": [], "cwd": "${workspaceFolder}/Platforms/DesktopGL", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window @@ -23,7 +23,7 @@ "request": "launch", "preLaunchTask": "buildWindowsDX", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net6-windows/GameName.dll", + "program": "${workspaceFolder}/Platforms/WindowsDX/bin/Debug/net8-windows/GameName.dll", "args": [], "cwd": "${workspaceFolder}/Platforms/WindowsDX", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window diff --git a/Source/Simple/Game/GameRoot.cs b/Source/Simple/Game/GameRoot.cs index 9125cbb..c46684e 100644 --- a/Source/Simple/Game/GameRoot.cs +++ b/Source/Simple/Game/GameRoot.cs @@ -10,8 +10,9 @@ namespace GameProject { public class GameRoot : Game { public GameRoot() { - _graphics = new GraphicsDeviceManager(this); - _graphics.GraphicsProfile = GraphicsProfile.HiDef; + _graphics = new GraphicsDeviceManager(this) { + GraphicsProfile = GraphicsProfile.HiDef + }; IsMouseVisible = true; Content.RootDirectory = "Content"; @@ -190,10 +191,5 @@ private void RestoreWindow() { new KeyboardCondition(Keys.Enter) ); ICondition _toggleBorderless = new KeyboardCondition(Keys.F11); - - private static JsonSerializerOptions _options = new JsonSerializerOptions { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - WriteIndented = true, - }; } } diff --git a/Source/Simple/Game/Settings.cs b/Source/Simple/Game/Settings.cs index 9ad57ba..66c8650 100644 --- a/Source/Simple/Game/Settings.cs +++ b/Source/Simple/Game/Settings.cs @@ -12,7 +12,7 @@ public class Settings { public bool IsBorderless { get; set; } = false; } - [JsonSourceGenerationOptionsAttribute( + [JsonSourceGenerationOptions( PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase, WriteIndented = true)] [JsonSerializable(typeof(Settings))] diff --git a/Source/Simple/Platforms/DesktopGL/DesktopGL.csproj b/Source/Simple/Platforms/DesktopGL/DesktopGL.csproj index 3b4bd00..9923ee4 100644 --- a/Source/Simple/Platforms/DesktopGL/DesktopGL.csproj +++ b/Source/Simple/Platforms/DesktopGL/DesktopGL.csproj @@ -2,7 +2,7 @@ WinExe - net6 + net8 GameName Icon.ico app.manifest @@ -10,7 +10,7 @@ true false false - win10-x64;linux-x64;osx-x64 + win-x64;linux-x64;osx-x64 diff --git a/Source/Simple/Platforms/WindowsDX/WindowsDX.csproj b/Source/Simple/Platforms/WindowsDX/WindowsDX.csproj index ef3943d..bc71906 100644 --- a/Source/Simple/Platforms/WindowsDX/WindowsDX.csproj +++ b/Source/Simple/Platforms/WindowsDX/WindowsDX.csproj @@ -2,7 +2,7 @@ WinExe - net6-windows + net8-windows GameName Icon.ico app.manifest