diff --git a/MonoGame.Framework.Content.Pipeline/MonoGame.Content.Builder.targets b/MonoGame.Framework.Content.Pipeline/MonoGame.Content.Builder.targets index f6d4988e538..a21a9fe6de9 100644 --- a/MonoGame.Framework.Content.Pipeline/MonoGame.Content.Builder.targets +++ b/MonoGame.Framework.Content.Pipeline/MonoGame.Content.Builder.targets @@ -53,6 +53,7 @@ '$(MonoGamePlatform)' != 'WindowsPhone8' And '$(MonoGamePlatform)' != 'RaspberryPi' And '$(MonoGamePlatform)' != 'PlayStation4' And + '$(MonoGamePlatform)' != 'PlayStation5' And '$(MonoGamePlatform)' != 'XboxOne' And '$(MonoGamePlatform)' != 'WindowsGL'" /> diff --git a/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.csproj b/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.csproj index ed733bd635d..26e68312ce6 100644 --- a/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.csproj +++ b/MonoGame.Framework.Content.Pipeline/MonoGame.Framework.Content.Pipeline.csproj @@ -236,6 +236,7 @@ + diff --git a/MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs b/MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs index defd3901be8..520b8677252 100644 --- a/MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs +++ b/MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs @@ -52,6 +52,7 @@ public sealed class ContentWriter : BinaryWriter 'M', // WindowsPhone8 'r', // RaspberryPi 'P', // PlayStation4 + '5', // PlayStation5 'O', // XboxOne 'S', // Nintendo Switch 'G', // Google Stadia diff --git a/MonoGame.Framework.Content.Pipeline/TargetPlatform.cs b/MonoGame.Framework.Content.Pipeline/TargetPlatform.cs index c63c71c6812..e16d8451ffb 100644 --- a/MonoGame.Framework.Content.Pipeline/TargetPlatform.cs +++ b/MonoGame.Framework.Content.Pipeline/TargetPlatform.cs @@ -78,7 +78,12 @@ public enum TargetPlatform /// Sony PlayStation4 /// PlayStation4, - + + /// + /// Sony PlayStation5 + /// + PlayStation5, + /// /// Xbox One /// diff --git a/MonoGame.Framework/Content/ContentManager.cs b/MonoGame.Framework/Content/ContentManager.cs index 42887ea4e07..406c25fd611 100644 --- a/MonoGame.Framework/Content/ContentManager.cs +++ b/MonoGame.Framework/Content/ContentManager.cs @@ -47,6 +47,7 @@ public partial class ContentManager : IDisposable 'M', // WindowsPhone8 'r', // RaspberryPi 'P', // PlayStation4 + '5', // PlayStation5 'O', // XboxOne 'S', // Nintendo Switch 'G', // Google Stadia diff --git a/MonoGame.Framework/Utilities/MonoGamePlatform.cs b/MonoGame.Framework/Utilities/MonoGamePlatform.cs index 51e17c44855..3048d47802c 100644 --- a/MonoGame.Framework/Utilities/MonoGamePlatform.cs +++ b/MonoGame.Framework/Utilities/MonoGamePlatform.cs @@ -54,6 +54,11 @@ public enum MonoGamePlatform /// PlayStation4, + /// + /// MonoGame PlayStation 5 platform. + /// + PlayStation5, + /// /// MonoGame Nintendo Switch platform. /// diff --git a/MonoGame.Framework/Utilities/PlatformInfo.cs b/MonoGame.Framework/Utilities/PlatformInfo.cs index 28081a70bf1..e984bb4fd21 100644 --- a/MonoGame.Framework/Utilities/PlatformInfo.cs +++ b/MonoGame.Framework/Utilities/PlatformInfo.cs @@ -36,6 +36,8 @@ public static MonoGamePlatform MonoGamePlatform return MonoGamePlatform.XboxOne; #elif PLAYSTATION4 return MonoGamePlatform.PlayStation4; +#elif PLAYSTATION5 + return MonoGamePlatform.PlayStation5; #elif STADIA return MonoGamePlatform.Stadia; #endif diff --git a/README.md b/README.md index 94f19d09e73..672feef02ee 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ We support a growing list of platforms across the desktop, mobile, and console s * Windows Phone 10 (UWP) * Consoles (for registered developers) * PlayStation 4 + * PlayStation 5 * Xbox One (both UWP and XDK) * Nintendo Switch * Google Stadia diff --git a/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj b/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj index 873de325637..5e21e16c42f 100644 --- a/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj +++ b/Tools/MonoGame.Effect.Compiler/MonoGame.Effect.Compiler.csproj @@ -76,6 +76,7 @@ + diff --git a/Tools/MonoGame.Tools.Tests/TestCompiler.cs b/Tools/MonoGame.Tools.Tests/TestCompiler.cs index 19d42c8efa3..bba121e4e15 100644 --- a/Tools/MonoGame.Tools.Tests/TestCompiler.cs +++ b/Tools/MonoGame.Tools.Tests/TestCompiler.cs @@ -63,6 +63,7 @@ protected override Stream OpenStream(string assetName) TargetPlatform.WindowsPhone8, TargetPlatform.RaspberryPi, TargetPlatform.PlayStation4, + TargetPlatform.PlayStation5, TargetPlatform.XboxOne, TargetPlatform.Switch, TargetPlatform.Web