Merge branch 'main' into main

Author: SimonDarksideJ

articles/getting_started/1_setting_up_your_os_for_development_macos.md

@@ -52,7 +52,7 @@ MonoGame provides a setup script that can be executed to setup the Wine environm
 1. Enter the following command:
 
     ```sh
-    brew install wget p7zip curl && brew install --cask wine-stable
+    brew install wget p7zip curl && brew install --cask wine-stable && xattr -dr com.apple.quarantine "/Applications/Wine Stable.app"
     ```
 
 1. Now that the prerequisites are installed, download the [mgfxc_wine_setup.sh](https://monogame.net/downloads/net9_mgfxc_wine_setup.sh) script and execute it by entering the following command in the terminal:

articles/migration/migrate_38.md

@@ -92,7 +92,7 @@ Please note that you cannot use the ```3.8.1.*``` wildcard in the ```dotnet-tool
 You will also need to add this to your ```.csproj```:
 
 ```xml
-  <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
+  <Target Name="RestoreDotnetTools" BeforeTargets="CollectPackageReferences">
     <Message Text="Restoring dotnet tools" Importance="High" />
     <Exec Command="dotnet tool restore" />
   </Target>

articles/tutorials/building_2d_games/01_what_is_monogame/index.md

@@ -20,8 +20,8 @@ Today, MonoGame is a mature cross-platform framework, that is built with the spi
 |    ![Figure 1-1: Celeste](./images/celeste.png)     | ![Figure 1-2: Stardew Valley](./images/stardew-valley.png) |
 | :-------------------------------------------------: | :--------------------------------------------------------: |
 |               **Figure 1-1 Celeste.**               |               **Figure 1-2: Stardew Valley**               |
-| ![Figure 1-3: Streets of Rage 4](./images/sor4.jpg) |        [Figure 1-4: Bastion](./images/bastion.jpg)         |
-|          **Figure 1-3: Streets of Rage 4**          |                   **Figure 1-4: Bastion**                    |
+| ![Figure 1-3: Streets of Rage 4](./images/sor4.jpg) |        ![Figure 1-4: Bastion](./images/bastion.jpg)         |
+|          **Figure 1-3: Streets of Rage 4**          |                   **Figure 1-4: Bastion**                  |
 
 > [!NOTE]
 >

articles/tutorials/building_2d_games/02_getting_started/index.md

@@ -156,6 +156,7 @@ Open a new *Terminal* window and execute the following commands:
 ```sh
 brew install p7zip
 brew install --cask wine-stable
+xattr -dr com.apple.quarantine "/Applications/Wine Stable.app"
 wget -qO- https://monogame.net/downloads/net8_mgfxc_wine_setup.sh | bash
 ```
 

articles/tutorials/building_2d_games/11_input_management/index.md

@@ -245,7 +245,7 @@ To manage gamepad input effectively, we need to track both current and previous
 - Check if gamepad buttons are being held down.
 - Start and Stop vibration of a gamepad.
 
-To get started, in the `Input` folder f the *MonoGameLibrary* project, create a new file name `GamePadInfo.cs` with the following initial structure:
+To get started, in the `Input` folder of the *MonoGameLibrary* project, create a new file name `GamePadInfo.cs` with the following initial structure:
 
 [!code-csharp[](./snippets/gamepadinfo.cs#declaration)]
 
@@ -382,7 +382,7 @@ The key changes to the `Core` class are:
 
 Now we can update our `Game1` class to use the new input management system through the `Core` class.  Open `Game1.cs` in the game project and update it to the following:
 
-[!code-csharp[](./snippets/game1.cs?highlight=7,75,81,87,93,99,107,112,115,119,125,127-128,133,139,145,151)]
+[!code-csharp[](./snippets/game1.cs?highlight=1,7,75,81,87,93,99,107,112,115,119,125,127-128,133,139,145,151)]
 
 The key changes to the `Game1` class are:
 

articles/tutorials/building_2d_games/18_texture_sampling/index.md

@@ -29,7 +29,7 @@ This normalized system means that regardless of whether your texture is 32×32 p
 
 When you use [**SpriteBatch**](xref:Microsoft.Xna.Framework.Graphics.SpriteBatch) to draw a texture with a source rectangle specified in pixels, MonoGame internally converts those pixel coordinates to normalized texture coordinates before sending them to the GPU. Similarly, when you specify a destination rectangle, MonoGame determines how the normalized texture coordinates should map to screen coordinates.
 
-### What is a SampleState
+### What is a SamplerState
 
 A SamplerState controls how textures are sampled during rendering. It determines several aspects of texture rendering:
 

docfx.json

@@ -40,6 +40,7 @@
           "foundation/**/*.md",
           "roadmap/**/*.md",
           "roadmap/**/*.yml",
+          "errors/**/*.md",
           "toc.yml",
           "*.md"
         ],

errors/setupwine/index.md

@@ -0,0 +1,5 @@
+---
+redirect: ../../articles/tutorials/building_2d_games/02_getting_started/index.md?tabs=windows#setup-wine-for-effect-compilation-macos-and-linux-only
+---
+
+[url_validation](../../articles/tutorials/building_2d_games/02_getting_started/index.md?tabs=windows#setup-wine-for-effect-compilation-macos-and-linux-only)

templates/monogame/conceptual.extension.js

@@ -3,6 +3,10 @@
  */
 exports.preTransform = function (model) {
 
+       // Handle redirect urls that end with .md
+       if(model.redirect) {
+        model.redirect = model.redirect.replace(/\.md/g, '.html');
+    }
 
     //  For layout pages, ignore injecting title and description as header and
     //  first paragraph

templates/monogame/layout/_master.tmpl

@@ -2,11 +2,11 @@
 {{!include(/^public/.*/)}}
 <!DOCTYPE html>
 <html {{#_lang}}lang="{{_lang}}"{{/_lang}}>
-{{#redirect_url}}
+{{#redirect}}
   {{>partials/redirect}}
-{{/redirect_url}}
+{{/redirect}}
 
-{{^redirect_url}}
+{{^redirect}}
   <head>
     {{>partials/head}}
   </head>
@@ -81,5 +81,5 @@
       <script type="text/javascript" src="/public/injectDonateButton.js"></script>
       <script type="text/javascript" src="/public/questionAnswer.js"></script>
   </body>
-{{/redirect_url}}
+{{/redirect}}
 </html>