diff --git a/Temp - Ignore me (or not, but dont goof me up)/Test.sln.lnk b/Temp - Ignore me (or not, but dont goof me up)/Test.sln.lnk new file mode 100644 index 000000000..f8446326f Binary files /dev/null and b/Temp - Ignore me (or not, but dont goof me up)/Test.sln.lnk differ diff --git a/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat b/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat index 3bba2a27f..0fcbb20bb 100644 --- a/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat +++ b/Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat @@ -1,7 +1,7 @@ cd "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Kernel\" -copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll" -copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll" -copy "C:\source\Cosmos\source\Kernel\80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll" +copy "C:\source\Cosmos\source\Kernel-x86\00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll" +copy "C:\source\Cosmos\source\Kernel-x86\00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll" +copy "C:\source\Cosmos\source\Kernel-x86\80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll" cd C:\source\Cosmos\source\Cosmos.Build.MSBuild copy cosmos.targets "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Build\VSIP" diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs index 7a0041bf5..744081834 100644 --- a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs +++ b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs @@ -196,11 +196,6 @@ namespace Cosmos.TestRunner.Core "IgnoreDebugStubAttribute:False" }; - if (UseG3Kernel) - { - xArgs.Add("UseGen3Kernel:True"); - } - xArgs.AddRange(References.Select(aReference => "References:" + aReference)); bool xUsingUserkit = false; diff --git a/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs b/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs index a1570e023..e4e4cdac5 100644 --- a/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs +++ b/Tests/Cosmos.TestRunner.Core/TestKernelSets.cs @@ -8,21 +8,21 @@ namespace Cosmos.TestRunner.Core public static IEnumerable GetStableKernelTypes() { //yield return typeof(BoxingTests.Kernel); - yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel); ////yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel); - yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel); - yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel); - yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel); - yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel); - yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel); - yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel); - yield return typeof(Cosmos.Kernel.Tests.IO.Kernel); - yield return typeof(SimpleStructsAndArraysTest.Kernel); - yield return typeof(VGACompilerCrash.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel); + //yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel); + //yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel); + //yield return typeof(Cosmos.Kernel.Tests.IO.Kernel); + //yield return typeof(SimpleStructsAndArraysTest.Kernel); + //yield return typeof(VGACompilerCrash.Kernel); //yield return typeof(FrotzKernel.Kernel); - //yield return typeof(KernelGen3.Boot); + yield return typeof(KernelGen3.Boot); /* Please see the notes on the kernel itself before enabling it */ //yield return typeof(GraphicTest.Kernel); diff --git a/source/Cosmos.IL2CPU/CompilerEngine.cs b/source/Cosmos.IL2CPU/CompilerEngine.cs index a3202d44b..bc4f669af 100644 --- a/source/Cosmos.IL2CPU/CompilerEngine.cs +++ b/source/Cosmos.IL2CPU/CompilerEngine.cs @@ -25,7 +25,7 @@ namespace Cosmos.IL2CPU { { get { - return KernelPkg == "X86G3"; + return string.Equals(KernelPkg, "X86G3", StringComparison.CurrentCultureIgnoreCase); } } public string DebugMode { get; set; } @@ -305,7 +305,8 @@ namespace Cosmos.IL2CPU { CompilerHelpers.Debug($"Looking for kernel in {xAssembly}"); foreach (var xType in xAssembly.ExportedTypes) { - if (!xType.GetTypeInfo().IsGenericTypeDefinition && !xType.GetTypeInfo().IsAbstract) { + var xTypeInfo = xType.GetTypeInfo(); + if (!xTypeInfo.IsGenericTypeDefinition && !xTypeInfo.IsAbstract) { CompilerHelpers.Debug($"Checking type {xType.FullName}"); // We used to resolve with this: @@ -315,7 +316,7 @@ namespace Cosmos.IL2CPU { // will force user to implement what is needed if replacing our core. But in the end this is a "not needed" feature // and would only complicate things. // So for now at least, we look by name so we dont have a dependency since the method returns a MethodBase and not a Kernel instance anyway. - if (xType.GetTypeInfo().BaseType.FullName == xKernelBaseName) { + if (xTypeInfo.BaseType.FullName == xKernelBaseName) { if (xKernelType != null) { LogError($"Two kernels found: {xType.FullName} and {xKernelType.FullName}"); return null; diff --git a/source/Kernel-X86/90-Application/GuessBootGen3.Cosmos b/source/Kernel-X86/90-Application/GuessBootGen3.Cosmos index 6f4018658..f3469c8cf 100644 --- a/source/Kernel-X86/90-Application/GuessBootGen3.Cosmos +++ b/source/Kernel-X86/90-Application/GuessBootGen3.Cosmos @@ -71,7 +71,7 @@ {63843265-d889-47d2-883e-595289c99f42} True - + GuessKernelGen3 {9e58e949-7b71-45ed-9610-11da287ee933} True