diff --git a/Demos/GuessG3/GuessBootGen3.Cosmos b/Demos/GuessG3/GuessBootGen3.Cosmos index 651fe4cd66..e909caead9 100644 --- a/Demos/GuessG3/GuessBootGen3.Cosmos +++ b/Demos/GuessG3/GuessBootGen3.Cosmos @@ -56,8 +56,8 @@ - - KernelGen3 + + GuessKernelGen3 {9e58e949-7b71-45ed-9610-11da287ee933} True diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs index 389a317084..421ecab2d1 100644 --- a/source/Cosmos.Build.Builder/CosmosTask.cs +++ b/source/Cosmos.Build.Builder/CosmosTask.cs @@ -314,7 +314,6 @@ private void CompileCosmos() { // Pack(Path.Combine(mSourcePath, "Cosmos.System"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.System_Plugs"), xNugetPkgDir, xVersion); - //Pack(Path.Combine(Path.Combine(mSourcePath, "Kernel"), "Cosmos.System3_Plugs"), xNugetPkgDir, xVersion); // Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir, xVersion); diff --git a/source/Cosmos.IL2CPU/CompilerEngine.cs b/source/Cosmos.IL2CPU/CompilerEngine.cs index 2216e96124..11b8bd6c2a 100644 --- a/source/Cosmos.IL2CPU/CompilerEngine.cs +++ b/source/Cosmos.IL2CPU/CompilerEngine.cs @@ -291,17 +291,19 @@ private MethodBase LoadAssemblies() { // // Plugs and refs in this list will be loaded absolute (or as proj refs) only. Asm resolution // will not be tried on them, but will on ASMs they reference. - // AssemblyLoadContext.Default.Resolving += Default_Resolving; mLoadedExtensions = new List(); string xKernelBaseName = UseGen3Kernel ? "Cosmos.System.Boot" : "Cosmos.System.Kernel"; + LogMessage("Kernel " + (UseGen3Kernel ? "Gen3" : "Gen2")); LogMessage("Kernel Base: " + xKernelBaseName); Type xKernelType = null; foreach (string xRef in References) { + LogMessage("Checking Reference: " + xRef); if (File.Exists(xRef)) { + LogMessage(" Exists"); var xAssembly = AssemblyLoadContext.Default.LoadFromAssemblyCacheOrPath(xRef); CompilerHelpers.Debug($"Looking for kernel in {xAssembly}"); diff --git a/source/Kernel/Cosmos.System/Boot.cs b/source/Kernel/Cosmos.System/Boot.cs index 2f81018c4c..230980649d 100644 --- a/source/Kernel/Cosmos.System/Boot.cs +++ b/source/Kernel/Cosmos.System/Boot.cs @@ -5,7 +5,7 @@ namespace Cosmos.System { public abstract class Boot { - // IL2CPU finds this by name and this is where Cosmos takes the hand off from the bootloader. + // IL2CPU finds this method by name and this is where Cosmos takes the hand off from the bootloader. public void EntryPoint() { Run(); }