CosmosOS · zarlo · Oct 21, 2023 · Oct 21, 2023 · Oct 22, 2023 · Oct 26, 2023
diff --git a/Build/Targets/MSBuildExtension.targets b/Build/Targets/MSBuildExtension.targets
@@ -1,8 +1,8 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" PrivateAssets="All" ExcludeAssets="Runtime" />
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" PrivateAssets="All" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.Build.Framework" Version="17.7.2" PrivateAssets="All" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.7.2" PrivateAssets="All" ExcludeAssets="Runtime" />
     </ItemGroup>
 
 </Project>
diff --git a/Build/Targets/Versions.props b/Build/Targets/Versions.props
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ApprovalTestsVersion>3.0.22</ApprovalTestsVersion>
         <AvaloniaVersion>0.7.0</AvaloniaVersion>
-        <MicrosoftBuildVersion>16.7.0</MicrosoftBuildVersion>
+        <MicrosoftBuildVersion>17.7.2</MicrosoftBuildVersion>
         <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0</MicrosoftNETFrameworkReferenceAssembliesVersion>
         <MicrosoftNETTestSdkVersion>16.0.1</MicrosoftNETTestSdkVersion>
         <MicrosoftTestPlatformObjectModelVersion>16.0.1</MicrosoftTestPlatformObjectModelVersion>

diff --git a/Examples/Basic Terminal Shell/BasicTerminalShell.csproj b/Examples/Basic Terminal Shell/BasicTerminalShell.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>-->
         <Platform>cosmos</Platform>
         <SupportsX86Intrinsics>false</SupportsX86Intrinsics>

diff --git a/Examples/Console Beep Demo/BeepDemo.csproj b/Examples/Console Beep Demo/BeepDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>cosmos</RuntimeIdentifier>
     </PropertyGroup>
 

diff --git a/Examples/Cosmos Graphic Subsystem/CosmosGraphicSubsystem.csproj b/Examples/Cosmos Graphic Subsystem/CosmosGraphicSubsystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>cosmos</RuntimeIdentifier>
     </PropertyGroup>
 

diff --git a/Examples/Guess Number Game/GuessKernel.csproj b/Examples/Guess Number Game/GuessKernel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>cosmos</RuntimeIdentifier>
     </PropertyGroup>
 

diff --git a/Examples/ZMachine Emulator/ZKernel/ZKernel.csproj b/Examples/ZMachine Emulator/ZKernel/ZKernel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>cosmos</RuntimeIdentifier>
     </PropertyGroup>
 

diff --git a/Examples/ZMachine Emulator/ZLibrary/ZLibrary.csproj b/Examples/ZMachine Emulator/ZLibrary/ZLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Examples/ZMachine Emulator/ZTestConsoleApp/ZTestConsoleApp.csproj b/Examples/ZMachine Emulator/ZTestConsoleApp/ZTestConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
 

diff --git a/Kernel.sln b/Kernel.sln
@@ -48,6 +48,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spruce", "..\XSharp\source\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Plugs", "source\Cosmos.Plugs\Cosmos.Plugs.csproj", "{F2948368-61B6-4653-BAEC-C7152CE4980E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperExtensions.StrongName", "Resources\Dependencies\DapperExtensions.StrongName\DapperExtensions.StrongName.csproj", "{13ECB940-25D6-40EF-8B11-ABA89EA14991}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -193,6 +195,14 @@ Global
 		{F2948368-61B6-4653-BAEC-C7152CE4980E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2948368-61B6-4653-BAEC-C7152CE4980E}.Release|x86.ActiveCfg = Release|Any CPU
 		{F2948368-61B6-4653-BAEC-C7152CE4980E}.Release|x86.Build.0 = Release|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Debug|x86.Build.0 = Debug|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Release|x86.ActiveCfg = Release|Any CPU
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -216,6 +226,7 @@ Global
 		{4E9B8F31-AEA0-402D-9B3A-223100F2156D} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{0812DD0A-4CEE-4376-B78A-02EBCBAA14C2} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 		{F2948368-61B6-4653-BAEC-C7152CE4980E} = {9A923E6F-FF63-4F02-A4EA-C2D44F9323FD}
+		{13ECB940-25D6-40EF-8B11-ABA89EA14991} = {3CD3D9A5-9BC5-4FEB-8D63-4D535C0ABB78}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A1E8F1D-82B3-471F-9B59-0350DEA9203D}

diff --git a/Makefile b/Makefile
@@ -117,10 +117,10 @@ install:
 	@cp -r $(THISDIR)/Artwork/XSharp/XSharp.ico $(DESTDIR)/XSharp/
 	@cp -r $(THISDIR)/Artwork/Cosmos.ico $(DESTDIR)/
 
-	@cp -r $(IL2CPU_DIR)/source/IL2CPU/bin/Debug/*/linux-x64/publish/* $(DESTDIR)/Build/IL2CPU/
-	@cp -r $(THISDIR)/source/Cosmos.Core_Plugs/bin/Debug/*/publish/*.dll $(DESTDIR)/Kernel/
-	@cp -r $(THISDIR)/source/Cosmos.System2_Plugs/bin/Debug/*/publish/*.dll $(DESTDIR)/Kernel/
-	@cp -r $(THISDIR)/source/Cosmos.HAL2/bin/Debug/*/publish/*.dll $(DESTDIR)/Kernel/
+	@cp -r $(IL2CPU_DIR)/source/IL2CPU/bin/Release/*/linux-x64/publish/* $(DESTDIR)/Build/IL2CPU/
+	@cp -r $(THISDIR)/source/Cosmos.Core_Plugs/bin/Release/*/publish/*.dll $(DESTDIR)/Kernel/
+	@cp -r $(THISDIR)/source/Cosmos.System2_Plugs/bin/Release/*/publish/*.dll $(DESTDIR)/Kernel/
+	@cp -r $(THISDIR)/source/Cosmos.HAL2/bin/Release/*/publish/*.dll $(DESTDIR)/Kernel/
 	@cp -r $(THISDIR)/source/Cosmos.Debug.Kernel.Plugs.Asm/bin/Debug/netstandard2.0/publish/*.dll $(DESTDIR)/Kernel/
 
 	@cp -r $(THISDIR)/Build/HyperV/*.vhdx $(DESTDIR)/Build/HyperV/

diff --git a/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj b/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>
 

diff --git a/Tests/Cosmos.Common.Tests/packages.lock.json b/Tests/Cosmos.Common.Tests/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
         "requested": "(, )",

diff --git a/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj b/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>

diff --git a/Tests/Cosmos.Core.Memory.Test/packages.lock.json b/Tests/Cosmos.Core.Memory.Test/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
         "requested": "(, )",

diff --git a/Tests/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj b/Tests/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>

diff --git a/Tests/Cosmos.Core.Tests/packages.lock.json b/Tests/Cosmos.Core.Tests/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
         "requested": "(, )",
@@ -390,8 +390,8 @@
       },
       "System.Data.SqlClient": {
         "type": "Transitive",
-        "resolved": "4.8.5",
-        "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==",
+        "resolved": "4.8.6",
+        "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==",
         "dependencies": {
           "Microsoft.Win32.Registry": "4.7.0",
           "System.Security.Principal.Windows": "4.7.0",
@@ -1265,7 +1265,7 @@
           "SQLitePCLRaw.core": "[2.0.6, )",
           "SQLitePCLRaw.lib.e_sqlite3.linux": "[1.1.14, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
-          "System.Data.SqlClient": "[4.8.5, )",
+          "System.Data.SqlClient": "[4.8.6, )",
           "System.IO.MemoryMappedFiles": "[4.3.0, )",
           "System.Reflection.Metadata": "[5.0.0, )"
         }

diff --git a/Tests/Cosmos.System.Tests/Cosmos.System.Tests.csproj b/Tests/Cosmos.System.Tests/Cosmos.System.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <AssemblyOriginatorKeyFile>..\..\build\Cosmos.snk</AssemblyOriginatorKeyFile>
         <DefineConstants>UNIT_TEST</DefineConstants>
         <Configurations>Debug;Release;TEST</Configurations>

diff --git a/Tests/Cosmos.System.Tests/packages.lock.json b/Tests/Cosmos.System.Tests/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "ApprovalTests": {
         "type": "Direct",
         "requested": "[3.0.18, )",

diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>
 

diff --git a/Tests/Cosmos.TestRunner.Core/packages.lock.json b/Tests/Cosmos.TestRunner.Core/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "5.0.0",

diff --git a/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj b/Tests/Cosmos.TestRunner.Full/Cosmos.TestRunner.Full.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <TargetLatestRuntimePatch>True</TargetLatestRuntimePatch>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>

diff --git a/Tests/Cosmos.TestRunner.Full/packages.lock.json b/Tests/Cosmos.TestRunner.Full/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Dapper.StrongName": {
         "type": "Transitive",
         "resolved": "2.0.90",
@@ -378,8 +378,8 @@
       },
       "System.Data.SqlClient": {
         "type": "Transitive",
-        "resolved": "4.8.5",
-        "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==",
+        "resolved": "4.8.6",
+        "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==",
         "dependencies": {
           "Microsoft.Win32.Registry": "4.7.0",
           "System.Security.Principal.Windows": "4.7.0",
@@ -1389,6 +1389,7 @@
           "Cosmos.Core": "[0.1.0-localbuild, )",
           "Cosmos.Debug.Kernel": "[0.1.0-localbuild, )",
           "Cosmos.IL2CPU": "[0.1.0-localbuild, )",
+          "IL2CPU.API": "[0.1.0-localbuild, )",
           "System.Reflection.TypeExtensions": "[4.7.0, )",
           "XSharp": "[0.1.0-localbuild, )"
         }
@@ -1400,6 +1401,8 @@
           "Cosmos.Core": "[0.1.0-localbuild, )",
           "Cosmos.Core_Asm": "[0.1.0-localbuild, )",
           "Cosmos.Debug.Kernel": "[0.1.0-localbuild, )",
+          "Cosmos.IL2CPU": "[0.1.0-localbuild, )",
+          "IL2CPU.API": "[0.1.0-localbuild, )",
           "IgnoresAccessChecksToGenerator": "[0.5.0, )",
           "XSharp": "[0.1.0-localbuild, )"
         }
@@ -1588,7 +1591,7 @@
           "SQLitePCLRaw.core": "[2.0.6, )",
           "SQLitePCLRaw.lib.e_sqlite3.linux": "[1.1.14, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
-          "System.Data.SqlClient": "[4.8.5, )",
+          "System.Data.SqlClient": "[4.8.6, )",
           "System.IO.MemoryMappedFiles": "[4.3.0, )",
           "System.Reflection.Metadata": "[5.0.0, )"
         }

diff --git a/Tests/Cosmos.TestRunner.TestAdapter/Cosmos.TestRunner.TestAdapter.csproj b/Tests/Cosmos.TestRunner.TestAdapter/Cosmos.TestRunner.TestAdapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <PackageDescription>Test adapter for Cosmos kernels.</PackageDescription>
         <IsToolProject>True</IsToolProject>
         <AppendTargetFrameworkToToolsPackageFolder>False</AppendTargetFrameworkToToolsPackageFolder>

diff --git a/Tests/Cosmos.TestRunner.TestAdapter/packages.lock.json b/Tests/Cosmos.TestRunner.TestAdapter/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Direct",
         "requested": "[17.0.0, )",

diff --git a/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj b/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>
 

diff --git a/Tests/Cosmos.TestRunner.TestController/packages.lock.json b/Tests/Cosmos.TestRunner.TestController/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net8.0": {
       "cosmos.debug.kernel": {
         "type": "Project"
       }

diff --git a/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj b/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputType>Exe</OutputType>
-        <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
         <SignAssembly>False</SignAssembly>
         <Configurations>Debug;Release;TEST</Configurations>
     </PropertyGroup>