From ec9e4f5cbd868281eafdc1f1f65014178714d60f Mon Sep 17 00:00:00 2001 From: zarlo <5899@zarlo.dev> Date: Thu, 25 Jan 2024 18:46:06 +1100 Subject: [PATCH] more work on docs with ui fixes --- Docs/api/.gitignore | 5 +++ Docs/api/cosmos/index.md | 0 Docs/api/il2cpu/index copy.md | 0 Docs/api/il2cpu/index.md | 0 Docs/api/index.md | 0 Docs/api/plugs/index.md | 0 Docs/api/xsharp/index.md | 0 Docs/articles/toc.md | 2 +- Docs/docfx.json | 33 ++++++++++++---- Docs/install.md | 2 +- Docs/toc.yml | 14 +++---- .../packages.lock.json | 14 +++++++ source/Cosmos.Build.Tasks/packages.lock.json | 24 +++++++++--- source/Cosmos.Core_Asm/packages.lock.json | 6 +-- source/Cosmos.Core_Plugs/packages.lock.json | 6 +-- source/Cosmos.Debug.GDB/packages.lock.json | 38 +++++++------------ source/Cosmos.Plugs/packages.lock.json | 6 +-- .../Cosmos.VS.DebugEngine/packages.lock.json | 24 +++++++++--- source/Cosmos.VS.Windows/packages.lock.json | 14 +++++++ 19 files changed, 127 insertions(+), 61 deletions(-) create mode 100644 Docs/api/.gitignore create mode 100644 Docs/api/cosmos/index.md create mode 100644 Docs/api/il2cpu/index copy.md create mode 100644 Docs/api/il2cpu/index.md create mode 100644 Docs/api/index.md create mode 100644 Docs/api/plugs/index.md create mode 100644 Docs/api/xsharp/index.md diff --git a/Docs/api/.gitignore b/Docs/api/.gitignore new file mode 100644 index 0000000000..e8079a3bef --- /dev/null +++ b/Docs/api/.gitignore @@ -0,0 +1,5 @@ +############### +# temp file # +############### +*.yml +.manifest diff --git a/Docs/api/cosmos/index.md b/Docs/api/cosmos/index.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/api/il2cpu/index copy.md b/Docs/api/il2cpu/index copy.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/api/il2cpu/index.md b/Docs/api/il2cpu/index.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/api/index.md b/Docs/api/index.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/api/plugs/index.md b/Docs/api/plugs/index.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/api/xsharp/index.md b/Docs/api/xsharp/index.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Docs/articles/toc.md b/Docs/articles/toc.md index 62545c5039..30cc3ead58 100644 --- a/Docs/articles/toc.md +++ b/Docs/articles/toc.md @@ -2,7 +2,7 @@ # [Compiler](Compiler/il2cpu.md) -# [Change Log](ChangeLog.md) +# [Change Log](Changelog.md) # Debugger ## [Debug Commands](Debugger/DebugCommands.md) diff --git a/Docs/docfx.json b/Docs/docfx.json index c95c3649ae..e0b21cc9e3 100644 --- a/Docs/docfx.json +++ b/Docs/docfx.json @@ -4,16 +4,33 @@ "src": [ { "files": [ - "Build.sln" + "IL2CPU/source/IL2CPU/IL2CPU.csproj", + "IL2CPU/source/IL2CPU.API/IL2CPU.API.csproj", + "IL2CPU/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj" ], "exclude": [ "**/bin/**", "**/obj/**" ], - "src": "../" + "src": "../../" + } + ], + "dest": "api/il2cpu" + }, + { + "src": [ + { + "files": [ + "XSharp/source/XSharp/XSharp/XSharp.csproj" + ], + "exclude": [ + "**/bin/**", + "**/obj/**" + ], + "src": "../../" } ], - "dest": "obj/api" + "dest": "api/xsharp" }, { "src": [ @@ -32,7 +49,7 @@ "src": "../" } ], - "dest": "obj/api/cosmos" + "dest": "api/cosmos" }, { "src": [ @@ -49,7 +66,7 @@ "src": "../" } ], - "dest": "obj/api/plugs" + "dest": "api/plugs" } ], "build": { @@ -58,21 +75,21 @@ "files": [ "**/*.yml" ], - "src": "obj/api", + "src": "api", "dest": "api" }, { "files": [ "**/*.yml" ], - "src": "obj/api/cosmos", + "src": "api/cosmos", "dest": "api/cosmos" }, { "files": [ "**/*.yml" ], - "src": "obj/api/plugs", + "src": "api/plugs", "dest": "api/plugs" }, { diff --git a/Docs/install.md b/Docs/install.md index dd93d577b5..6befc38f3e 100644 --- a/Docs/install.md +++ b/Docs/install.md @@ -58,6 +58,6 @@ cd .. 3. Wait for the install to progress. (**Tip:** At the end the installer may look like it is stalling, it is still doing something, just in the background) 4. VS will open with Cosmos loaded. You can now make changes to core assemblies of Cosmos. If you don't want to, you can close this VS window and create a new Cosmos project as with the user kit. -For more information about Dev Kit, see [here](https://cosmosos.github.io/articles/Installation/DevKit.html) +For more information about Dev Kit, see [here](articles/Installation/DevKit.html) Happy Cosmos-ing! diff --git a/Docs/toc.yml b/Docs/toc.yml index a55f5e4794..9dcf7f0094 100644 --- a/Docs/toc.yml +++ b/Docs/toc.yml @@ -7,11 +7,9 @@ - name: Articles href: articles/ homepage: articles/GettingStarted.md -- name: API Documentation - items: - - name: Cosmos - href: obj/api/cosmos - - name: X# - href: obj/api/xsharp - - name: IL2CPU - href: obj/api/il2cpu \ No newline at end of file +- name: Cosmos + href: api/cosmos/ +- name: X# + href: api/xsharp/ +- name: IL2CPU + href: api/il2cpu/ \ No newline at end of file diff --git a/Resources/Dependencies/DapperExtensions.StrongName/packages.lock.json b/Resources/Dependencies/DapperExtensions.StrongName/packages.lock.json index 78a23dd514..b243223560 100644 --- a/Resources/Dependencies/DapperExtensions.StrongName/packages.lock.json +++ b/Resources/Dependencies/DapperExtensions.StrongName/packages.lock.json @@ -13,6 +13,20 @@ "requested": "[4.7.0, )", "resolved": "4.7.0", "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" } } } diff --git a/source/Cosmos.Build.Tasks/packages.lock.json b/source/Cosmos.Build.Tasks/packages.lock.json index 2fb2ccf38b..206b6b268f 100644 --- a/source/Cosmos.Build.Tasks/packages.lock.json +++ b/source/Cosmos.Build.Tasks/packages.lock.json @@ -19,6 +19,15 @@ "System.Collections.Immutable": "5.0.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, "Dapper.StrongName": { "type": "Transitive", "resolved": "2.0.90", @@ -42,6 +51,11 @@ "resolved": "1.3.0", "contentHash": "/fn1Tfo7j7k/slViPlM8azJuxQmri7FZ8dQ+gTeLbI29leN/1VK0U/BFcRdJNctsRCUgyKJ2q+I0Tjq07Rc1/Q==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" + }, "Microsoft.VisualStudio.Setup.Configuration.Interop": { "type": "Transitive", "resolved": "1.16.30", @@ -112,8 +126,8 @@ }, "System.Data.SqlClient": { "type": "Transitive", - "resolved": "4.8.5", - "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==" + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" }, "System.Diagnostics.Process": { "type": "Transitive", @@ -249,7 +263,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, )" } @@ -277,8 +291,8 @@ }, "System.Data.SqlClient": { "type": "Transitive", - "resolved": "4.8.5", - "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==" + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" }, "System.Diagnostics.Process": { "type": "Transitive", diff --git a/source/Cosmos.Core_Asm/packages.lock.json b/source/Cosmos.Core_Asm/packages.lock.json index b2ef7abec0..0f9a6fec67 100644 --- a/source/Cosmos.Core_Asm/packages.lock.json +++ b/source/Cosmos.Core_Asm/packages.lock.json @@ -348,8 +348,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", @@ -1139,7 +1139,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/source/Cosmos.Core_Plugs/packages.lock.json b/source/Cosmos.Core_Plugs/packages.lock.json index b66e97d426..0996306333 100644 --- a/source/Cosmos.Core_Plugs/packages.lock.json +++ b/source/Cosmos.Core_Plugs/packages.lock.json @@ -348,8 +348,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", @@ -1160,7 +1160,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/source/Cosmos.Debug.GDB/packages.lock.json b/source/Cosmos.Debug.GDB/packages.lock.json index a9c11d7b3a..44eaab5a21 100644 --- a/source/Cosmos.Debug.GDB/packages.lock.json +++ b/source/Cosmos.Debug.GDB/packages.lock.json @@ -2,6 +2,20 @@ "version": 1, "dependencies": { ".NETFramework,Version=v4.7.2": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net472": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw==" + }, "Microsoft.Win32.Registry": { "type": "Transitive", "resolved": "5.0.0", @@ -30,30 +44,6 @@ "Microsoft.Win32.Registry": "[5.0.0, )" } } - }, - ".NETFramework,Version=v4.7.2/win7-x86": { - "Microsoft.Win32.Registry": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", - "dependencies": { - "System.Security.AccessControl": "5.0.0", - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.AccessControl": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", - "dependencies": { - "System.Security.Principal.Windows": "5.0.0" - } - }, - "System.Security.Principal.Windows": { - "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - } } } } \ No newline at end of file diff --git a/source/Cosmos.Plugs/packages.lock.json b/source/Cosmos.Plugs/packages.lock.json index 616c16cdc5..d0a70ef254 100644 --- a/source/Cosmos.Plugs/packages.lock.json +++ b/source/Cosmos.Plugs/packages.lock.json @@ -347,8 +347,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", @@ -1206,7 +1206,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/source/Cosmos.VS.DebugEngine/packages.lock.json b/source/Cosmos.VS.DebugEngine/packages.lock.json index 9106078d6a..3c7ea92d8c 100644 --- a/source/Cosmos.VS.DebugEngine/packages.lock.json +++ b/source/Cosmos.VS.DebugEngine/packages.lock.json @@ -2,6 +2,15 @@ "version": 1, "dependencies": { ".NETFramework,Version=v4.8": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, "Microsoft.VisualStudio.Debugger.Engine": { "type": "Direct", "requested": "[17.0.2012801, )", @@ -234,6 +243,11 @@ "resolved": "1.1.3", "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" + }, "Microsoft.ServiceHub.Analyzers": { "type": "Transitive", "resolved": "3.0.3078", @@ -961,8 +975,8 @@ }, "System.Data.SqlClient": { "type": "Transitive", - "resolved": "4.8.5", - "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==" + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", @@ -1324,7 +1338,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, )" } @@ -1390,8 +1404,8 @@ }, "System.Data.SqlClient": { "type": "Transitive", - "resolved": "4.8.5", - "contentHash": "fRqxut4lrndPHrXD+ht1XRmCL3obuKldm4XjCRYS9p5f7FSR7shBxAwTkDrpFMsHC9BhNgjjmUtiIjvehn5zkg==" + "resolved": "4.8.6", + "contentHash": "2Ij/LCaTQRyAi5lAv7UUTV9R2FobC8xN9mE0fXBZohum/xLl8IZVmE98Rq5ugQHjCgTBRKqpXRb4ORulRdA6Ig==" }, "System.Diagnostics.Process": { "type": "Transitive", diff --git a/source/Cosmos.VS.Windows/packages.lock.json b/source/Cosmos.VS.Windows/packages.lock.json index d86b3f9715..3d41a77e23 100644 --- a/source/Cosmos.VS.Windows/packages.lock.json +++ b/source/Cosmos.VS.Windows/packages.lock.json @@ -2,6 +2,15 @@ "version": 1, "dependencies": { ".NETFramework,Version=v4.8": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" + } + }, "Microsoft.VisualStudio.SDK": { "type": "Direct", "requested": "[17.0.31902.203, )", @@ -170,6 +179,11 @@ "resolved": "1.1.3", "contentHash": "3Wrmi0kJDzClwAC+iBdUBpEKmEle8FQNsCs77fkiOIw/9oYA07bL1EZNX0kQ2OMN3xpwvl0vAtOCYY3ndDNlhQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net48": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" + }, "Microsoft.ServiceHub.Analyzers": { "type": "Transitive", "resolved": "3.0.3078",