Update documentation.

Fix references to old versions of tools.
Fix stop specifying specific python version, reference
version from mu_devops.
Add page for cherry-pick process into mu repos.
Update example rust to latest rust version, while still referencing
the rust-toolchain.toml files for specific version.

Author: apop5

docs/CodeDevelopment/compile.md

@@ -63,8 +63,8 @@ the Pull Requests gates are implemented and enforced.
 
 ???+ info
     - In Project Mu repos the config file is generally at ```.pytool/CISettings.py```
-    - Project Mu runs on Windows 10 using the following tags: VS2019 and VS2022
-    - Project Mu runs on Ubuntu 18.04 using the tags: GCC5
+    - Project Mu runs on Windows 11 using the following tags: VS2019 and VS2022
+    - Project Mu runs on Ubuntu 24.04 using the tags: GCC5
     - Each of the stuart commands can take in additional parameters.  To see customized help run
       `<stuart cmd> -c .pytool/CISettings.py -h`
     - Some common optional parameters that *might* allow the stuart operation to optimize for expected usage.

docs/CodeDevelopment/prerequisites.md

@@ -6,16 +6,11 @@ get you started.  If the repo requires other tools those should be documented wi
 The tools also vary by Operating System and Compiler choice.  Project Mu will document what is currently supported but
 the expectation is that between Project Mu and TianoCore Edk2 you could use any of those tool sets.
 
-## Windows 10 x64
+## Windows 11 x64
 
 ### Python
 
-1. Download latest Python from <https://www.python.org/downloads>
-
-    ``` cmd
-    https://www.python.org/ftp/python/3.10.7/python-3.10.7-amd64.exe
-    ```
-
+1. Install python. Recommended version can be viewed on [mu_devops](https://github.com/microsoft/mu_devops/blob/main/.sync/Version.njk).
 2. It is recommended you use the following options when installing python:
     1. include pip support
     2. include test support
@@ -26,7 +21,7 @@ the expectation is that between Project Mu and TianoCore Edk2 you could use any
 1. Download latest Git For Windows from <https://git-scm.com/download/win>
 
     ``` cmd
-    https://github.com/git-for-windows/git/releases/download/v2.37.3.windows.1/Git-2.37.3-64-bit.exe
+    https://github.com/git-for-windows/git/releases/download/v2.50.0.windows.2/Git-2.50.0.2-64-bit.exe
     ```
 
 2. It is recommended you use the following options:

docs/CodeDevelopment/rust_build.md

@@ -25,31 +25,31 @@ It is recommended to:
 4. Install the desired Rust tool chain. The version is found in the `rust-toolchain.toml` file at the root of any
    Project Mu repository that contains Rust code.
 
-   - [Example](https://github.com/microsoft/mu_tiano_platforms/blob/main/rust-toolchain.toml): `1.73.0 x86_64 toolchain`
+   - [Example](https://github.com/microsoft/mu_tiano_platforms/blob/main/rust-toolchain.toml): `1.85.0 x86_64 toolchain`
 
    - Windows:
 
-      \>`rustup toolchain install 1.73.0-x86_64-pc-windows-msvc`
+      \>`rustup toolchain install 1.85.0-x86_64-pc-windows-msvc`
 
-      \>`rustup component add rust-src --toolchain 1.73.0-x86_64-pc-windows-msvc`
+      \>`rustup component add rust-src --toolchain 1.85.0-x86_64-pc-windows-msvc`
 
    - Linux:
 
-      \>`rustup toolchain install 1.73.0-x86_64-unknown-linux-gnu`
+      \>`rustup toolchain install 1.85.0-x86_64-unknown-linux-gnu`
 
-      \>`rustup component add rust-src --toolchain 1.73.0-x86_64-unknown-linux-gnu`
+      \>`rustup component add rust-src --toolchain 1.85.0-x86_64-unknown-linux-gnu`
 
 5. [Install `cargo binstall`](https://github.com/cargo-bins/cargo-binstall?tab=readme-ov-file#installation)
 
 6. Install `cargo make`. The required version is found in the `rust-toolchain.toml` file at the root of any Project
    Mu repository that contains rust code.
 
-   \>`cargo binstall --force cargo-make --version 0.37.9`
+   \>`cargo binstall --force cargo-make --version 0.37.24`
 
 7. Install `cargo tarpaulin`. The required version is found in the `rust-toolchain.toml` file at the root of any Project
    Mu repository that contains rust code.
 
-   \>`cargo binstall --force cargo-tarpaulin --version 0.31.2`
+   \>`cargo binstall --force cargo-tarpaulin --version 0.31.5`
 
 At this point, the essential Rust applications are installed, and a repo can begin to add and build Rust code.
 

docs/DeveloperDocs/build_community_docs.md

@@ -1,9 +1,8 @@
 # Building Community Docs
 
 !!! info
-    Today this process has been validated for use on Windows 10. This setup process is expected to roughly the same on
-    other operating systems
-    and none of the actual documentation source or tools should have any OS dependency.
+    Today this process has been validated for use on Windows 11. This setup process is expected to roughly the same on
+    other operating systems and none of the actual documentation source or tools should have any OS dependency.
 
 ## Get the docs repository
 
@@ -15,8 +14,7 @@ git clone https://github.com/Microsoft/mu.git
 
 ## Install required tools
 
-1. Install python (Current suggested version is 3.7.x).  Current min requirement is python 3.4+.  Checkout python.org for
-   directions.
+1. Install python. Recommended version can be viewed on [mu_devops](https://github.com/microsoft/mu_devops/blob/main/.sync/Version.njk).
 2. Install pip.  Generally, this is done when installing python but can also be done as its own process.
    Details here <https://pip.pypa.io/en/stable/installing/#do-i-need-to-install-pip>
 3. Update pip.

docs/DeveloperDocs/pulling_upstream_changes.md

@@ -0,0 +1,74 @@
+# Pulling Upstream Changes into Project Mu Repositories
+
+Project Mu is based on the upstream EDK2 project, which serves as its foundational codebase. The EDK2 community actively accepts bug fixes and code improvements, ensuring a robust and evolving platform. Sometimes, changes that are merged into EDK2 need to be added to Project Mu before the next scheduled integration. This document describes the process for applying such upstream changes to Project Mu in a manner that enables maintainers to track the provenance of the commits.
+
+## Cherry-Pick Process
+
+To cherry-pick changes from the EDK2 repository into a Project Mu repository, follow these steps:
+
+1. **Identify the Commit(s):**
+    - Locate the commit hash(es) in the EDK2 repository that you want to apply to Project Mu.
+
+2. **Sync Your Local Repository:**
+    - Ensure your local Project Mu repository is up to date:
+
+      ```sh
+      git checkout <target-branch>
+      git pull origin <target-branch>
+      ```
+
+3. **Add the EDK2 Remote (if not already added):**
+
+    ```sh
+    git remote add edk2 https://github.com/tianocore/edk2.git
+    git fetch edk2
+    ```
+
+4. **Cherry-Pick the Commit(s):**
+    - Use the commit hash from EDK2:
+
+      ```sh
+      git cherry-pick <edk2-commit-hash> -x
+      ```
+
+    - If conflicts arise, resolve them, then continue:
+
+      ```sh
+      git add <resolved-files>
+      git cherry-pick --continue
+      ```
+
+    - Ammend the commit message to contain `[Cherry-Pick]` in the title.
+
+    ```sh
+    git commit --amend
+    ```
+
+5. **Document the Change:**
+    - In the commit message, reference the original EDK2 commit hash and provide a brief description.
+    - Example:
+
+      ```sh
+      [Cherry-pick] <original commit title>
+      ```
+
+6. **Push the Changes:**
+
+    ```sh
+    git push origin <target-branch>
+    ```
+
+7. **Create a Pull Request:**
+    - Open a pull request in the Project Mu repository.
+    - Clearly indicate that this is a cherry-pick from EDK2 and link to the original commit(s).
+
+This process ensures traceability and helps maintainers track upstream changes integrated into Project Mu.
+
+## Handling Merge Commits
+
+When cherry-picking from EDK2, you may encounter merge commits. These require special handling because `git cherry-pick` does not support merge commits directly. Here are some resources and strategies for dealing with them:
+
+- [Git Documentation: Cherry-pick a merge commit](https://git-scm.com/docs/git-cherry-pick#_cherry_picking_a_merge_commit)
+- [Git Documentation: Resolving merge conflicts](https://git-scm.com/docs/git-merge#_how_conflicts_are_presented)
+
+These resources provide detailed guidance and examples for handling merge commits during upstream integration.

docs/How/contributing.md

@@ -26,7 +26,7 @@ sample driver that exposes the issue with steps to reproduce the problem is idea
 ### Reporting security issues and bugs
 
 Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC)
-secure@microsoft.com. You should receive a response within 24 hours. If for some reason you do not, please follow up
+<secure@microsoft.com>. You should receive a response within 24 hours. If for some reason you do not, please follow up
 via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found
 in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx).
 
@@ -59,6 +59,7 @@ That is it.  Thanks for contributing.
 1. [Code Development](../CodeDevelopment/overview.md)
 2. [Tests Development](../CodeDevelopment/test.md)
 3. [Documentation Development](../DeveloperDocs/developer_docs.md)
+4. [Cherry-Picking Changes](../DeveloperDocs/pulling_upstream_changes.md)
 
 ### Contributor License Agreement (CLA)
 

mkdocs_base.yml

@@ -72,6 +72,7 @@ nav:
     - Sample Syntax: "DeveloperDocs/doc_sample_test.md"
     - Doc Framework Attribution: "DeveloperDocs/attribution.md"
     - Documentation Requirements: "DeveloperDocs/requirements.md"
+    - Cherry-Picking: "DeveloperDocs/pulling_upstream_changes.md"
   - Developing Code:
     - Overview: "CodeDevelopment/overview.md"
     - Tools and Prerequisite: "CodeDevelopment/prerequisites.md"