Merge branch 'master' into patch-1

Build.sln

@@ -93,8 +93,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spruce", "..\XSharp\source\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Tasks", "source\Cosmos.Build.Tasks\Cosmos.Build.Tasks.csproj", "{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSPropertyPages", "..\Common\source\VSPropertyPages\VSPropertyPages.csproj", "{3487890D-43F4-4810-9587-1F02F646915D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.HyperVServer", "source\Cosmos.Debug.HyperVServer\Cosmos.Debug.HyperVServer.csproj", "{9413B5A0-1120-43AD-8784-8A3726C1898C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperExtensions.StrongName", "Resources\Dependencies\DapperExtensions.StrongName\DapperExtensions.StrongName.csproj", "{28F18214-DFF8-4A30-BA24-4F32C20CA910}"
@@ -482,7 +480,6 @@ Global
 		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65} = {3C4B0261-3B1D-4503-97F1-AC0252D500E6}
 		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90}
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E} = {D95021E1-A2C9-4829-819E-ED433AF13162}
-		{3487890D-43F4-4810-9587-1F02F646915D} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7}
 		{9413B5A0-1120-43AD-8784-8A3726C1898C} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
 		{28F18214-DFF8-4A30-BA24-4F32C20CA910} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
 		{440CE2D4-024F-45D3-A95C-9077CC0A51E3} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}

Build/Targets/InternalPackages.targets

@@ -2,7 +2,6 @@
 
     <ItemGroup>
         <CommonPackage Include="Cosmos.Build.Common" ProjectPath="source\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
-        <CommonPackage Include="VSPropertyPages" ProjectPath="source\VSPropertyPages\VSPropertyPages.csproj" />
     </ItemGroup>
 
     <ItemGroup>

Docs/articles/Tests/TestRunner.md

@@ -6,13 +6,23 @@ TestRunner is used to run Kernel Tests using the tests at a specified location a
 TestRunner generates a result file upon completion to detail the results of the tests.
 
 ## Get Started
-To use the TestRunnner open the `Test.sln` and set the Target Project to `Cosmos.TestRunner`.
+To use the TestRunnner open the `Test.sln`, set the Target Project to `Cosmos.TestRunner` and run the solution.
 
 ## Configuration
-Editing the configuration for TestRunner can be done by editing [DefaultEngineConfiguration](https://github.com/CosmosOS/Cosmos/blob/master/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs#L6) in ..\Tests\TestRunner\TestRunner.Core
-This allows one to choose between running it using VMWare or Bochs.
+Editing the configuration for TestRunner via [DefaultEngineConfiguration](https://github.com/CosmosOS/Cosmos/blob/master/Tests/Cosmos.TestRunner.Core/DefaultEngineConfiguration.cs#L6) in ..\Tests\TestRunner\TestRunner.Core
+This allows one to choose which emulator to use and at what level the kernel is debugged.
 
 To select which Test Kernels to run, edit `GetStableKernelTypes()` in `TestKernelSets.cs`.
 
+### Adding a Kernel
+To add a kernel to the TestRunner, open the TestKernelSets file and add a line to GetStableKernelTypes() like this line:
+
+`yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel);`
+
+Note: This can be used to test your own kernel for debug purposes. Simply add a reference to your kernel csproj to Cosmos.TestRunner.Full and add it to TestKernelSets.
+
+### Time Out
+To set the period before the TestRunner registers an error, change the line: `engine.AllowedSecondsInKernel = 1800;` This means that, in this case, if the Kernel runs for more that 30 minutes then it will register a failure.
+
 ## Project Location
 The TestRunner Projects are located in ..\Tests\TestRunner

Docs/install.md

@@ -2,9 +2,10 @@
 
 ### Prerequisites
 
-*   **Visual Studio 2019** - [Download]([https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx](https://visualstudio.microsoft.com/en/vs/older-downloads/)
-*   **Visual Studio 2019 Workload: .NET Core Tools** - .NET Core cross-platform development
-*   **.NET Framework 4.8 Developer Pack** - [Download]([https://www.microsoft.com/en-us/download/details.aspx?id=53321](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48)
+
+*   **Visual Studio 2022** - [Download](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
+*   **Visual Studio 2022 Workload: .NET Core Tools** - .NET Core cross-platform development
+*   **.NET Framework 4.8 Developer Pack** - [Download](https://www.microsoft.com/en-us/download/details.aspx?id=53321)
 *   **VMware Player OR Workstation** VMware Player is free, so that is recommended instead - [Download](https://www.vmware.com/uk/products/workstation-player/workstation-player-evaluation.html)
 
 ### Installing Cosmos
@@ -17,7 +18,7 @@ The User Kit is a snapshot stable version of Cosmos including a premade installe
 ### User Kit
 
 1.  Download [the latest release of Cosmos](http://github.com/CosmosOS/Cosmos/releases/latest) (download the **exe** file)
-2.  Wait for the download to complete then run the installer. Allow it to run as admin. Make sure **VS2019 is NOT running** when you do this.
+2.  Wait for the download to complete then run the installer. Allow it to run as admin. Make sure **VS2022 is NOT running** when you do this.
 3.  Click "Next" then "Install"
 4.  Wait for the install to progress. **Tip:** At the end the installer may look like it has stalled, but it is still doing something in the background. WAIT for the "Finish" button to become available.
 5.  Cosmos should now be installed. Follow other tutorials to find out how to create your first OS.
@@ -26,9 +27,9 @@ The User Kit is a snapshot stable version of Cosmos including a premade installe
 
 ##### **Additional Prerequisites**
 
-*   **Visual Studio 2019 Workload: Visual Studio Extension Development**
+*   **Visual Studio 2022 Workload: Visual Studio Extension Development**
 *   **Inno Quick Start Pack (Free)** – Install with defaults, keep Preprocessor option checked [Download](http://www.jrsoftware.org/isdl.php#qsp)
-*   **.NET Core 2.0 SDK** - [Download](https://www.microsoft.com/net/download/core)
+*   **.NET 5 SDK** - [Download](https://www.microsoft.com/net/download/core)
 
 ##### Get the Source
 
@@ -75,7 +76,7 @@ cd ..
 (if you have already installed) If you edited the Cosmos DevKit source using _Cosmos.sln_ or _Test.sln_, be sure to set solution config to **Debug x86**.  
 
 1.  Make sure Visual Studio is **NOT running**.  
-2.  In the root directory of the DevKit files, you downloaded earlier, run `install-VS2019.bat`.  
+2.  In the root directory of the DevKit files, you downloaded earlier, run `install-VS2022.bat`.  
 3.  Wait for the install to progress. (**Tip:** At the end the installer may look like it is stalling, it is still doing something, just in the background)
 4.  VS will open with Cosmos loaded. You can now make changes to core assemblies of Cosmos. If you don't want to, you can close this VS window and create a new Cosmos project as with the user kit.