Merge branch 'MonoGame:main' into main

Author: vchelaru

articles/getting_started/2_choosing_your_ide_vscode.md

@@ -78,9 +78,9 @@ The official Microsoft version includes proprietary features like settings sync,
 
 ## Setting up VS Code for development with MonoGame
 
-1. Open Visual Studio Code
-1. Open up its terminal window (`Ctrl` + `` ` ``)
-1. Run the following command to install MonoGame Templates
+1. Open Visual Studio Code.
+1. Open up its terminal window (`Ctrl` + `` ` ``).
+1. Run the following command to install MonoGame Templates:
 
     ```sh
     dotnet new install MonoGame.Templates.CSharp
@@ -141,15 +141,15 @@ The .NET MAUI extension adds features for building mobile apps, including:
 
 ## Creating a new MonoGame project
 
-1. Open up an empty folder in Visual Studio Code
-2. Open up its terminal window (`Ctrl` + `` ` ``)
+1. Open up an empty folder in Visual Studio Code.
+2. Open up its terminal window (`Ctrl` + `` ` ``).
 3. Run the following command to create an empty project for desktop platforms:
 
     ```sh
     dotnet new mgdesktopgl
     ```
 
-4. Once the files are created, open up the `Game1.cs` file and wait a second for the C# extension to load
+4. Once the files are created, open up the `Game1.cs` file and wait a second for the C# extension to load.
 5. You can now press F5, select C# and then your projects name if Visual Studio Code asks you, and it should start up your brand new game!
 
 ## Update Project Tool references
@@ -159,8 +159,8 @@ The MonoGame Content Editor (MGCB) it a tool delivered through NuGet for your pr
 Once you have created your project you should run the following terminal/command-line command to ensure the tool (and the pipeline) is setup and read for your project:
 
 ```dotnetcli
-    dotnet tool restore
+dotnet tool restore
 ```
 
 > [!NOTE]
-> If you ever change the version of the tools or want to upgrade them by editing the `dotnet-tools.json` configuration, you MUST run this command again to update te tools.
+> If you ever change the version of the tools or want to upgrade them by editing the `dotnet-tools.json` configuration, you MUST run this command again to update the tools.

articles/getting_started/content_pipeline/content_builder_project.md

@@ -153,14 +153,14 @@ Per platform/game project:
 To complete the process, add the following `Target` section to your `csproj` (before the final ```</Project>``` entry):
 
 ```xml
-  <Target Name="BuildContent" BeforeTargets="Build">
+  <Target Name="BuildContent" BeforeTargets="BeforeCompile">
     <PropertyGroup>
       <ContentOutput>$(ProjectDir)$(OutputPath)</ContentOutput>
       <ContentTemp>$(ProjectDir)$(IntermediateOutputPath)</ContentTemp>
       <ContentArgs>build -p $(MonoGamePlatform) -s Assets -o $(ContentOutput) -i $(ContentTemp)</ContentArgs>
     </PropertyGroup>
-    <MSBuild Projects="..\Content\Content.csproj" Targets="Build;Run"
-      Properties="RunArguments=$(ContentArgs);" />
+    <MSBuild Projects="..\Content\Content.csproj" Targets="Build" RemoveProperties="Configuration;TargetFramework;RuntimeIdentifier;RuntimeIdentifiers" />
+    <Exec Command="$(ContentCommand) $(ContentArgs)" WorkingDirectory="$(MSBuildThisFileDirectory)..\" CustomErrorRegularExpression="\[E\] .+" CustomWarningRegularExpression="\[W\] .+" />
   </Target>
 ```
 

articles/getting_started/tools/mgcb_editor.md

@@ -29,7 +29,7 @@ dotnet mgcb-editor
 ```
 
 > [!NOTE]
-> You will need to buid the project at least once in order for the .NET system to download and register the tool with your project utilizing the `dotnet-tools.json` configuration file located in the `.config` folder, or use the `dotnet tool restore` command shown below.
+> You will need to build the project at least once in order for the .NET system to download and register the tool with your project utilizing the `dotnet-tools.json` configuration file located in the `.config` folder, or use the `dotnet tool restore` command shown below.
 >
 > ```sh
 > dotnet tool restore

articles/migration/updating_versions.md

@@ -46,7 +46,7 @@ Alternatively, regardless of the development environment, developers can manuall
 To do this:
 
 1. Open your project's *.csproj* file
-2. Locate the `<PacakgeReference>` elements for any MonoGame referenced packages.
+2. Locate the `<PackageReference>` elements for any MonoGame referenced packages.
 3. Change the `Version=` attribute for each one to the current version of MonoGame (currently this is `3.8.2.1105`)
 4. Save the *.csproj* file.
 

articles/toc.yml

@@ -165,6 +165,29 @@ items:
             href: tutorials/building_2d_games/26_publish_to_itch/index.md
           - name: "27: Conclusion and Next Steps"
             href: tutorials/building_2d_games/27_conclusion/index.md
+      - name: 2D Shaders
+        href: tutorials/advanced/2d_shaders/index.md
+        items:
+          - name: "01: Introduction"
+            href: tutorials/advanced/2d_shaders/01_introduction/index.md
+          - name: "02: Hot Reload"
+            href: tutorials/advanced/2d_shaders/02_hot_reload/index.md
+          - name: "03: The Material Class"
+            href: tutorials/advanced/2d_shaders/03_the_material_class/index.md
+          - name: "04: Debug UI"
+            href: tutorials/advanced/2d_shaders/04_debug_ui/index.md
+          - name: "05: Transition Effect"
+            href: tutorials/advanced/2d_shaders/05_transition_effect/index.md
+          - name: "06: Color Swap Effect"
+            href: tutorials/advanced/2d_shaders/06_color_swap_effect/index.md
+          - name: "07: Sprite Vertex Effect"
+            href: tutorials/advanced/2d_shaders/07_sprite_vertex_effect/index.md
+          - name: "08: Light Effect"
+            href: tutorials/advanced/2d_shaders/08_light_effect/index.md
+          - name: "09: Shadow Effect"
+            href: tutorials/advanced/2d_shaders/09_shadows_effect/index.md
+          - name: "10: Next Steps"
+            href: tutorials/advanced/2d_shaders/10_next_steps/index.md 
   - name: Console Access
     href: console_access.md
   - name: Help and Support

articles/tutorials/advanced/2d_shaders/01_introduction/index.md

@@ -0,0 +1,31 @@
+---
+title: "Chapter 01: Getting Started"
+description: "Prepare your project and get ready"
+---
+
+Welcome to the advanced 2D shaders tutorial! The goal of this series is to explore several concepts in MonoGame's 2D graphics capabilities, specifically with respect to shaders.
+
+## The Starting Code
+
+This tutorial series builds directly on top of the final code from the [Building 2D Games](https://docs.monogame.net/articles/tutorials/building_2d_games/index.html) tutorial. It is essential that you start with this project.
+
+> [!note]
+> You can get the complete starting source code for this tutorial here:
+> [Chapter 27 source code from Building 2D Games tutorial](https://github.com/MonoGame/MonoGame.Samples/tree/3.8.4/Tutorials/learn-monogame-2d/src/27-Conclusion/)
+
+Once you have the code downloaded, open it in your IDE and run the `DungeonSlime` project to make sure everything is working correctly. You should see the title screen from the previous tutorial.
+
+## Project Structure
+
+The solution is currently organized into two main projects:
+
+- **`DungeonSlime`**: The main game project. This contains our game logic and game-specific content.
+- **`MonoGameLibrary`**: Our reusable class library. We will be adding new, generic helper classes here that could be used in any of your future MonoGame projects.
+
+Most of our shader files (`.fx`) will be created in the `Content/effects` folder within the `DungeonSlime` project to start, and later within the `MonoGameLibrary` for shared effects.
+
+## What is Next
+
+Now that our project is set up, we can get to work. The focus for the first several chapters will be to create a workflow for developing shaders in MonoGame. Once we have a hot-reload system, a class to manage the effects, and a debug UI ready, we will carry on and build up 5 effects. The effects will range from simple pixel shaders and vertex shaders up to rendering techniques. As we develop these shaders together, we will build an intuition for how to tackle shader development.
+
+Continue to the next chapter, [Chapter 02: Hot Reload](../02_hot_reload/index.md).