diff --git a/Build.sln b/Build.sln index 96ab99fb50..1eb1449827 100644 --- a/Build.sln +++ b/Build.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +VisualStudioVersion = 15.0.26730.8 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D95021E1-A2C9-4829-819E-ED433AF13162}" EndProject @@ -32,8 +32,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{CAF5EB Cosmos.Common.ReadMe.html = Cosmos.Common.ReadMe.html EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assembler", "Assembler", "{612401E0-F733-40DB-95D5-E22D332DDAAA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.MSBuild", "source\Cosmos.Build.MSBuild\Cosmos.Build.MSBuild.csproj", "{BC6AE974-1F18-4A19-A956-5062E4D3FD53}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Common", "source\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj", "{AB24E403-54F3-4F67-B5E0-119A7227AAC1}" @@ -46,14 +44,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Wizards", "source EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Windows", "source\Cosmos.VS.Windows\Cosmos.VS.Windows.csproj", "{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.VS", "..\XSharp\source\XSharp.VS\XSharp.VS.csproj", "{FB71E8EF-E229-4D81-984A-B9170D752BF9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.USB", "source\Cosmos.Deploy.USB\Cosmos.Deploy.USB.csproj", "{3D84CF8B-C6DF-4D78-8DE1-708582B43711}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "source\Cosmos.Deploy.Pixie\Cosmos.Deploy.Pixie.csproj", "{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.DotNetCLI", "..\XSharp\source\XSharp.DotNetCLI\XSharp.DotNetCLI.csproj", "{69E08155-F075-4728-8387-1549CFD4FA97}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{F3025446-D2C7-4FEA-AB03-C707F7B48B43}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{3C45A898-4AA9-476F-8302-63391D6ED044}" @@ -98,7 +92,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Runner", "Test Runner" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.TestController", "Tests\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj", "{2EEC1BF8-758F-4D9D-B063-8CF005468B24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheRingMaster", "source\TheRingMaster\TheRingMaster.csproj", "{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3C4B0261-3B1D-4503-97F1-AC0252D500E6}" EndProject @@ -134,10 +128,6 @@ Global {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Debug|Any CPU.Build.0 = Debug|Any CPU {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|Any CPU.ActiveCfg = Release|Any CPU {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|Any CPU.Build.0 = Release|Any CPU - {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Release|Any CPU.Build.0 = Release|Any CPU {3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -146,10 +136,6 @@ Global {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.Build.0 = Release|Any CPU - {69E08155-F075-4728-8387-1549CFD4FA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69E08155-F075-4728-8387-1549CFD4FA97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69E08155-F075-4728-8387-1549CFD4FA97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69E08155-F075-4728-8387-1549CFD4FA97}.Release|Any CPU.Build.0 = Release|Any CPU {F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug|Any CPU.Build.0 = Debug|Any CPU {F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -258,10 +244,8 @@ Global {3370FC04-B669-46A4-A4AA-A89540318F8D} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758} {B37F98E5-6D98-48D2-B736-01F0B28D46CE} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7} {47E8F3DC-FF3F-4CC7-8643-1807260B0B18} = {CD3F5E45-8B24-424F-ADF1-0211712F4CB7} - {FB71E8EF-E229-4D81-984A-B9170D752BF9} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {3D84CF8B-C6DF-4D78-8DE1-708582B43711} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} - {69E08155-F075-4728-8387-1549CFD4FA97} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {F3025446-D2C7-4FEA-AB03-C707F7B48B43} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} {3C45A898-4AA9-476F-8302-63391D6ED044} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} {2E740096-911F-47D0-A46D-998DBB76FC5D} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758} @@ -277,7 +261,7 @@ Global {2A24DA41-0D3A-48A6-83D5-8584A1D4CA94} = {360A9DE9-F8CF-4A38-9593-3699648DA616} {9A327DB7-42E2-4C82-9537-0D995B9171FF} = {056A94C1-6C75-4730-B62A-675779CD07FB} {7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B} = {E3779B95-E47B-4CAD-B8C1-0549E30AA4F2} - {E1AC1E9B-27EA-4AE0-8C83-328BD96F978A} = {612401E0-F733-40DB-95D5-E22D332DDAAA} + {E1AC1E9B-27EA-4AE0-8C83-328BD96F978A} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {CB20F8F9-8C1D-43A6-96EA-89FEC2512C99} = {D95021E1-A2C9-4829-819E-ED433AF13162} {A9469897-4FD8-49E7-97F1-FE420A2B75B9} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} {366C2EC6-B9D8-4676-9C88-98F041B8FC93} = {CAF5EB57-6CAD-446D-8FC7-4C03D4B996A6} diff --git a/Build/Tools/nuget.exe b/Build/Tools/nuget.exe index 856263ded8..ec1309c7aa 100644 Binary files a/Build/Tools/nuget.exe and b/Build/Tools/nuget.exe differ diff --git a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj index d89bf70f05..d462030cf5 100644 --- a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj +++ b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 {49f2c01d-d2c5-4564-810b-1ae92236c5c1} diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj index b8caac8124..eeb8db6503 100644 --- a/Demos/Guess/GuessKernel.csproj +++ b/Demos/Guess/GuessKernel.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 {e35e0dbf-555f-4d38-8f28-acdfa9dc97bd} diff --git a/IDE.sln b/IDE.sln index ffbdaaf0ee..de54b0c74b 100644 --- a/IDE.sln +++ b/IDE.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 +VisualStudioVersion = 15.0.26730.8 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deploy", "Deploy", "{BDFC9BA8-F528-43B5-92D0-497579E55065}" EndProject @@ -29,22 +28,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "sour EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.USB", "source\Cosmos.Deploy.USB\Cosmos.Deploy.USB.csproj", "{3D84CF8B-C6DF-4D78-8DE1-708582B43711}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{CFE37077-B9BD-4430-8DA0-F9F02DFD14C3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visual Studio", "Visual Studio", "{F0B09CE5-6AF5-453F-BEBE-E257108C65DC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp", "..\XSharp\source\XSharp\XSharp.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NASM", "Tools\NASM\NASM.csproj", "{A2E6978B-FE78-433C-8A17-624579B393DF}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.DebugEngine", "source\Cosmos.VS.DebugEngine\Cosmos.VS.DebugEngine.csproj", "{535A7E34-AC73-4781-B791-2C81A9066A2C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.Windows", "source\Cosmos.VS.Windows\Cosmos.VS.Windows.csproj", "{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.XSC", "..\XSharp\source\XSharp.XSC\XSharp.XSC.csproj", "{6EE75318-F00B-4295-A132-484CDB812801}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.VS", "..\XSharp\source\XSharp.VS\XSharp.VS.csproj", "{FB71E8EF-E229-4D81-984A-B9170D752BF9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.VS.ProjectSystem", "source\Cosmos.VS.ProjectSystem\Cosmos.VS.ProjectSystem.csproj", "{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}" @@ -157,14 +150,6 @@ Global {72EB557A-8A2D-4B0F-823E-C70A791831B5}.Release|Any CPU.Build.0 = Release|Any CPU {72EB557A-8A2D-4B0F-823E-C70A791831B5}.Release|x86.ActiveCfg = Release|Any CPU {72EB557A-8A2D-4B0F-823E-C70A791831B5}.Release|x86.Build.0 = Release|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Debug|x86.Build.0 = Debug|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Release|Any CPU.Build.0 = Release|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Release|x86.ActiveCfg = Release|Any CPU - {A2E6978B-FE78-433C-8A17-624579B393DF}.Release|x86.Build.0 = Release|Any CPU {535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -181,14 +166,6 @@ Global {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|Any CPU.Build.0 = Release|Any CPU {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|x86.ActiveCfg = Release|Any CPU {47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|x86.Build.0 = Release|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Debug|x86.ActiveCfg = Debug|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Debug|x86.Build.0 = Debug|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Release|Any CPU.Build.0 = Release|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Release|x86.ActiveCfg = Release|Any CPU - {6EE75318-F00B-4295-A132-484CDB812801}.Release|x86.Build.0 = Release|Any CPU {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB71E8EF-E229-4D81-984A-B9170D752BF9}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -230,12 +207,13 @@ Global {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865} = {BDFC9BA8-F528-43B5-92D0-497579E55065} {3D84CF8B-C6DF-4D78-8DE1-708582B43711} = {BDFC9BA8-F528-43B5-92D0-497579E55065} {72EB557A-8A2D-4B0F-823E-C70A791831B5} = {E9CD521E-C386-466D-B5F7-A5EB19A61625} - {A2E6978B-FE78-433C-8A17-624579B393DF} = {CFE37077-B9BD-4430-8DA0-F9F02DFD14C3} {535A7E34-AC73-4781-B791-2C81A9066A2C} = {F0B09CE5-6AF5-453F-BEBE-E257108C65DC} {47E8F3DC-FF3F-4CC7-8643-1807260B0B18} = {F0B09CE5-6AF5-453F-BEBE-E257108C65DC} - {6EE75318-F00B-4295-A132-484CDB812801} = {E9CD521E-C386-466D-B5F7-A5EB19A61625} {FB71E8EF-E229-4D81-984A-B9170D752BF9} = {E9CD521E-C386-466D-B5F7-A5EB19A61625} {12C1623C-1B28-46DF-A4B5-6B767A01ECF6} = {F0B09CE5-6AF5-453F-BEBE-E257108C65DC} {B37F98E5-6D98-48D2-B736-01F0B28D46CE} = {F0B09CE5-6AF5-453F-BEBE-E257108C65DC} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {35645DF6-909B-4368-B6CC-188E096C7908} + EndGlobalSection EndGlobal diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss index a2f0e74f4a..6e9c885ac8 100644 --- a/Setup/Cosmos.iss +++ b/Setup/Cosmos.iss @@ -79,7 +79,7 @@ Source: ".\Build\Tools\Cygwin\*"; DestDir: "{app}\Build\Tools\cygwin"; Flags: ig Source: ".\Build\Tools\mkisofs\*"; DestDir: "{app}\Build\Tools\mkisofs"; Flags: ignoreversion uninsremovereadonly overwritereadonly Source: ".\Build\VSIP\IL2CPU\*"; DestDir: "{app}\Build\IL2CPU"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\VSIP\NASM\*"; DestDir: "{app}\Build\NASM"; Flags: ignoreversion uninsremovereadonly -Source: ".\Build\VSIP\XSharp\*"; DestDir: "{app}\Build\XSharp"; Flags: ignoreversion uninsremovereadonly +;Source: ".\Build\VSIP\XSharp\*"; DestDir: "{app}\Build\XSharp"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\VSIP\Cosmos.Deploy.USB.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\VSIP\Cosmos.Deploy.Pixie.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\VSIP\Cosmos.Build.Common.dll"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly @@ -116,7 +116,6 @@ Source: ".\Build\syslinux.cfg"; DestDir: "{app}\Build\PXE\pxelinux.cfg"; DestNam ; VSIP Source: ".\Build\Tools\VSIXBootstrapper.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly Source: ".\Build\VSIP\Cosmos.VS.ProjectSystem.vsix"; DestDir: "{app}\VSIX\"; Flags: ignoreversion uninsremovereadonly -Source: ".\Build\VSIP\XSharp.VS.vsix"; DestDir: "{app}\VSIX\"; Flags: ignoreversion uninsremovereadonly [Registry] ; Regiter .xs Extension @@ -139,16 +138,13 @@ Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "init ""{app}\Kernel\packag Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\Kernel\packages"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages" Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.ProjectSystem"; Description: "Remove Cosmos Project System"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System" -Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:XSharp.VS"; Description: "Remove X# Language Service"; StatusMsg: "Removing Visual Studio Extension: X# Language Service" Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System" -Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q XSharp.VS.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install X# Language Service"; StatusMsg: "Installing Visual Studio Extension: X# Language Service" [UninstallRun] Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Remove -Name ""Cosmos Local Package Feed"""; WorkingDir: "{app}"; StatusMsg: "Uninstalling Kernel Packages" Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.ProjectSystem"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System" -Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:XSharp.VS"; StatusMsg: "Removing Visual Studio Extension: X# Language Service" [Code] function ExecWithResult(const Filename, Params, WorkingDir: String; const ShowCmd: Integer; diff --git a/Test.sln b/Test.sln index 0cab46e48a..c72644d154 100644 --- a/Test.sln +++ b/Test.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.8 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DAEF99B5-22F0-4885-B45B-9B600B857E1C}" EndProject @@ -154,6 +154,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "92 CpuPlug", "92 CpuPlug", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spruce", "..\XSharp\source\Spruce\Spruce.csproj", "{FF46829E-B612-4D36-80BE-ED04521AD91A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.x86", "..\XSharp\XSharp.x86\XSharp.x86.csproj", "{D0EABA08-88C9-4F7C-BCA9-361B58B20D67}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -579,6 +581,14 @@ Global {FF46829E-B612-4D36-80BE-ED04521AD91A}.Release|Any CPU.Build.0 = Release|Any CPU {FF46829E-B612-4D36-80BE-ED04521AD91A}.Release|x86.ActiveCfg = Release|Any CPU {FF46829E-B612-4D36-80BE-ED04521AD91A}.Release|x86.Build.0 = Release|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Debug|x86.ActiveCfg = Debug|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Debug|x86.Build.0 = Debug|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Release|Any CPU.Build.0 = Release|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Release|x86.ActiveCfg = Release|Any CPU + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -652,6 +662,7 @@ Global {3DD192AF-2D72-449F-936C-ED8734225B18} = {C286932C-3F6D-47F0-BEEF-26843D1BB11B} {929EE8ED-6AD3-4442-A0C1-EC70665F2DCF} = {99192440-2DD7-4E71-B730-D44A73F46533} {FF46829E-B612-4D36-80BE-ED04521AD91A} = {E9CD521E-C386-466D-B5F7-A5EB19A61625} + {D0EABA08-88C9-4F7C-BCA9-361B58B20D67} = {E9CD521E-C386-466D-B5F7-A5EB19A61625} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4418C803-277E-448F-A0A0-52788FA215AD} diff --git a/Tests/BoxingTests/BoxingTests.csproj b/Tests/BoxingTests/BoxingTests.csproj index 9101fe8884..84499873df 100644 --- a/Tests/BoxingTests/BoxingTests.csproj +++ b/Tests/BoxingTests/BoxingTests.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj index 6cc808bf69..558441f97e 100644 --- a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj +++ b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj index 93f48009eb..d06b558010 100644 --- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj +++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj index 912e01f4c3..21eee4e4f9 100644 --- a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj +++ b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj index a1c662677a..7e14323c52 100644 --- a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj +++ b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj index 1004133f77..5d721ee728 100644 --- a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj +++ b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj index f38bbe7a6d..ab19fd8acc 100644 --- a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj +++ b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj index df857a8148..05f795090e 100644 --- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj +++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj index 36c214239f..2441a0ee97 100644 --- a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj +++ b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk diff --git a/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj b/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj index d43ea88a7b..d2a210cda4 100644 --- a/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj +++ b/Tests/Cosmos.Compiler.TestsBase/Cosmos.Compiler.TestsBase.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj b/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj index 50b23f81df..76f83d28e4 100644 --- a/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj +++ b/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj @@ -1,12 +1,12 @@  - netcoreapp1.0 + netcoreapp2.0 True - + diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj index 983fd4608e..27966751c4 100644 --- a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj +++ b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj index 5d65b9920e..cbd59ab74f 100644 --- a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj +++ b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj index 05cb4090af..d0e1ef6a27 100644 --- a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj +++ b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj @@ -1,7 +1,7 @@ - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk @@ -30,7 +30,7 @@ - + diff --git a/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj b/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj index a4baa2dde8..a0baad9790 100644 --- a/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj +++ b/Tests/Cosmos.TestRunner.TestController/Cosmos.TestRunner.TestController.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk diff --git a/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj b/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj index abab68f0b9..25218f7f79 100644 --- a/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj +++ b/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj @@ -41,15 +41,6 @@ - - ..\..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll - - - ..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - - - ..\..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll - @@ -90,7 +81,6 @@ - diff --git a/Tests/Cosmos.TestRunner.UI/packages.config b/Tests/Cosmos.TestRunner.UI/packages.config deleted file mode 100644 index f8e74fffcd..0000000000 --- a/Tests/Cosmos.TestRunner.UI/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj b/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj index f8472bf4c6..68c3fe000c 100644 --- a/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj +++ b/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 True ..\..\Cosmos.snk diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj index 2b1f89bb7b..27b74ba035 100644 --- a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj +++ b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 win7-x86 Full True diff --git a/Tests/GraphicTest/GraphicTest.csproj b/Tests/GraphicTest/GraphicTest.csproj index 5476e9a676..7a3e8ec242 100644 --- a/Tests/GraphicTest/GraphicTest.csproj +++ b/Tests/GraphicTest/GraphicTest.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj index f90b7a606e..6d75b7fedf 100644 --- a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj +++ b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tests/VGACompilerCrash/VGACompilerCrash.csproj b/Tests/VGACompilerCrash/VGACompilerCrash.csproj index 7c0a03e409..b170ad419c 100644 --- a/Tests/VGACompilerCrash/VGACompilerCrash.csproj +++ b/Tests/VGACompilerCrash/VGACompilerCrash.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 diff --git a/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj b/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj index 9bb833159c..c53142f1c0 100644 --- a/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj +++ b/Tools/Cosmos.IL2CPU.Profiler/Cosmos.IL2CPU.Profiler.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 win7-x86 Full True diff --git a/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj b/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj index ab19a4047e..59f017166e 100644 --- a/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj +++ b/Tools/ElfMap2DebugDb/ElfMap2DebugDb.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 win7-x86 True ..\..\Cosmos.snk diff --git a/Tools/NASM/NASM.csproj b/Tools/NASM/NASM.csproj index 583438673e..5ad56b8a18 100644 --- a/Tools/NASM/NASM.csproj +++ b/Tools/NASM/NASM.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 win7-x86 True ..\..\Cosmos.snk diff --git a/appveyor.yml b/appveyor.yml index def64d4969..f3ac747d1f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,14 @@ init: git clone https://github.com/CosmosOS/XSharp.git c:\XSharp --depth 1 git clone https://github.com/CosmosOS/IL2CPU.git c:\IL2CPU --depth 1 +install: +- ps: | + $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" + mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/release/2.0.0/scripts/obtain/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" + '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 2.0.0 -InstallDir $env:DOTNET_INSTALL_DIR' + $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" + build_script: - cmd: >- rem %APPVEYOR_BUILD_FOLDER% diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs index 4340240c5e..bb11ef117f 100644 --- a/source/Cosmos.Build.Builder/CosmosTask.cs +++ b/source/Cosmos.Build.Builder/CosmosTask.cs @@ -285,9 +285,9 @@ private void Update() { StartConsole(xNuget, xUpdateParams); } - private void Pack(string project, string destDir, string version) { + private void Pack(string project, string destDir) { string xMSBuild = Path.Combine(Paths.VSPath, "MSBuild", "15.0", "Bin", "msbuild.exe"); - string xParams = $"{Quoted(project)} /nodeReuse:False /t:Restore;Pack /maxcpucount /p:PackageVersion={Quoted(version)} /p:PackageOutputPath={Quoted(destDir)}"; + string xParams = $"{Quoted(project)} /nodeReuse:False /t:Restore;Pack /maxcpucount /p:PackageOutputPath={Quoted(destDir)}"; StartConsole(xMSBuild, xParams); } @@ -300,8 +300,6 @@ private void Publish(string project, string destDir) { private void CompileCosmos() { string xVsipDir = Path.Combine(mCosmosPath, "Build", "VSIP"); string xNugetPkgDir = Path.Combine(xVsipDir, "KernelPackages"); - string xVersion = DateTime.Now.ToString("yyyy.MM.dd"); - Section("Clean NuGet Local Feed"); Clean(Path.Combine(mCosmosPath, @"Build.sln")); @@ -322,26 +320,25 @@ private void CompileCosmos() { Section("Publish Tools"); Publish(Path.Combine(mSourcePath, "Cosmos.Build.MSBuild"), Path.Combine(xVsipDir, "MSBuild")); Publish(Path.Combine(mSourcePath, "../../IL2CPU/source/IL2CPU"), Path.Combine(xVsipDir, "IL2CPU")); - Publish(Path.Combine(mSourcePath, "../../XSharp/source/XSharp.DotNetCLI"), Path.Combine(xVsipDir, "XSharp")); Publish(Path.Combine(mCosmosPath, "Tools", "NASM"), Path.Combine(xVsipDir, "NASM")); Section("Pack Kernel"); // - Pack(Path.Combine(mSourcePath, "Cosmos.Common"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "Cosmos.Common"), xNugetPkgDir); // - Pack(Path.Combine(mSourcePath, "Cosmos.Core"), xNugetPkgDir, xVersion); - Pack(Path.Combine(mSourcePath, "Cosmos.Core_Plugs"), xNugetPkgDir, xVersion); - Pack(Path.Combine(mSourcePath, "Cosmos.Core_Asm"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "Cosmos.Core"), xNugetPkgDir); + Pack(Path.Combine(mSourcePath, "Cosmos.Core_Plugs"), xNugetPkgDir); + Pack(Path.Combine(mSourcePath, "Cosmos.Core_Asm"), xNugetPkgDir); // - Pack(Path.Combine(mSourcePath, "Cosmos.HAL2"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "Cosmos.HAL2"), xNugetPkgDir); // - Pack(Path.Combine(mSourcePath, "Cosmos.System2"), xNugetPkgDir, xVersion); - Pack(Path.Combine(mSourcePath, "Cosmos.System2_Plugs"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "Cosmos.System2"), xNugetPkgDir); + Pack(Path.Combine(mSourcePath, "Cosmos.System2_Plugs"), xNugetPkgDir); // - Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir, xVersion); - Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir); + Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir); // - Pack(Path.Combine(mSourcePath, "../../IL2CPU/source/Cosmos.IL2CPU.API"), xNugetPkgDir, xVersion); + Pack(Path.Combine(mSourcePath, "../../IL2CPU/source/Cosmos.IL2CPU.API"), xNugetPkgDir); } private void CopyTemplates() { diff --git a/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj b/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj index 7232fd0940..e58f129266 100644 --- a/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj +++ b/source/Cosmos.Build.Common/Cosmos.Build.Common.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk @@ -9,7 +9,7 @@ - + diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj index d3db26cd3c..09a2d73241 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -5,11 +5,6 @@ win7-x86 True ..\..\Cosmos.snk - - NU1605 @@ -19,15 +14,11 @@ - - - - + + + + - - - - @@ -35,5 +26,11 @@ + + + + + + - \ No newline at end of file + diff --git a/source/Cosmos.Build.MSBuild/TheRingMaster.cs b/source/Cosmos.Build.MSBuild/TheRingMaster.cs index 2ed18e891f..226508f5a4 100644 --- a/source/Cosmos.Build.MSBuild/TheRingMaster.cs +++ b/source/Cosmos.Build.MSBuild/TheRingMaster.cs @@ -16,8 +16,6 @@ public class TheRingMaster : BaseToolTask [Required] public string WorkingDir { get; set; } - private List mAssemblySearchPaths; - public override bool Execute() { var xSW = Stopwatch.StartNew(); diff --git a/source/Cosmos.Common/Cosmos.Common.csproj b/source/Cosmos.Common/Cosmos.Common.csproj index 3f6649b2e3..16aa0998a3 100644 --- a/source/Cosmos.Common/Cosmos.Common.csproj +++ b/source/Cosmos.Common/Cosmos.Common.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.Core.DebugStub/Cosmos.Core.DebugStub.csproj b/source/Cosmos.Core.DebugStub/Cosmos.Core.DebugStub.csproj index d182782617..05fb29ab65 100644 --- a/source/Cosmos.Core.DebugStub/Cosmos.Core.DebugStub.csproj +++ b/source/Cosmos.Core.DebugStub/Cosmos.Core.DebugStub.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj index 4c64abcd42..eb0aa2ecad 100644 --- a/source/Cosmos.Core/Cosmos.Core.csproj +++ b/source/Cosmos.Core/Cosmos.Core.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj index 4282058faf..1b86084adb 100644 --- a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj +++ b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj @@ -1,16 +1,14 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk - Cosmos - Cosmos - + diff --git a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj index 4563dcbc3b..15749ff3f3 100644 --- a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj +++ b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.Core_Plugs/System/BitConverterImpl.cs b/source/Cosmos.Core_Plugs/System/BitConverterImpl.cs new file mode 100644 index 0000000000..5320c2a6ce --- /dev/null +++ b/source/Cosmos.Core_Plugs/System/BitConverterImpl.cs @@ -0,0 +1,207 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.Contracts; +using System.Text; + +using Cosmos.IL2CPU.API.Attribs; + +namespace Cosmos.Core_Plugs.System +{ + [Plug(typeof(BitConverter))] + public class BitConverterImpl + { + public static byte[] GetBytes(bool value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 1); + + byte[] r = new byte[1]; + r[0] = (value ? (byte)1 : (byte)0); + return r; + } + + public static byte[] GetBytes(char value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 2); + + return GetBytes((short)value); + } + + public unsafe static byte[] GetBytes(short value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 2); + + byte[] bytes = new byte[2]; + fixed (byte* b = bytes) + *((short*)b) = value; + return bytes; + } + + public unsafe static byte[] GetBytes(int value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 4); + + byte[] bytes = new byte[4]; + fixed (byte* b = bytes) + *((int*)b) = value; + return bytes; + } + + public unsafe static byte[] GetBytes(long value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 8); + + byte[] bytes = new byte[8]; + fixed (byte* b = bytes) + *((long*)b) = value; + return bytes; + } + + public static byte[] GetBytes(ushort value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 2); + + return GetBytes((short)value); + } + + public static byte[] GetBytes(uint value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 4); + + return GetBytes((int)value); + } + + public static byte[] GetBytes(ulong value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 8); + + return GetBytes((long)value); + } + + public unsafe static byte[] GetBytes(float value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 4); + + return GetBytes(*(int*)&value); + } + + public unsafe static byte[] GetBytes(double value) + { + Contract.Ensures(Contract.Result() != null); + Contract.Ensures(Contract.Result().Length == 8); + + return GetBytes(*(long*)&value); + } + + public static unsafe short ToInt16(byte[] value, int startIndex) + { + if (value == null) + ThrowValueArgumentNull(); + if ((uint)startIndex >= value.Length) + ThrowStartIndexArgumentOutOfRange(); + if (startIndex > value.Length - 2) + ThrowValueArgumentTooSmall(); + Contract.EndContractBlock(); + + fixed (byte* pbyte = &value[startIndex]) + { + if (startIndex % 2 == 0) + { + // data is aligned + return *((short*)pbyte); + } + else if (BitConverter.IsLittleEndian) + { + return (short)((*pbyte) | (*(pbyte + 1) << 8)); + } + else + { + return (short)((*pbyte << 8) | (*(pbyte + 1))); + } + } + } + + public static unsafe int ToInt32(byte[] value, int startIndex) + { + if (value == null) + ThrowValueArgumentNull(); + if ((uint)startIndex >= value.Length) + ThrowStartIndexArgumentOutOfRange(); + if (startIndex > value.Length - 4) + ThrowValueArgumentTooSmall(); + Contract.EndContractBlock(); + + fixed (byte* pbyte = &value[startIndex]) + { + if (startIndex % 4 == 0) + { + // data is aligned + return *((int*)pbyte); + } + else if (BitConverter.IsLittleEndian) + { + return (*pbyte) | (*(pbyte + 1) << 8) | (*(pbyte + 2) << 16) | (*(pbyte + 3) << 24); + } + else + { + return (*pbyte << 24) | (*(pbyte + 1) << 16) | (*(pbyte + 2) << 8) | (*(pbyte + 3)); + } + } + } + + public static unsafe long ToInt64(byte[] value, int startIndex) + { + if (value == null) + ThrowValueArgumentNull(); + if ((uint)startIndex >= value.Length) + ThrowStartIndexArgumentOutOfRange(); + if (startIndex > value.Length - 8) + ThrowValueArgumentTooSmall(); + Contract.EndContractBlock(); + + fixed (byte* pbyte = &value[startIndex]) + { + if (startIndex % 8 == 0) + { + // data is aligned + return *((long*)pbyte); + } + else if (BitConverter.IsLittleEndian) + { + int i1 = (*pbyte) | (*(pbyte + 1) << 8) | (*(pbyte + 2) << 16) | (*(pbyte + 3) << 24); + int i2 = (*(pbyte + 4)) | (*(pbyte + 5) << 8) | (*(pbyte + 6) << 16) | (*(pbyte + 7) << 24); + return (uint)i1 | ((long)i2 << 32); + } + else + { + int i1 = (*pbyte << 24) | (*(pbyte + 1) << 16) | (*(pbyte + 2) << 8) | (*(pbyte + 3)); + int i2 = (*(pbyte + 4) << 24) | (*(pbyte + 5) << 16) | (*(pbyte + 6) << 8) | (*(pbyte + 7)); + return (uint)i2 | ((long)i1 << 32); + } + } + } + + private static void ThrowValueArgumentNull() + { + throw new ArgumentNullException("value"); + } + + private static void ThrowStartIndexArgumentOutOfRange() + { + throw new ArgumentOutOfRangeException("startIndex", "ArgumentOutOfRange_Index"); + } + + private static void ThrowValueArgumentTooSmall() + { + throw new ArgumentException("Arg_ArrayPlusOffTooSmall", "value"); + } + } +} diff --git a/source/Cosmos.Core_Plugs/System/EnvironmentImpl.cs b/source/Cosmos.Core_Plugs/System/EnvironmentImpl.cs index 6fe407edf6..a4fc780d1c 100644 --- a/source/Cosmos.Core_Plugs/System/EnvironmentImpl.cs +++ b/source/Cosmos.Core_Plugs/System/EnvironmentImpl.cs @@ -1,102 +1,16 @@ -using System; -using Cosmos.IL2CPU.API; -using Cosmos.IL2CPU.API.Attribs; - -namespace Cosmos.Core_Plugs.System { - [Plug(Target = typeof(Environment))] - public static class EnvironmentImpl { - // [PlugMethod(Signature = "System_Environment_OSName__System_Environment_get_OSInfo__")] - // public static int get_OSName() { return 0x82; } - - public static string GetResourceFromDefault(string aResource) { - if (aResource == "ArgumentNull_Generic") { - return "Value cannot be null."; - } - if (aResource == "ArgumentNull_WithParamName") { - return "Parameter '{0}' cannot be null."; - } - if (aResource == "ArgumentNull_FileName") { - return "File name cannot be null."; - } - if (aResource == "ArgumentNull_Path") { - return "Path cannot be null."; - } - if (aResource == "ArgumentNull_Stream") { - return "Stream cannot be null."; - } - if (aResource == "ArgumentNull_String") { - return "String reference not set to an instance of a String."; - } - if (aResource == "Arg_ParamName_Name") { - return "Parameter name: {0}"; - } - if (aResource == "ArgumentOutOfRange_Index") { - return "Argument {0} out of range."; - } - if (aResource == "ArgumentOutOfRange_NegativeCount") { - return "Argument {0} out of range. It must not be negative."; - } - if (aResource == "Arg_EnumIllegalVal") { - return "Argument {0} contains an illegal enum value."; - } - if (aResource == "Argument_EmptyFileName") { - return "Empty file name is not legal."; - } - if (aResource == "Argument_EmptyPath") { - return "Empty path name is not legal."; - } - if (aResource == "Argument_EmptyName") { - return "Empty name is not legal."; - } - if (aResource == "Arg_NullReferenceException") { - return "Object reference not set to an instance of an object."; - } - if (aResource == "Arg_OverflowException") { - return "Arithmetic operation resulted in an overflow."; - } - if (aResource == "Arg_PathIllegal") { - return "The path is not of a legal form."; - } - if (aResource == "Arg_ArgumentException") { - return "Value does not fall within the expected range."; - } - if (aResource == "Arg_ArgumentOutOfRangeException") { - return "Specified argument was out of the range of valid values."; - } - if (aResource == "Arg_DirectoryNotFoundException") { - return "Attempted to access a path that is not on the disk."; - } - if (aResource == "Arg_DriveNotFoundException") { - return "Attempted to access a drive that is not available."; - } - if (aResource == "Arg_InvalidFileName") { - return "Specified file name was invalid."; - } - if (aResource == "Arg_InvalidFileExtension") { - return "Specified file extension was not a valid extension."; - } - if (aResource == "Argument_PathEmpty") { - return "Path cannot be the empty string or all whitespace."; - } - if (aResource == "Argument_PathFormatNotSupported") { - return "The given path's format is not supported."; - } +using System; +using System.Collections.Generic; +using System.Text; - //Console.Write("Getting resource: '"); - //Console.Write(aResource); - //Console.WriteLine("'"); - //Console.ReadLine(); - return aResource; - } - - // public static string GetResourceString(string key, - // params object[] values) - // { - // return string.Format(GetResourceString(key), values); - // } +using Cosmos.IL2CPU.API.Attribs; - public static string GetResourceString(string aResource) { - return GetResourceFromDefault(aResource); +namespace Cosmos.Core_Plugs.System +{ + [Plug(TargetName = "System.Environment, System.Private.CoreLib")] + public static class EnvironmentImpl + { + public static void CCtor() + { } } } diff --git a/source/Cosmos.Core_Plugs/System/Resources/ResourceManagerImpl.cs b/source/Cosmos.Core_Plugs/System/Resources/ResourceManagerImpl.cs index 067012d8c7..6ca4bdd5b3 100644 --- a/source/Cosmos.Core_Plugs/System/Resources/ResourceManagerImpl.cs +++ b/source/Cosmos.Core_Plugs/System/Resources/ResourceManagerImpl.cs @@ -19,7 +19,7 @@ public static void Ctor(Type aResourceSource) public static string GetString(string aString) { - return EnvironmentImpl.GetResourceString(aString); + return SRImpl.InternalGetResourceString(aString); } } } diff --git a/source/Cosmos.Core_Plugs/System/Runtime/CompilerServices/RuntimeHelpersImpl.cs b/source/Cosmos.Core_Plugs/System/Runtime/CompilerServices/RuntimeHelpersImpl.cs index f4dba1ddee..0d83b9bc72 100644 --- a/source/Cosmos.Core_Plugs/System/Runtime/CompilerServices/RuntimeHelpersImpl.cs +++ b/source/Cosmos.Core_Plugs/System/Runtime/CompilerServices/RuntimeHelpersImpl.cs @@ -38,5 +38,11 @@ public static int GetHashCode(object o) { throw new NotImplementedException(); } + + // TODO: Implement this correctly + public static bool IsReferenceOrContainsReferences() + { + return false; + } } } diff --git a/source/Cosmos.Core_Plugs/System/SRImpl.cs b/source/Cosmos.Core_Plugs/System/SRImpl.cs new file mode 100644 index 0000000000..26961123f2 --- /dev/null +++ b/source/Cosmos.Core_Plugs/System/SRImpl.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using Cosmos.IL2CPU.API.Attribs; + +namespace Cosmos.Core_Plugs.System +{ + [Plug("System.SR, System.Private.CoreLib")] + public class SRImpl + { + public static string InternalGetResourceString(string aKey) + { + if (aKey == "ArgumentNull_Generic") + { + return "Value cannot be null."; + } + if (aKey == "ArgumentNull_WithParamName") + { + return "Parameter '{0}' cannot be null."; + } + if (aKey == "ArgumentNull_FileName") + { + return "File name cannot be null."; + } + if (aKey == "ArgumentNull_Path") + { + return "Path cannot be null."; + } + if (aKey == "ArgumentNull_Stream") + { + return "Stream cannot be null."; + } + if (aKey == "ArgumentNull_String") + { + return "String reference not set to an instance of a String."; + } + if (aKey == "Arg_ParamName_Name") + { + return "Parameter name: {0}"; + } + if (aKey == "ArgumentOutOfRange_Index") + { + return "Argument {0} out of range."; + } + if (aKey == "ArgumentOutOfRange_NegativeCount") + { + return "Argument {0} out of range. It must not be negative."; + } + if (aKey == "Arg_EnumIllegalVal") + { + return "Argument {0} contains an illegal enum value."; + } + if (aKey == "Argument_EmptyFileName") + { + return "Empty file name is not legal."; + } + if (aKey == "Argument_EmptyPath") + { + return "Empty path name is not legal."; + } + if (aKey == "Argument_EmptyName") + { + return "Empty name is not legal."; + } + if (aKey == "Arg_NullReferenceException") + { + return "Object reference not set to an instance of an object."; + } + if (aKey == "Arg_OverflowException") + { + return "Arithmetic operation resulted in an overflow."; + } + if (aKey == "Arg_PathIllegal") + { + return "The path is not of a legal form."; + } + if (aKey == "Arg_ArgumentException") + { + return "Value does not fall within the expected range."; + } + if (aKey == "Arg_ArgumentOutOfRangeException") + { + return "Specified argument was out of the range of valid values."; + } + if (aKey == "Arg_DirectoryNotFoundException") + { + return "Attempted to access a path that is not on the disk."; + } + if (aKey == "Arg_DriveNotFoundException") + { + return "Attempted to access a drive that is not available."; + } + if (aKey == "Arg_InvalidFileName") + { + return "Specified file name was invalid."; + } + if (aKey == "Arg_InvalidFileExtension") + { + return "Specified file extension was not a valid extension."; + } + if (aKey == "Argument_PathEmpty") + { + return "Path cannot be the empty string or all whitespace."; + } + if (aKey == "Argument_PathFormatNotSupported") + { + return "The given path's format is not supported."; + } + + //Console.Write("Getting resource: '"); + //Console.Write(aResource); + //Console.WriteLine("'"); + //Console.ReadLine(); + return aKey; + } + } +} diff --git a/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj b/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj index 8875b57726..0cbffc634a 100644 --- a/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj +++ b/source/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk Cosmos.Debug.Common @@ -12,7 +12,7 @@ - + diff --git a/source/Cosmos.Debug.DebugConnectors/Cosmos.Debug.DebugConnectors.csproj b/source/Cosmos.Debug.DebugConnectors/Cosmos.Debug.DebugConnectors.csproj index 1b0f28b1a1..2c591d6eaf 100644 --- a/source/Cosmos.Debug.DebugConnectors/Cosmos.Debug.DebugConnectors.csproj +++ b/source/Cosmos.Debug.DebugConnectors/Cosmos.Debug.DebugConnectors.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk Cosmos.Debug.DebugConnectors @@ -10,6 +10,7 @@ + diff --git a/source/Cosmos.Debug.DebugConnectors/DebugConnectorEdison.cs b/source/Cosmos.Debug.DebugConnectors/DebugConnectorEdison.cs index 45126a1bfa..2bbf6cb50c 100644 --- a/source/Cosmos.Debug.DebugConnectors/DebugConnectorEdison.cs +++ b/source/Cosmos.Debug.DebugConnectors/DebugConnectorEdison.cs @@ -1,6 +1,4 @@ -#if SERIAL_PORT - -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -322,5 +320,3 @@ private static ushort Crc16(byte[] data) }; } } - -#endif diff --git a/source/Cosmos.Debug.DebugConnectors/DebugConnectorSerial.cs b/source/Cosmos.Debug.DebugConnectors/DebugConnectorSerial.cs index d18b9f2ff1..e431981c7d 100644 --- a/source/Cosmos.Debug.DebugConnectors/DebugConnectorSerial.cs +++ b/source/Cosmos.Debug.DebugConnectors/DebugConnectorSerial.cs @@ -1,6 +1,4 @@ -#if SERIAL_PORT - -using System; +using System; using System.Collections.Generic; using System.IO.Ports; using System.Linq; @@ -40,5 +38,3 @@ protected override bool GetIsConnectedToDebugStub() } } } - -#endif diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj index 6ffad4b50f..d47797922b 100644 --- a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj +++ b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj @@ -1,13 +1,14 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk + diff --git a/source/Cosmos.Debug.Hosts/Slave.cs b/source/Cosmos.Debug.Hosts/Slave.cs index 88490018f0..ddfcb0d981 100644 --- a/source/Cosmos.Debug.Hosts/Slave.cs +++ b/source/Cosmos.Debug.Hosts/Slave.cs @@ -1,5 +1,4 @@ -#if SERIAL_PORT -using System; +using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Text; @@ -119,4 +118,3 @@ public override void Stop() { } } } -#endif diff --git a/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj b/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj index 4ba00a0158..5599eae8bb 100644 --- a/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj +++ b/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj b/source/Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj index 8d91f8e713..b80f9b494c 100644 --- a/source/Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj +++ b/source/Cosmos.Debug.Kernel/Cosmos.Debug.Kernel.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj b/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj index 0f7b83596f..1521ac5bf6 100644 --- a/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj +++ b/source/Cosmos.Debug.Symbols/Cosmos.Debug.Symbols.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 True True ..\..\Cosmos.snk @@ -15,15 +15,15 @@ - + - + + - - + diff --git a/source/Cosmos.Debug.Symbols/DebugInfo.cs b/source/Cosmos.Debug.Symbols/DebugInfo.cs index d50db1a1c7..f18afcc8c0 100644 --- a/source/Cosmos.Debug.Symbols/DebugInfo.cs +++ b/source/Cosmos.Debug.Symbols/DebugInfo.cs @@ -443,8 +443,6 @@ public void WriteAllLocalsArgumentsInfos(IList aInfos) BulkInsert("LOCAL_ARGUMENT_INFOS", aInfos, aFlush: true); } - private static int DataDumpIndex; - // EF is slow on bulk operations. But we want to retain explicit bindings to the model to avoid unbound mistakes. // SqlBulk operations are on average 15x faster. So we use a hybrid approach by using the entities as containers // and EntityDataReader to bridge the gap to SqlBulk. diff --git a/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs b/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs index 686e9f634a..5296688f07 100644 --- a/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs +++ b/source/Cosmos.Debug.Symbols/DebugSymbolReader.cs @@ -239,7 +239,7 @@ public static Type GetCatchType(Module aModule, ExceptionRegion aRegion) return MetadataHelper.GetTypeFromReference(xReader, aModule, (TypeReferenceHandle)aRegion.CatchType, 0); case HandleKind.TypeDefinition: - break; + return aModule.ResolveType(MetadataTokens.GetToken(aRegion.CatchType)); case HandleKind.FieldDefinition: break; case HandleKind.MethodDefinition: diff --git a/source/Cosmos.HAL2/Cosmos.HAL2.csproj b/source/Cosmos.HAL2/Cosmos.HAL2.csproj index 40c085c3eb..4125fa0c1f 100644 --- a/source/Cosmos.HAL2/Cosmos.HAL2.csproj +++ b/source/Cosmos.HAL2/Cosmos.HAL2.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.System2/Cosmos.System2.csproj b/source/Cosmos.System2/Cosmos.System2.csproj index be994bca2e..707eecd729 100644 --- a/source/Cosmos.System2/Cosmos.System2.csproj +++ b/source/Cosmos.System2/Cosmos.System2.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj b/source/Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj index ef85a4de04..36d24c4119 100644 --- a/source/Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj +++ b/source/Cosmos.System2_Plugs/Cosmos.System2_Plugs.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True ..\..\Cosmos.snk - Cosmos - Cosmos diff --git a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs index 0d8e74a21b..3d897e7722 100644 --- a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs +++ b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs @@ -325,7 +325,6 @@ private void CreateDebugConnector() mDbgConnector = new DebugConnectorPipeServer(xPortParam); } break; -#if SERIAL_PORT case "serial:": if (xLaunch == "IntelEdison") { @@ -336,7 +335,6 @@ private void CreateDebugConnector() mDbgConnector = new DebugConnectorSerial(xPortParam); } break; -#endif default: throw new Exception("No debug connector found for port type '" + xPortType + "'"); @@ -427,7 +425,7 @@ internal AD7Process(Dictionary aDebugInfo, EngineCallback aCallb switch (mLaunch) { case LaunchType.VMware: -#region CheckIfHyperVServiceIsRunning + #region CheckIfHyperVServiceIsRunning using (System.ServiceProcess.ServiceController sc = new System.ServiceProcess.ServiceController("vmms")) { @@ -436,8 +434,7 @@ internal AD7Process(Dictionary aDebugInfo, EngineCallback aCallb if (sc.Status == System.ServiceProcess.ServiceControllerStatus.Running) { AD7Util.MessageBox( - "The Hyper-V Virtual Machine Management Service will be stopped. This is needed to allow to run VMware. If you press \"No\" the debug will stop.", - "Question"); + "The Hyper-V Virtual Machine Management Service will be stopped. This is needed to allow to run VMware."); sc.Stop(); } } @@ -447,15 +444,13 @@ internal AD7Process(Dictionary aDebugInfo, EngineCallback aCallb } } -#endregion CheckIfHyperVServiceIsRunning + #endregion mHost = new VMware(mDebugInfo, xUseGDB); break; -#if SERIAL_PORT case LaunchType.Slave: mHost = new Slave(mDebugInfo, xUseGDB); break; -#endif case LaunchType.Bochs: // The project has been created on another machine or Bochs has been uninstalled since the project has // been created. diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj index 7949d968ce..563cc1244a 100644 --- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj +++ b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj @@ -13,6 +13,11 @@ ..\..\Cosmos.snk + + Program + $(DevEnvDir)devenv.exe + /rootSuffix Exp + Debug AnyCPU @@ -114,11 +119,6 @@ Always true - - Always - true - true - true @@ -141,8 +141,8 @@ False - - ..\..\packages\Microsoft.Data.Sqlite.1.0.1\lib\net451\Microsoft.Data.Sqlite.dll + + ..\..\packages\Microsoft.Data.Sqlite.Core.2.0.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26606\lib\net45\Microsoft.VisualStudio.CoreUtility.dll @@ -219,17 +219,31 @@ True - ..\..\packages\Microsoft.VisualStudio.Threading.15.3.23\lib\net45\Microsoft.VisualStudio.Threading.dll + ..\..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll + True - ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26606\lib\net45\Microsoft.VisualStudio.Utilities.dll + ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26607\lib\net46\Microsoft.VisualStudio.Utilities.dll True - ..\..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll + ..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll + True + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.7\lib\net45\SQLitePCLRaw.batteries_green.dll + + + ..\..\packages\SQLitePCLRaw.bundle_green.1.1.7\lib\net45\SQLitePCLRaw.batteries_v2.dll + + + ..\..\packages\SQLitePCLRaw.core.1.1.7\lib\net45\SQLitePCLRaw.core.dll + + + ..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.7\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll + False @@ -238,27 +252,7 @@ - - ..\..\packages\System.IO.FileSystem.4.0.0\lib\net46\System.IO.FileSystem.dll - True - - - ..\..\packages\System.IO.FileSystem.Primitives.4.0.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - ..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - True - - - ..\..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - True - - - ..\..\packages\System.ServiceProcess.ServiceController.4.1.0\lib\net461\System.ServiceProcess.ServiceController.dll - True - @@ -319,12 +313,18 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + - + + + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.DebugEngine/Properties/Resources.Designer.cs b/source/Cosmos.VS.DebugEngine/Properties/Resources.Designer.cs index 0196bfffaf..e20883be07 100644 --- a/source/Cosmos.VS.DebugEngine/Properties/Resources.Designer.cs +++ b/source/Cosmos.VS.DebugEngine/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Cosmos.VS.DebugEngine.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/source/Cosmos.VS.DebugEngine/app.config b/source/Cosmos.VS.DebugEngine/app.config index 450dac4dc0..bcf3a14d3f 100644 --- a/source/Cosmos.VS.DebugEngine/app.config +++ b/source/Cosmos.VS.DebugEngine/app.config @@ -1,19 +1,19 @@ - + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.DebugEngine/packages.config b/source/Cosmos.VS.DebugEngine/packages.config index 4eaafe89a9..9edeafd6e0 100644 --- a/source/Cosmos.VS.DebugEngine/packages.config +++ b/source/Cosmos.VS.DebugEngine/packages.config @@ -1,11 +1,12 @@  - + + - + @@ -17,15 +18,17 @@ - - - + + + - - - - - + + + + + + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj index 6fe328ca03..aeae194e23 100644 --- a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj +++ b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj @@ -13,6 +13,11 @@ ..\..\Cosmos.snk + + Program + $(DevEnvDir)devenv.exe + /rootSuffix Exp + Debug AnyCPU @@ -38,7 +43,7 @@ DEBUG;TRACE prompt 4 - False + True pdbonly @@ -170,6 +175,7 @@ true + Designer true @@ -269,17 +275,19 @@ True - ..\..\packages\Microsoft.VisualStudio.Threading.15.3.23\lib\net45\Microsoft.VisualStudio.Threading.dll + ..\..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll + True - ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26606\lib\net45\Microsoft.VisualStudio.Utilities.dll + ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26607\lib\net46\Microsoft.VisualStudio.Utilities.dll True - ..\..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll + ..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll + True - - ..\..\packages\Microsoft.Win32.Registry.4.0.0\lib\net46\Microsoft.Win32.Registry.dll + + ..\..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll True @@ -289,27 +297,12 @@ - - ..\..\packages\System.ComponentModel.Primitives.4.1.0\lib\net45\System.ComponentModel.Primitives.dll - True - - - - ..\..\packages\System.Diagnostics.Process.4.1.0\lib\net461\System.Diagnostics.Process.dll - True - - - ..\..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll - True - - - ..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - True + + ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll - - ..\..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll - True + + ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll @@ -372,19 +365,27 @@ ..\MPF\12.0\ true + + + + True + / + + + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProject.csproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProject.csproj index 0baf9bcca7..1a0f11770c 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProject.csproj +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProject.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 $KernelProjectGuid$ diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProjKernel.vbproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProjKernel.vbproj index 9920f76d2c..f2de72e9af 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProjKernel.vbproj +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProjKernel.vbproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 $guid1$ diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProject.csproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProject.csproj index 8fae736238..0376f767cb 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProject.csproj +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProject.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 $KernelProjectGuid$ diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProject.fsproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProject.fsproj index 8fae736238..0376f767cb 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProject.fsproj +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProject.fsproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 $KernelProjectGuid$ diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProjKernel.vbproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProjKernel.vbproj index 9920f76d2c..f2de72e9af 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProjKernel.vbproj +++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProjKernel.vbproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 $guid1$ diff --git a/source/Cosmos.VS.ProjectSystem/app.config b/source/Cosmos.VS.ProjectSystem/app.config index 1642727946..ce3be3726d 100644 --- a/source/Cosmos.VS.ProjectSystem/app.config +++ b/source/Cosmos.VS.ProjectSystem/app.config @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/source/Cosmos.VS.ProjectSystem/packages.config b/source/Cosmos.VS.ProjectSystem/packages.config index d073b490bb..d7fe458272 100644 --- a/source/Cosmos.VS.ProjectSystem/packages.config +++ b/source/Cosmos.VS.ProjectSystem/packages.config @@ -4,7 +4,7 @@ - + @@ -15,15 +15,12 @@ - - - + + + - - - - - - - \ No newline at end of file + + + + diff --git a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj index 47fd96aca3..17a1f6d675 100644 --- a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj +++ b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj @@ -13,6 +13,11 @@ ..\..\Cosmos.snk + + Program + $(DevEnvDir)devenv.exe + /rootSuffix Exp + Debug AnyCPU @@ -188,33 +193,23 @@ True - ..\..\packages\Microsoft.VisualStudio.Threading.15.3.23\lib\net45\Microsoft.VisualStudio.Threading.dll + ..\..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll + True - ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26606\lib\net45\Microsoft.VisualStudio.Utilities.dll + ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26607\lib\net46\Microsoft.VisualStudio.Utilities.dll True - ..\..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll + ..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll + True - - ..\..\packages\System.Diagnostics.Process.4.1.0\lib\net461\System.Diagnostics.Process.dll - True - - - ..\..\packages\System.IO.4.1.0\lib\net462\System.IO.dll - True - - - ..\..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll - True - @@ -254,11 +249,6 @@ ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll True - - ..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - True - True - @@ -278,16 +268,16 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.Windows/app.config b/source/Cosmos.VS.Windows/app.config index 920e5aa99c..3165cfb812 100644 --- a/source/Cosmos.VS.Windows/app.config +++ b/source/Cosmos.VS.Windows/app.config @@ -1,15 +1,15 @@ - + - - + + - - + + - \ No newline at end of file + diff --git a/source/Cosmos.VS.Windows/packages.config b/source/Cosmos.VS.Windows/packages.config index 1665e88317..859a1d5c00 100644 --- a/source/Cosmos.VS.Windows/packages.config +++ b/source/Cosmos.VS.Windows/packages.config @@ -3,7 +3,7 @@ - + @@ -15,16 +15,8 @@ - - - + + + - - - - - - - - \ No newline at end of file diff --git a/source/Kernel-TapRoot/Demo/TRKernel.csproj b/source/Kernel-TapRoot/Demo/TRKernel.csproj index f54fceb1aa..6dc3e2497c 100644 --- a/source/Kernel-TapRoot/Demo/TRKernel.csproj +++ b/source/Kernel-TapRoot/Demo/TRKernel.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 f614d199-03e6-4cbd-836c-edb769b025a3 diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj index 1810e259e1..57467f6517 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True Cosmos.snk - Cosmos - Cosmos @@ -18,4 +16,4 @@ - \ No newline at end of file + diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj index d1e788e438..838510178d 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True Cosmos.snk - Cosmos - Cosmos @@ -14,7 +12,7 @@ - + diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj index 0df2337530..c1181d822c 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj @@ -1,12 +1,10 @@  - netstandard1.5 + netstandard2.0 True True Cosmos.snk - Cosmos - Cosmos @@ -23,4 +21,4 @@ - \ No newline at end of file + diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj index 630ba454b7..899c78f484 100644 --- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj +++ b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True Cosmos.snk - Cosmos - Cosmos @@ -18,4 +16,4 @@ - \ No newline at end of file + diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj index 6532b2f02b..08d0340a79 100644 --- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj +++ b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True Cosmos.snk - Cosmos - Cosmos diff --git a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj index 1ff1e6b376..b02ae0430e 100644 --- a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj +++ b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True Cosmos.snk - Cosmos - Cosmos @@ -21,4 +19,4 @@ - \ No newline at end of file + diff --git a/source/Kernel-X86/50-Application/GuessKernelGen3.csproj b/source/Kernel-X86/50-Application/GuessKernelGen3.csproj index cce071949b..96c7a8a0c8 100644 --- a/source/Kernel-X86/50-Application/GuessKernelGen3.csproj +++ b/source/Kernel-X86/50-Application/GuessKernelGen3.csproj @@ -1,7 +1,7 @@  - netstandard1.5 + netstandard2.0 {9E58E949-7B71-45ED-9610-11DA287EE933} diff --git a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj index 4f294505cb..021c14055e 100644 --- a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj +++ b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj @@ -1,11 +1,9 @@  - netstandard1.5 + netstandard2.0 True Cosmos.snk - Cosmos - Cosmos Cosmos.Plugs diff --git a/source/TheRingMaster/TheRingMaster.csproj b/source/TheRingMaster/TheRingMaster.csproj index 6bfefa6064..c4419838ca 100644 --- a/source/TheRingMaster/TheRingMaster.csproj +++ b/source/TheRingMaster/TheRingMaster.csproj @@ -1,7 +1,7 @@  - netcoreapp1.0 + netcoreapp2.0 Exe