From b0161a9727561601758899481138c82e56887458 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 00:41:24 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Remov?= =?UTF-8?q?e.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 21 --------------------- KitX Core | 1 - KitX Standard/KitX Contracts | 1 - KitX Standard/KitX File Formats | 1 - KitX Standard/KitX Loaders | 1 - KitX Standard/KitX Plugins | 1 - KitX Standard/KitX Rules | 1 - KitX Standard/KitX Script | 1 - 8 files changed, 28 deletions(-) delete mode 160000 KitX Core delete mode 160000 KitX Standard/KitX Contracts delete mode 160000 KitX Standard/KitX File Formats delete mode 160000 KitX Standard/KitX Loaders delete mode 160000 KitX Standard/KitX Plugins delete mode 160000 KitX Standard/KitX Rules delete mode 160000 KitX Standard/KitX Script diff --git a/.gitmodules b/.gitmodules index ed7ebc5..aeef191 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,33 +10,12 @@ [submodule "KitX Clients/KitX Website"] path = KitX Clients/KitX Website url = git@github.com:Crequency/KitX-Website.git -[submodule "KitX Core"] - path = KitX Core - url = git@github.com:Crequency/KitX-Core.git [submodule "KitX Docs"] path = KitX Docs url = git@github.com:Crequency/KitX-Docs.git [submodule "KitX SDK"] path = KitX SDK url = git@github.com:Crequency/KitX-SDK.git -[submodule "KitX Standard/KitX Contracts"] - path = KitX Standard/KitX Contracts - url = git@github.com:Crequency/KitX-Contracts.git -[submodule "KitX Standard/KitX File Formats"] - path = KitX Standard/KitX File Formats - url = git@github.com:Crequency/KitX-File-Formats.git -[submodule "KitX Standard/KitX Loaders"] - path = KitX Standard/KitX Loaders - url = git@github.com:Crequency/KitX-Loaders.git -[submodule "KitX Standard/KitX Plugins"] - path = KitX Standard/KitX Plugins - url = git@github.com:Crequency/KitX-Plugins.git -[submodule "KitX Standard/KitX Rules"] - path = KitX Standard/KitX Rules - url = git@github.com:Crequency/KitX-Rules.git -[submodule "KitX Standard/KitX Script"] - path = KitX Standard/KitX Script - url = git@github.com:Crequency/KitX-Script.git [submodule "Reference/Common.ExternalConsole"] path = Reference/Common.ExternalConsole url = git@github.com:Crequency/Common.ExternalConsole.git diff --git a/KitX Core b/KitX Core deleted file mode 160000 index cc5a8e5..0000000 --- a/KitX Core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cc5a8e5567a6f0c43b7dfcc318fc36b1f303daa8 diff --git a/KitX Standard/KitX Contracts b/KitX Standard/KitX Contracts deleted file mode 160000 index 856ce49..0000000 --- a/KitX Standard/KitX Contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 856ce49b4aa841bde0b579f1a26d134dc8ac0808 diff --git a/KitX Standard/KitX File Formats b/KitX Standard/KitX File Formats deleted file mode 160000 index 7c17547..0000000 --- a/KitX Standard/KitX File Formats +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7c1754756979cf0c288f87dfbd4b7303322334e5 diff --git a/KitX Standard/KitX Loaders b/KitX Standard/KitX Loaders deleted file mode 160000 index 49dbb65..0000000 --- a/KitX Standard/KitX Loaders +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 49dbb65c89d72e90d4ab018ff87a51bcf1e4f48d diff --git a/KitX Standard/KitX Plugins b/KitX Standard/KitX Plugins deleted file mode 160000 index bbb51be..0000000 --- a/KitX Standard/KitX Plugins +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bbb51be339675fe5971eaf97d351de3eba54da9e diff --git a/KitX Standard/KitX Rules b/KitX Standard/KitX Rules deleted file mode 160000 index c4c630d..0000000 --- a/KitX Standard/KitX Rules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4c630d069233b829c8dc5d0dec9913d45219f85 diff --git a/KitX Standard/KitX Script b/KitX Standard/KitX Script deleted file mode 160000 index a9292af..0000000 --- a/KitX Standard/KitX Script +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9292af45321127bebd3e98a6fa569765d20aae5 From 9fca2d68efd9c4d24668b70a883a4a3f89c83e51 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 00:43:40 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=EF=BB=BF=F0=9F=93=9D=20Chore(Submodules)?= =?UTF-8?q?:=20Import=20`KitX=20Standard`=20as=20submodule.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ KitX Standard | 1 + 2 files changed, 4 insertions(+) create mode 160000 KitX Standard diff --git a/.gitmodules b/.gitmodules index aeef191..a43ccdc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "Reference/Common.Algorithm"] path = Reference/Common.Algorithm url = git@github.com:Crequency/Common.Algorithm.git +[submodule "KitX Standard"] + path = KitX Standard + url = git@github.com:Crequency/KitX-Standard.git diff --git a/KitX Standard b/KitX Standard new file mode 160000 index 0000000..467f0d1 --- /dev/null +++ b/KitX Standard @@ -0,0 +1 @@ +Subproject commit 467f0d1bd7d83c5c101fbac81677a0d6c46534c2 From 3cd9253425f0f5dfedd96ba3f53953f568d7f3b9 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 05:03:20 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=EF=BB=BF=F0=9F=92=BE=20Feat:=20Optimized?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 76 ++-- KitX Clients/KitX Dashboard | 2 +- KitX SDK | 2 +- KitX Standard | 2 +- KitX.sln | 418 +++++++++----------- Reference/Common.Activity | 2 +- Reference/Common.BasicHelper | 2 +- Reference/Common.ExternalConsole | 2 +- ToolKits/KitX.ToolKits.Publisher/Program.cs | 52 +-- 9 files changed, 261 insertions(+), 297 deletions(-) diff --git a/.editorconfig b/.editorconfig index f03a641..2b5d48b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ - + file_header_template = Copyright (c) Crequency Studio. All Rights Reserved.\nLicense under the AGPL, Version 3.0.\nFile Name: {fileName} [*] -end_of_line = crlf +end_of_line = lf charset = utf-8-bom trim_trailing_whitespace = true insert_final_newline = true @@ -44,9 +44,9 @@ dotnet_style_predefined_type_for_member_access = true:silent [*.cs] -#### ʽ #### +#### ������ʽ #### -# +# �������� dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface @@ -60,7 +60,7 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case -# Ź淶 +# ���Ź淶 dotnet_naming_symbols.interface.applicable_kinds = interface dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected @@ -74,7 +74,7 @@ dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, meth dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected dotnet_naming_symbols.non_field_members.required_modifiers = -# ʽ +# ������ʽ dotnet_naming_style.begins_with_i.required_prefix = I dotnet_naming_style.begins_with_i.required_suffix = @@ -134,51 +134,53 @@ csharp_style_deconstructed_variable_declaration = true:suggestion csharp_style_unused_value_assignment_preference = discard_variable:suggestion csharp_style_unused_value_expression_statement_preference = discard_variable:silent csharp_style_prefer_readonly_struct = true:suggestion +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_prefer_readonly_struct_member = true:suggestion [*.vb] -#### ʽ #### +#### ������ʽ #### -# +# �������� -dotnet_naming_rule.interface_should_be__i_ʼ.severity = suggestion -dotnet_naming_rule.interface_should_be__i_ʼ.symbols = interface -dotnet_naming_rule.interface_should_be__i_ʼ.style = _i_ʼ +dotnet_naming_rule.interface_should_be_��_i_��ʼ.severity = suggestion +dotnet_naming_rule.interface_should_be_��_i_��ʼ.symbols = interface +dotnet_naming_rule.interface_should_be_��_i_��ʼ.style = ��_i_��ʼ -dotnet_naming_rule._should_be_˹ƴд.severity = suggestion -dotnet_naming_rule._should_be_˹ƴд.symbols = -dotnet_naming_rule._should_be_˹ƴд.style = ˹ƴд +dotnet_naming_rule.����_should_be_��˹��ƴд��.severity = suggestion +dotnet_naming_rule.����_should_be_��˹��ƴд��.symbols = ���� +dotnet_naming_rule.����_should_be_��˹��ƴд��.style = ��˹��ƴд�� -dotnet_naming_rule.ֶγԱ_should_be_˹ƴд.severity = suggestion -dotnet_naming_rule.ֶγԱ_should_be_˹ƴд.symbols = ֶγԱ -dotnet_naming_rule.ֶγԱ_should_be_˹ƴд.style = ˹ƴд +dotnet_naming_rule.���ֶγ�Ա_should_be_��˹��ƴд��.severity = suggestion +dotnet_naming_rule.���ֶγ�Ա_should_be_��˹��ƴд��.symbols = ���ֶγ�Ա +dotnet_naming_rule.���ֶγ�Ա_should_be_��˹��ƴд��.style = ��˹��ƴд�� -# Ź淶 +# ���Ź淶 dotnet_naming_symbols.interface.applicable_kinds = interface dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected dotnet_naming_symbols.interface.required_modifiers = -dotnet_naming_symbols..applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols..applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected -dotnet_naming_symbols..required_modifiers = +dotnet_naming_symbols.����.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.����.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected +dotnet_naming_symbols.����.required_modifiers = -dotnet_naming_symbols.ֶγԱ.applicable_kinds = property, event, method -dotnet_naming_symbols.ֶγԱ.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected -dotnet_naming_symbols.ֶγԱ.required_modifiers = +dotnet_naming_symbols.���ֶγ�Ա.applicable_kinds = property, event, method +dotnet_naming_symbols.���ֶγ�Ա.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected +dotnet_naming_symbols.���ֶγ�Ա.required_modifiers = -# ʽ +# ������ʽ -dotnet_naming_style._i_ʼ.required_prefix = I -dotnet_naming_style._i_ʼ.required_suffix = -dotnet_naming_style._i_ʼ.word_separator = -dotnet_naming_style._i_ʼ.capitalization = pascal_case +dotnet_naming_style.��_i_��ʼ.required_prefix = I +dotnet_naming_style.��_i_��ʼ.required_suffix = +dotnet_naming_style.��_i_��ʼ.word_separator = +dotnet_naming_style.��_i_��ʼ.capitalization = pascal_case -dotnet_naming_style.˹ƴд.required_prefix = -dotnet_naming_style.˹ƴд.required_suffix = -dotnet_naming_style.˹ƴд.word_separator = -dotnet_naming_style.˹ƴд.capitalization = pascal_case +dotnet_naming_style.��˹��ƴд��.required_prefix = +dotnet_naming_style.��˹��ƴд��.required_suffix = +dotnet_naming_style.��˹��ƴд��.word_separator = +dotnet_naming_style.��˹��ƴд��.capitalization = pascal_case -dotnet_naming_style.˹ƴд.required_prefix = -dotnet_naming_style.˹ƴд.required_suffix = -dotnet_naming_style.˹ƴд.word_separator = -dotnet_naming_style.˹ƴд.capitalization = pascal_case +dotnet_naming_style.��˹��ƴд��.required_prefix = +dotnet_naming_style.��˹��ƴд��.required_suffix = +dotnet_naming_style.��˹��ƴд��.word_separator = +dotnet_naming_style.��˹��ƴд��.capitalization = pascal_case diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index cdc0d1d..e993df0 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit cdc0d1dc9124ede324d7382065342b44a76541a7 +Subproject commit e993df07d69fb091b8ba757a140c7169ca5eedde diff --git a/KitX SDK b/KitX SDK index 329fb1c..01722f0 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit 329fb1cf9c704fc942db7d01ed535a37a6e75db7 +Subproject commit 01722f0e009f330b1aee84b6eea94d6f483abd0c diff --git a/KitX Standard b/KitX Standard index 467f0d1..65986d0 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit 467f0d1bd7d83c5c101fbac81677a0d6c46534c2 +Subproject commit 65986d0527a97d723d7ac7548c6a1da9f6a58dae diff --git a/KitX.sln b/KitX.sln index 90fa368..5889a05 100644 --- a/KitX.sln +++ b/KitX.sln @@ -53,42 +53,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX SDK", "KitX SDK", "{69 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Dashboard", "KitX Dashboard", "{0194E969-1457-4C16-AFAB-D2753DFA07F0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Installer", "KitX Installer", "{20D9305C-5A28-45BC-BD55-87938747843F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Website", "KitX Website", "{A1516DDA-2794-4E4E-A094-908F1DFCFA28}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX Website", "KitX Clients\KitX Website\KitX Website\KitX Website.csproj", "{4741A2C7-6E86-4AD7-97C6-8063D33A392C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Mobile", "KitX Mobile", "{69C720E0-8FEE-4A12-8C01-D53622D1D93B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Contracts", "KitX Contracts", "{42654B2B-4B5A-4B78-BC0A-8D3B3D82EC9A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Loaders", "KitX Loaders", "{61C686D4-1725-4FA0-8603-014A097CE6CD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Plugins", "KitX Plugins", "{84C4A388-FC6D-4145-BB6D-A470F9EF57DD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Rules", "KitX Rules", "{6CFE4BA2-D9B0-400A-99AF-3D0F9D2E4F7F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Script", "KitX Script", "{7C64F32B-E1EE-45F7-94A7-DA2AD9288249}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX File Formats", "KitX File Formats", "{F1ED9B93-78A6-451D-A925-0F2BC2967FEF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Contract.CSharp", "KitX Standard\KitX Contracts\KitX.Contract.CSharp\KitX.Contract.CSharp.csproj", "{611E6974-2F22-4FBD-B4B2-E8EE5AE53436}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.CSharp", "KitX Standard\KitX Loaders\KitX.Loader.CSharp\KitX.Loader.CSharp.csproj", "{F161D795-F02D-47E2-AFA5-8BB1B5F6889C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.Winform.Core", "KitX Standard\KitX Loaders\KitX.Loader.Winform.Core\KitX.Loader.Winform.Core.csproj", "{97E847F5-5661-43A2-B2C3-5E32B5BC56D5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.WPF.Core", "KitX Standard\KitX Loaders\KitX.Loader.WPF.Core\KitX.Loader.WPF.Core.csproj", "{2776779F-F515-4D6B-89FE-34AE55746BBF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.CSharp", "KitX Standard\KitX Plugins\TestPlugin.CSharp\TestPlugin.CSharp.csproj", "{09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.Winform.Core", "KitX Standard\KitX Plugins\TestPlugin.Winform.Core\TestPlugin.Winform.Core.csproj", "{381211A0-4DEA-499C-81E3-DBFE2E513C20}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX Standard\KitX Plugins\TestPlugin.WPF.Core\TestPlugin.WPF.Core.csproj", "{8CB21869-07A9-4E13-A22D-F80B4AD8E27E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Web.Rules", "KitX Standard\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj", "{6332AC34-F87C-4F63-92CF-85FFC106F02F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kscript.Compiler", "KitX Standard\KitX Script\Kscript.Compiler\Kscript.Compiler.csproj", "{BA3762A1-C81E-4406-940B-AE38D2E854D3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kscript.Parser", "KitX Standard\KitX Script\Kscript.Parser\Kscript.Parser.csproj", "{FD951D65-861E-4605-BC09-D8D3271BE23A}" @@ -111,12 +81,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlMultiLanguageEditor", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlMultiLanguageEditor.Winform", "KitX SDK\Reference\XamlMultiLanguageEditor\XamlMultiLanguageEditor.Winform\XamlMultiLanguageEditor.Winform.csproj", "{1CA8F49B-F083-47A1-BA93-6C5A4A25938E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Formats.KXP", "KitX Standard\KitX File Formats\KitX.Formats.KXP\KitX.Formats.KXP.csproj", "{778C3C4C-E47A-4178-B6AC-D31657E08E7F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Dashboard", "KitX Clients\KitX Dashboard\KitX Dashboard\KitX.Dashboard.csproj", "{1DA8715C-E5A1-40CC-9C6C-F39E90A0C3E7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cheese", "KitX SDK\Cheese\Cheese.csproj", "{9663A503-6B07-4F77-A5F5-CF3DC6C682BC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.Shared", "KitX Standard\KitX.Shared\KitX.Shared.csproj", "{7A13A899-AA70-4E24-94AB-DD505514DF51}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.FileFormats", "KitX Standard\KitX.FileFormats\KitX.FileFormats.csproj", "{DA83377C-20F5-4954-8CE5-CFDB5BAAA910}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Loaders", "KitX Loaders", "{D6625876-40E0-4222-A6A9-4449BCA61D60}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Plugins", "KitX Plugins", "{447D9264-1F5D-4E66-801A-C43CA36B8D4F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.CSharp", "KitX SDK\KitX Loaders\KitX.Loader.CSharp\KitX.Loader.CSharp.csproj", "{5A8A4A32-653E-4DC5-99CB-5F1E59737835}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.WPF.Core", "KitX SDK\KitX Loaders\KitX.Loader.WPF.Core\KitX.Loader.WPF.Core.csproj", "{86D76F32-FAA4-40B4-A13E-8012914D7584}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Loader.Winform.Core", "KitX SDK\KitX Loaders\KitX.Loader.Winform.Core\KitX.Loader.Winform.Core.csproj", "{DCA4D799-1C34-40BE-BB3D-BA46EE81265F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.CSharp", "KitX SDK\KitX Plugins\TestPlugin.CSharp\TestPlugin.CSharp.csproj", "{CE84BF72-98C0-41A1-828B-1B09FB6C47B3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.Winform.Core", "KitX SDK\KitX Plugins\TestPlugin.Winform.Core\TestPlugin.Winform.Core.csproj", "{21365AC3-9A36-4014-B9D0-A427C17E600D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX SDK\KitX Plugins\TestPlugin.WPF.Core\TestPlugin.WPF.Core.csproj", "{73C9C918-2222-4425-9214-887BED47C77F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -451,26 +439,6 @@ Global {FB32C078-C7FD-4882-BCDB-D85F5CAE8B51}.Release|x64.Build.0 = Release|Any CPU {FB32C078-C7FD-4882-BCDB-D85F5CAE8B51}.Release|x86.ActiveCfg = Release|Any CPU {FB32C078-C7FD-4882-BCDB-D85F5CAE8B51}.Release|x86.Build.0 = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|ARM.Build.0 = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|ARM64.Build.0 = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|x64.ActiveCfg = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|x64.Build.0 = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|x86.ActiveCfg = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Debug|x86.Build.0 = Debug|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|Any CPU.Build.0 = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|ARM.ActiveCfg = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|ARM.Build.0 = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|ARM64.ActiveCfg = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|ARM64.Build.0 = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|x64.ActiveCfg = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|x64.Build.0 = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|x86.ActiveCfg = Release|Any CPU - {4741A2C7-6E86-4AD7-97C6-8063D33A392C}.Release|x86.Build.0 = Release|Any CPU {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Debug|Any CPU.Build.0 = Debug|Any CPU {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -491,146 +459,6 @@ Global {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Release|x64.Build.0 = Release|Any CPU {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Release|x86.ActiveCfg = Release|Any CPU {611E6974-2F22-4FBD-B4B2-E8EE5AE53436}.Release|x86.Build.0 = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|ARM.Build.0 = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|ARM64.Build.0 = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|x64.ActiveCfg = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|x64.Build.0 = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|x86.ActiveCfg = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Debug|x86.Build.0 = Debug|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|Any CPU.Build.0 = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|ARM.ActiveCfg = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|ARM.Build.0 = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|ARM64.ActiveCfg = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|ARM64.Build.0 = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|x64.ActiveCfg = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|x64.Build.0 = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|x86.ActiveCfg = Release|Any CPU - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C}.Release|x86.Build.0 = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|ARM.Build.0 = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|ARM64.Build.0 = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|x64.ActiveCfg = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|x64.Build.0 = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|x86.ActiveCfg = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Debug|x86.Build.0 = Debug|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|Any CPU.Build.0 = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|ARM.ActiveCfg = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|ARM.Build.0 = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|ARM64.ActiveCfg = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|ARM64.Build.0 = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|x64.ActiveCfg = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|x64.Build.0 = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|x86.ActiveCfg = Release|Any CPU - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5}.Release|x86.Build.0 = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|ARM.Build.0 = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|ARM64.Build.0 = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|x64.ActiveCfg = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|x64.Build.0 = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|x86.ActiveCfg = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Debug|x86.Build.0 = Debug|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|Any CPU.Build.0 = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|ARM.ActiveCfg = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|ARM.Build.0 = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|ARM64.ActiveCfg = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|ARM64.Build.0 = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|x64.ActiveCfg = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|x64.Build.0 = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|x86.ActiveCfg = Release|Any CPU - {2776779F-F515-4D6B-89FE-34AE55746BBF}.Release|x86.Build.0 = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|ARM.Build.0 = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|ARM64.Build.0 = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|x64.ActiveCfg = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|x64.Build.0 = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|x86.ActiveCfg = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Debug|x86.Build.0 = Debug|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|Any CPU.Build.0 = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|ARM.ActiveCfg = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|ARM.Build.0 = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|ARM64.ActiveCfg = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|ARM64.Build.0 = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|x64.ActiveCfg = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|x64.Build.0 = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|x86.ActiveCfg = Release|Any CPU - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D}.Release|x86.Build.0 = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|ARM.ActiveCfg = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|ARM.Build.0 = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|ARM64.Build.0 = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|x64.ActiveCfg = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|x64.Build.0 = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|x86.ActiveCfg = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Debug|x86.Build.0 = Debug|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|Any CPU.Build.0 = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|ARM.ActiveCfg = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|ARM.Build.0 = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|ARM64.ActiveCfg = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|ARM64.Build.0 = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|x64.ActiveCfg = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|x64.Build.0 = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|x86.ActiveCfg = Release|Any CPU - {381211A0-4DEA-499C-81E3-DBFE2E513C20}.Release|x86.Build.0 = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|ARM.Build.0 = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|ARM64.Build.0 = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|x64.ActiveCfg = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|x64.Build.0 = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|x86.ActiveCfg = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Debug|x86.Build.0 = Debug|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|Any CPU.Build.0 = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|ARM.ActiveCfg = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|ARM.Build.0 = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|ARM64.ActiveCfg = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|ARM64.Build.0 = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|x64.ActiveCfg = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|x64.Build.0 = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|x86.ActiveCfg = Release|Any CPU - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E}.Release|x86.Build.0 = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|ARM.Build.0 = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|ARM64.Build.0 = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|x64.ActiveCfg = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|x64.Build.0 = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|x86.ActiveCfg = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Debug|x86.Build.0 = Debug|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|Any CPU.Build.0 = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|ARM.ActiveCfg = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|ARM.Build.0 = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|ARM64.ActiveCfg = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|ARM64.Build.0 = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|x64.ActiveCfg = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|x64.Build.0 = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|x86.ActiveCfg = Release|Any CPU - {6332AC34-F87C-4F63-92CF-85FFC106F02F}.Release|x86.Build.0 = Release|Any CPU {BA3762A1-C81E-4406-940B-AE38D2E854D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BA3762A1-C81E-4406-940B-AE38D2E854D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA3762A1-C81E-4406-940B-AE38D2E854D3}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -811,26 +639,6 @@ Global {1CA8F49B-F083-47A1-BA93-6C5A4A25938E}.Release|x64.Build.0 = Release|Any CPU {1CA8F49B-F083-47A1-BA93-6C5A4A25938E}.Release|x86.ActiveCfg = Release|Any CPU {1CA8F49B-F083-47A1-BA93-6C5A4A25938E}.Release|x86.Build.0 = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|ARM.Build.0 = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|ARM64.Build.0 = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|x64.ActiveCfg = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|x64.Build.0 = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|x86.ActiveCfg = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Debug|x86.Build.0 = Debug|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|Any CPU.Build.0 = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|ARM.ActiveCfg = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|ARM.Build.0 = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|ARM64.ActiveCfg = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|ARM64.Build.0 = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|x64.ActiveCfg = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|x64.Build.0 = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|x86.ActiveCfg = Release|Any CPU - {778C3C4C-E47A-4178-B6AC-D31657E08E7F}.Release|x86.Build.0 = Release|Any CPU {1DA8715C-E5A1-40CC-9C6C-F39E90A0C3E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DA8715C-E5A1-40CC-9C6C-F39E90A0C3E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DA8715C-E5A1-40CC-9C6C-F39E90A0C3E7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -871,6 +679,166 @@ Global {9663A503-6B07-4F77-A5F5-CF3DC6C682BC}.Release|x64.Build.0 = Release|Any CPU {9663A503-6B07-4F77-A5F5-CF3DC6C682BC}.Release|x86.ActiveCfg = Release|Any CPU {9663A503-6B07-4F77-A5F5-CF3DC6C682BC}.Release|x86.Build.0 = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|ARM.Build.0 = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|ARM64.Build.0 = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|x64.ActiveCfg = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|x64.Build.0 = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|x86.ActiveCfg = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Debug|x86.Build.0 = Debug|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|Any CPU.Build.0 = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|ARM.ActiveCfg = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|ARM.Build.0 = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|ARM64.ActiveCfg = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|ARM64.Build.0 = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|x64.ActiveCfg = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|x64.Build.0 = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|x86.ActiveCfg = Release|Any CPU + {7A13A899-AA70-4E24-94AB-DD505514DF51}.Release|x86.Build.0 = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|ARM.Build.0 = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|ARM64.Build.0 = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|x64.ActiveCfg = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|x64.Build.0 = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|x86.ActiveCfg = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Debug|x86.Build.0 = Debug|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|Any CPU.Build.0 = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|ARM.ActiveCfg = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|ARM.Build.0 = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|ARM64.ActiveCfg = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|ARM64.Build.0 = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|x64.ActiveCfg = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|x64.Build.0 = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|x86.ActiveCfg = Release|Any CPU + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910}.Release|x86.Build.0 = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|ARM.ActiveCfg = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|ARM.Build.0 = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|ARM64.Build.0 = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|x64.Build.0 = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|x86.ActiveCfg = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Debug|x86.Build.0 = Debug|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|Any CPU.Build.0 = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|ARM.ActiveCfg = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|ARM.Build.0 = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|ARM64.ActiveCfg = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|ARM64.Build.0 = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|x64.ActiveCfg = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|x64.Build.0 = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|x86.ActiveCfg = Release|Any CPU + {5A8A4A32-653E-4DC5-99CB-5F1E59737835}.Release|x86.Build.0 = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|ARM.ActiveCfg = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|ARM.Build.0 = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|ARM64.Build.0 = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|x64.ActiveCfg = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|x64.Build.0 = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|x86.ActiveCfg = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Debug|x86.Build.0 = Debug|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|Any CPU.Build.0 = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|ARM.ActiveCfg = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|ARM.Build.0 = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|ARM64.ActiveCfg = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|ARM64.Build.0 = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|x64.ActiveCfg = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|x64.Build.0 = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|x86.ActiveCfg = Release|Any CPU + {86D76F32-FAA4-40B4-A13E-8012914D7584}.Release|x86.Build.0 = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|ARM.Build.0 = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|ARM64.Build.0 = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|x64.ActiveCfg = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|x64.Build.0 = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Debug|x86.Build.0 = Debug|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|Any CPU.Build.0 = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|ARM.ActiveCfg = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|ARM.Build.0 = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|ARM64.ActiveCfg = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|ARM64.Build.0 = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|x64.ActiveCfg = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|x64.Build.0 = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|x86.ActiveCfg = Release|Any CPU + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F}.Release|x86.Build.0 = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|ARM.Build.0 = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|ARM64.Build.0 = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|x64.Build.0 = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Debug|x86.Build.0 = Debug|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|Any CPU.Build.0 = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|ARM.ActiveCfg = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|ARM.Build.0 = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|ARM64.ActiveCfg = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|ARM64.Build.0 = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|x64.ActiveCfg = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|x64.Build.0 = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|x86.ActiveCfg = Release|Any CPU + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3}.Release|x86.Build.0 = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|ARM.Build.0 = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|ARM64.Build.0 = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|x64.ActiveCfg = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|x64.Build.0 = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|x86.ActiveCfg = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Debug|x86.Build.0 = Debug|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|Any CPU.Build.0 = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|ARM.ActiveCfg = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|ARM.Build.0 = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|ARM64.ActiveCfg = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|ARM64.Build.0 = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|x64.ActiveCfg = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|x64.Build.0 = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|x86.ActiveCfg = Release|Any CPU + {21365AC3-9A36-4014-B9D0-A427C17E600D}.Release|x86.Build.0 = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|ARM.Build.0 = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|ARM64.Build.0 = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|x64.ActiveCfg = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|x64.Build.0 = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|x86.ActiveCfg = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Debug|x86.Build.0 = Debug|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|Any CPU.Build.0 = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|ARM.ActiveCfg = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|ARM.Build.0 = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|ARM64.ActiveCfg = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|ARM64.Build.0 = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|x64.ActiveCfg = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|x64.Build.0 = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.ActiveCfg = Release|Any CPU + {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -893,24 +861,9 @@ Global {C2489F7B-49C0-418C-8A63-0A6C134A3E08} = {F021B1E7-44AC-469B-AB4D-36541902C694} {FB32C078-C7FD-4882-BCDB-D85F5CAE8B51} = {F021B1E7-44AC-469B-AB4D-36541902C694} {0194E969-1457-4C16-AFAB-D2753DFA07F0} = {673CF32C-65BF-4EB3-83D3-47FEC77B47A0} - {20D9305C-5A28-45BC-BD55-87938747843F} = {673CF32C-65BF-4EB3-83D3-47FEC77B47A0} - {A1516DDA-2794-4E4E-A094-908F1DFCFA28} = {673CF32C-65BF-4EB3-83D3-47FEC77B47A0} - {4741A2C7-6E86-4AD7-97C6-8063D33A392C} = {A1516DDA-2794-4E4E-A094-908F1DFCFA28} - {69C720E0-8FEE-4A12-8C01-D53622D1D93B} = {673CF32C-65BF-4EB3-83D3-47FEC77B47A0} {42654B2B-4B5A-4B78-BC0A-8D3B3D82EC9A} = {37E33B90-88B7-4404-9D42-D672A2916E6C} - {61C686D4-1725-4FA0-8603-014A097CE6CD} = {37E33B90-88B7-4404-9D42-D672A2916E6C} - {84C4A388-FC6D-4145-BB6D-A470F9EF57DD} = {37E33B90-88B7-4404-9D42-D672A2916E6C} - {6CFE4BA2-D9B0-400A-99AF-3D0F9D2E4F7F} = {37E33B90-88B7-4404-9D42-D672A2916E6C} {7C64F32B-E1EE-45F7-94A7-DA2AD9288249} = {37E33B90-88B7-4404-9D42-D672A2916E6C} - {F1ED9B93-78A6-451D-A925-0F2BC2967FEF} = {37E33B90-88B7-4404-9D42-D672A2916E6C} {611E6974-2F22-4FBD-B4B2-E8EE5AE53436} = {42654B2B-4B5A-4B78-BC0A-8D3B3D82EC9A} - {F161D795-F02D-47E2-AFA5-8BB1B5F6889C} = {61C686D4-1725-4FA0-8603-014A097CE6CD} - {97E847F5-5661-43A2-B2C3-5E32B5BC56D5} = {61C686D4-1725-4FA0-8603-014A097CE6CD} - {2776779F-F515-4D6B-89FE-34AE55746BBF} = {61C686D4-1725-4FA0-8603-014A097CE6CD} - {09E9D92F-953A-4F7B-A2E2-5A3A9FF4505D} = {84C4A388-FC6D-4145-BB6D-A470F9EF57DD} - {381211A0-4DEA-499C-81E3-DBFE2E513C20} = {84C4A388-FC6D-4145-BB6D-A470F9EF57DD} - {8CB21869-07A9-4E13-A22D-F80B4AD8E27E} = {84C4A388-FC6D-4145-BB6D-A470F9EF57DD} - {6332AC34-F87C-4F63-92CF-85FFC106F02F} = {6CFE4BA2-D9B0-400A-99AF-3D0F9D2E4F7F} {BA3762A1-C81E-4406-940B-AE38D2E854D3} = {7C64F32B-E1EE-45F7-94A7-DA2AD9288249} {FD951D65-861E-4605-BC09-D8D3271BE23A} = {7C64F32B-E1EE-45F7-94A7-DA2AD9288249} {1F197599-4C38-43A5-A6AD-C218DE17F5F6} = {7C64F32B-E1EE-45F7-94A7-DA2AD9288249} @@ -922,9 +875,18 @@ Global {E7AA1C4E-2766-4131-B18A-EF986AB45D19} = {69E9C41D-1848-4F9F-8C9C-0CAC1C167336} {CC0FBC12-F30C-480E-8FCA-A0382FB4F167} = {E7AA1C4E-2766-4131-B18A-EF986AB45D19} {1CA8F49B-F083-47A1-BA93-6C5A4A25938E} = {CC0FBC12-F30C-480E-8FCA-A0382FB4F167} - {778C3C4C-E47A-4178-B6AC-D31657E08E7F} = {F1ED9B93-78A6-451D-A925-0F2BC2967FEF} {1DA8715C-E5A1-40CC-9C6C-F39E90A0C3E7} = {0194E969-1457-4C16-AFAB-D2753DFA07F0} {9663A503-6B07-4F77-A5F5-CF3DC6C682BC} = {69E9C41D-1848-4F9F-8C9C-0CAC1C167336} + {7A13A899-AA70-4E24-94AB-DD505514DF51} = {37E33B90-88B7-4404-9D42-D672A2916E6C} + {DA83377C-20F5-4954-8CE5-CFDB5BAAA910} = {37E33B90-88B7-4404-9D42-D672A2916E6C} + {D6625876-40E0-4222-A6A9-4449BCA61D60} = {69E9C41D-1848-4F9F-8C9C-0CAC1C167336} + {447D9264-1F5D-4E66-801A-C43CA36B8D4F} = {69E9C41D-1848-4F9F-8C9C-0CAC1C167336} + {5A8A4A32-653E-4DC5-99CB-5F1E59737835} = {D6625876-40E0-4222-A6A9-4449BCA61D60} + {86D76F32-FAA4-40B4-A13E-8012914D7584} = {D6625876-40E0-4222-A6A9-4449BCA61D60} + {DCA4D799-1C34-40BE-BB3D-BA46EE81265F} = {D6625876-40E0-4222-A6A9-4449BCA61D60} + {CE84BF72-98C0-41A1-828B-1B09FB6C47B3} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} + {21365AC3-9A36-4014-B9D0-A427C17E600D} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} + {73C9C918-2222-4425-9214-887BED47C77F} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC} diff --git a/Reference/Common.Activity b/Reference/Common.Activity index a67f07a..265fc32 160000 --- a/Reference/Common.Activity +++ b/Reference/Common.Activity @@ -1 +1 @@ -Subproject commit a67f07a554d43326eadc3961c5ee708413481741 +Subproject commit 265fc32ab18818d2173aa4f53a996161aa140143 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index 30d09d6..97ee1eb 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit 30d09d666e6267567d29afe235afd27822597efb +Subproject commit 97ee1eb0089f0bb374425ad8b4c09e6b1f068d8b diff --git a/Reference/Common.ExternalConsole b/Reference/Common.ExternalConsole index 1495fa1..544083e 160000 --- a/Reference/Common.ExternalConsole +++ b/Reference/Common.ExternalConsole @@ -1 +1 @@ -Subproject commit 1495fa1df8a377d5eb0a008c3021e754632fdaca +Subproject commit 544083e9388b9a275b65e70ec8724bf4ac2dbdb9 diff --git a/ToolKits/KitX.ToolKits.Publisher/Program.cs b/ToolKits/KitX.ToolKits.Publisher/Program.cs index 16ae893..8794995 100644 --- a/ToolKits/KitX.ToolKits.Publisher/Program.cs +++ b/ToolKits/KitX.ToolKits.Publisher/Program.cs @@ -2,12 +2,14 @@ using System.Diagnostics; using System.IO.Compression; -Console.WriteLine(""" +Console.WriteLine( + """ KitX.ToolKits.Publisher Copyright (C) Crequency 2023 Last updated at: 2023.03.26 23:16 - """); + """ +); Configs.ProcessParameters(Environment.GetCommandLineArgs()); @@ -59,25 +61,29 @@ var color = get_random_color(); thread_output_colors.Add(index, color); var filename = Path.GetFileName(item); - var print = (string msg) => + + void print(string msg) { Console.ForegroundColor = thread_output_colors[index]; Console.WriteLine(msg); Console.ForegroundColor = default_color; - }; + } + tasks.Add(() => { var cmd = "dotnet"; - var arg = $"" + - $"publish \"{Path.GetFullPath(path + "/KitX.Dashboard.csproj")}\" " + - $"\"/p:PublishProfile={item}\""; + var arg = $"publish \"{Path.GetFullPath(path + "/KitX.Dashboard.csproj")}\" \"/p:PublishProfile={item}\""; lock (single_thread_update_lock) { - print($"" + - $">>> On task_{index}:\n" + - $" Task file: {filename}\n" + - $" Executing: {cmd} {arg}\n" + - $" Output:\n"); + print( + $""" + >>> On task_{index}: + Task file: {filename} + Executing: {cmd} {arg} + Output: + + """ + ); } var process = new Process(); var psi = new ProcessStartInfo() @@ -89,30 +95,25 @@ RedirectStandardOutput = true, RedirectStandardError = true }; - //process.StartInfo.FileName = cmd; - //process.StartInfo.Arguments = arg; - //process.StartInfo.CreateNoWindow = false; - //process.StartInfo.UseShellExecute = true; - //process.StartInfo.WindowStyle = ProcessWindowStyle.Minimized; process.StartInfo = psi; process.Start(); + while (!process.StandardOutput.EndOfStream) { - string? line = process.StandardOutput.ReadLine(); - Console.WriteLine($"" + - $" {line}"); + var line = process.StandardOutput.ReadLine(); + Console.WriteLine($" {line}"); } + process.WaitForExit(); lock (update_finished_threads_lock) { ++finished_threads; - print($"" + - $">>> Finished task_{index}, still {files.Length - finished_threads} tasks running."); + print($">>> Finished task_{index}, still {files.Length - finished_threads} tasks running."); } }); - print($"" + - $">>> New task: task_{index}\t-> {filename}"); + + print($">>> New task: task_{index}\t-> {filename}"); } if (!Configs.SkipGenerate) @@ -123,8 +124,7 @@ while (finished_threads != files.Length) ; // Wait until all tasks done. //Task.WhenAll(tasks); // If you want to use async/await, you can use this. -Console.WriteLine($"" + - $">>> All tasks done."); +Console.WriteLine($">>> All tasks done."); if (!Configs.SkipPacking && publishDir is not null) { From e3a33acaa9d83a17862ac0c67ad43914a8ac7b16 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 15:05:03 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=EF=BB=BF=F0=9F=93=A6=20Struct(Repo):=20O?= =?UTF-8?q?ptimized.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scripts}/check_new_commit.py | 0 .../Actions => .github/scripts}/pr_format.py | 0 ToolKits/KitX.ToolKits.Publisher/Configs.cs | 17 -- ToolKits/KitX.ToolKits.Publisher/Defines.cs | 9 - .../KitX.ToolKits.Publisher.csproj | 10 - ToolKits/KitX.ToolKits.Publisher/Program.cs | 154 ------------- ToolKits/start.ps1 | 208 ------------------ ToolKits/start.sh | 208 ------------------ 8 files changed, 606 deletions(-) rename {ToolKits/Actions => .github/scripts}/check_new_commit.py (100%) rename {ToolKits/Actions => .github/scripts}/pr_format.py (100%) delete mode 100644 ToolKits/KitX.ToolKits.Publisher/Configs.cs delete mode 100644 ToolKits/KitX.ToolKits.Publisher/Defines.cs delete mode 100644 ToolKits/KitX.ToolKits.Publisher/KitX.ToolKits.Publisher.csproj delete mode 100644 ToolKits/KitX.ToolKits.Publisher/Program.cs delete mode 100755 ToolKits/start.ps1 delete mode 100755 ToolKits/start.sh diff --git a/ToolKits/Actions/check_new_commit.py b/.github/scripts/check_new_commit.py similarity index 100% rename from ToolKits/Actions/check_new_commit.py rename to .github/scripts/check_new_commit.py diff --git a/ToolKits/Actions/pr_format.py b/.github/scripts/pr_format.py similarity index 100% rename from ToolKits/Actions/pr_format.py rename to .github/scripts/pr_format.py diff --git a/ToolKits/KitX.ToolKits.Publisher/Configs.cs b/ToolKits/KitX.ToolKits.Publisher/Configs.cs deleted file mode 100644 index 5e4707b..0000000 --- a/ToolKits/KitX.ToolKits.Publisher/Configs.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace KitX.ToolKits.Publisher; - -internal static class Configs -{ - internal static bool SkipGenerate = false; - - internal static bool SkipPacking = false; - - internal static void ProcessParameters(string[] args) - { - if (args.Any(x => x.ToLower().Equals("--skip-generate"))) - SkipGenerate = true; - - if (args.Any(x => x.ToLower().Equals("--skip-packing"))) - SkipPacking = true; - } -} diff --git a/ToolKits/KitX.ToolKits.Publisher/Defines.cs b/ToolKits/KitX.ToolKits.Publisher/Defines.cs deleted file mode 100644 index 518e266..0000000 --- a/ToolKits/KitX.ToolKits.Publisher/Defines.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace KitX.ToolKits.Publisher; - -internal static class Defines -{ - internal static List AvailableColors = new() - { - 1, 2, 3, 5, 9, 10, 11, 13 - }; -} diff --git a/ToolKits/KitX.ToolKits.Publisher/KitX.ToolKits.Publisher.csproj b/ToolKits/KitX.ToolKits.Publisher/KitX.ToolKits.Publisher.csproj deleted file mode 100644 index f02677b..0000000 --- a/ToolKits/KitX.ToolKits.Publisher/KitX.ToolKits.Publisher.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - Exe - net7.0 - enable - enable - - - diff --git a/ToolKits/KitX.ToolKits.Publisher/Program.cs b/ToolKits/KitX.ToolKits.Publisher/Program.cs deleted file mode 100644 index 8794995..0000000 --- a/ToolKits/KitX.ToolKits.Publisher/Program.cs +++ /dev/null @@ -1,154 +0,0 @@ -using KitX.ToolKits.Publisher; -using System.Diagnostics; -using System.IO.Compression; - -Console.WriteLine( - """ - KitX.ToolKits.Publisher - Copyright (C) Crequency 2023 - Last updated at: 2023.03.26 23:16 - - """ -); - -Configs.ProcessParameters(Environment.GetCommandLineArgs()); - -var publishDir = Path.GetFullPath("../../KitX Publish"); - -if (publishDir is not null && Directory.Exists(publishDir) && !Configs.SkipGenerate) - foreach (var dir in new DirectoryInfo(publishDir).GetDirectories()) - Directory.Delete(dir.FullName, true); - -var path = Path.GetFullPath("../../KitX Clients/KitX Dashboard/KitX Dashboard/"); -var pro = "Properties/"; -var pub = "PublishProfiles/"; -var ab_pub_path = Path.GetFullPath($"{path}{pro}{pub}"); -var files = Directory.GetFiles( - ab_pub_path, - "*.pubxml", - SearchOption.AllDirectories -); - -var finished_threads = 0; -var executing_thread_index = 0; - -var update_finished_threads_lock = new object(); -var single_thread_update_lock = new object(); - -var random = new Random(); - -var thread_output_colors = new Dictionary(); -var used_colors_count = 0; -var default_color = Console.ForegroundColor; -var get_random_index = (int max) => random.Next(0, max); -var get_random_color = () => -{ - var cc = Defines.AvailableColors[get_random_index(Defines.AvailableColors.Count)]; - if (used_colors_count < Defines.AvailableColors.Count) - { - while (thread_output_colors.Values.ToList().Contains((ConsoleColor)cc)) - cc = Defines.AvailableColors[get_random_index(Defines.AvailableColors.Count)]; - } - ++used_colors_count; - return (ConsoleColor)cc; -}; - -var tasks = new List(); - -foreach (var item in files) -{ - var index = executing_thread_index++; - var color = get_random_color(); - thread_output_colors.Add(index, color); - var filename = Path.GetFileName(item); - - void print(string msg) - { - Console.ForegroundColor = thread_output_colors[index]; - Console.WriteLine(msg); - Console.ForegroundColor = default_color; - } - - tasks.Add(() => - { - var cmd = "dotnet"; - var arg = $"publish \"{Path.GetFullPath(path + "/KitX.Dashboard.csproj")}\" \"/p:PublishProfile={item}\""; - lock (single_thread_update_lock) - { - print( - $""" - >>> On task_{index}: - Task file: {filename} - Executing: {cmd} {arg} - Output: - - """ - ); - } - var process = new Process(); - var psi = new ProcessStartInfo() - { - FileName = cmd, - Arguments = arg, - UseShellExecute = false, - CreateNoWindow = true, - RedirectStandardOutput = true, - RedirectStandardError = true - }; - process.StartInfo = psi; - process.Start(); - - while (!process.StandardOutput.EndOfStream) - { - var line = process.StandardOutput.ReadLine(); - Console.WriteLine($" {line}"); - } - - process.WaitForExit(); - - lock (update_finished_threads_lock) - { - ++finished_threads; - print($">>> Finished task_{index}, still {files.Length - finished_threads} tasks running."); - } - }); - - print($">>> New task: task_{index}\t-> {filename}"); -} - -if (!Configs.SkipGenerate) - foreach (var task in tasks) - task.Invoke(); - -if (!Configs.SkipGenerate) - while (finished_threads != files.Length) ; // Wait until all tasks done. -//Task.WhenAll(tasks); // If you want to use async/await, you can use this. - -Console.WriteLine($">>> All tasks done."); - -if (!Configs.SkipPacking && publishDir is not null) -{ - Console.WriteLine(">>> Begin packing."); - - var folders = new DirectoryInfo(publishDir).GetDirectories(); - - foreach (var folder in folders) - { - var name = folder.Name; - var zipFileName = $"{publishDir}/{name}.zip"; - - Console.WriteLine($">>> Packing {name}"); - - if (File.Exists(zipFileName)) - File.Delete(zipFileName); - - ZipFile.CreateFromDirectory( - folder.FullName, - zipFileName, - CompressionLevel.SmallestSize, - true - ); - } - - Console.WriteLine(">>> Packing done."); -} diff --git a/ToolKits/start.ps1 b/ToolKits/start.ps1 deleted file mode 100755 index 72f6082..0000000 --- a/ToolKits/start.ps1 +++ /dev/null @@ -1,208 +0,0 @@ -param($type) - -Write-Output "KitX Repository Initialize Script" -Write-Output "Last updated at: 2023.10.02 02:09" - -Write-Output "" -Write-Output "Type: $type" - -if($type -eq "list") -{ - Write-Output " - dashboard" - Write-Output " - mobile" - Write-Output " - website" - Write-Output " - installer" - Write-Output " - loader" - Write-Output " - plugin" - Write-Output " - reference" - Write-Output " - all" -} - -if($type -eq "dashboard") -{ - Write-Output " | KitX Dashboard" - Write-Output " | KitX File Formats" - Write-Output " | KitX Rules" - Write-Output " \ KitX Script" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Clients/KitX Dashboard" - Set-Location "KitX Clients/KitX Dashboard" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX File Formats" - Set-Location "KitX Standard/KitX File Formats" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Rules" - Set-Location "KitX Standard/KitX Rules" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Script" - Set-Location "KitX Standard/KitX Script" - git checkout dev=main - git pull - Set-Location "../.." - - Write-Output "" - Write-Output "To develop sets, you need sets too." -} - -if($type -eq "mobile") -{ - Write-Output " \ KitX Mobile" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Clients/KitX Mobile" - Set-Location "KitX Clients/KitX Mobile" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "website") -{ - Write-Output " \ KitX Website" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Clients/KitX Website" - Set-Location "KitX Clients/KitX Website" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "installer") -{ - Write-Output " \ KitX Installer" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Clients/KitX Installer" - Set-Location "KitX Clients/KitX Installer" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "loader") -{ - Write-Output " | KitX Contracts" - Write-Output " | KitX Loaders" - Write-Output " \ KitX Rules" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Standard/KitX Contracts" - Set-Location "KitX Standard/KitX Contracts" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Loaders" - Set-Location "KitX Standard/KitX Loaders" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Rules" - Set-Location "KitX Standard/KitX Rules" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "plugin") -{ - Write-Output " | KitX Contracts" - Write-Output " | KitX Loaders" - Write-Output " | KitX Plugins" - Write-Output " \ KitX Rules" - Write-Output "" - Write-Output "executing ..." - - git submodule update "KitX Standard/KitX Contracts" - Set-Location "KitX Standard/KitX Contracts" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Loaders" - Set-Location "KitX Standard/KitX Loaders" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Plugins" - Set-Location "KitX Standard/KitX Plugins" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "KitX Standard/KitX Rules" - Set-Location "KitX Standard/KitX Rules" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "reference") -{ - Write-Output " | Reference/Common.Activity" - Write-Output " | Reference/Common.Algorithm" - Write-Output " | Reference/Common.BasicHelper" - Write-Output " | Reference/Common.ExternalConsole" - Write-Output " \ Reference/Common.Update" - Write-Output "" - Write-Output "executing ..." - - git submodule update "Reference/Common.Activity" - Set-Location "Reference/Common.Activity" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "Reference/Common.Algorithm" - Set-Location "Reference/Common.Algorithm" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "Reference/Common.BasicHelper" - Set-Location "Reference/Common.BasicHelper" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "Reference/Common.ExternalConsole" - Set-Location "Reference/Common.ExternalConsole" - git checkout dev=main - git pull - Set-Location "../.." - - git submodule update "Reference/Common.Update" - Set-Location "Reference/Common.Update" - git checkout dev=main - git pull - Set-Location "../.." -} - -if($type -eq "all") -{ - Write-Output " + All Submodules" - Write-Output "" - Write-Output "executing ..." - - git submodule - - git submodule update --recursive -} diff --git a/ToolKits/start.sh b/ToolKits/start.sh deleted file mode 100755 index 3eaac61..0000000 --- a/ToolKits/start.sh +++ /dev/null @@ -1,208 +0,0 @@ -#!/usr/bin/bash - -echo "KitX Repository Initialize Script" -echo "Last updated at: 2023.10.02 02:09" - -echo "" -echo "Type: $1" - -if [ $1 = "list" ]; -then - echo " - dashboard" - echo " - mobile" - echo " - website" - echo " - installer" - echo " - loader" - echo " - plugin" - echo " - reference" - echo " - all" -fi - -if [ $1 = "dashboard" ]; -then - echo " | KitX Dashboard" - echo " | KitX File Formats" - echo " | KitX Rules" - echo " \ KitX Script" - echo "" - echo "executing ..." - - git submodule update "KitX Clients/KitX Dashboard" - cd "KitX Clients/KitX Dashboard" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX File Formats" - cd "KitX Standard/KitX File Formats" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Rules" - cd "KitX Standard/KitX Rules" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Script" - cd "KitX Standard/KitX Script" - git checkout dev=main - git pull - cd "../.." - - echo "" - echo "To develop sets, you need sets too." -fi - -if [ $1 = "mobile" ]; -then - echo " \ KitX Mobile" - echo "" - echo "executing ..." - - git submodule update "KitX Clients/KitX Mobile" - cd "KitX Clients/KitX Mobile" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "website" ]; -then - echo " \ KitX Website" - echo "" - echo "executing ..." - - git submodule update "KitX Clients/KitX Website" - cd "KitX Clients/KitX Website" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "installer" ]; -then - echo " \ KitX Installer" - echo "" - echo "executing ..." - - git submodule update "KitX Clients/KitX Installer" - cd "KitX Clients/KitX Installer" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "loader" ]; -then - echo " | KitX Contracts" - echo " | KitX Loaders" - echo " \ KitX Rules" - echo "" - echo "executing ..." - - git submodule update "KitX Standard/KitX Contracts" - cd "KitX Standard/KitX Contracts" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Loaders" - cd "KitX Standard/KitX Loaders" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Rules" - cd "KitX Standard/KitX Rules" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "plugin" ]; -then - echo " | KitX Contracts" - echo " | KitX Loaders" - echo " | KitX Plugins" - echo " \ KitX Rules" - echo "" - echo "executing ..." - - git submodule update "KitX Standard/KitX Contracts" - cd "KitX Standard/KitX Contracts" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Loaders" - cd "KitX Standard/KitX Loaders" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Plugins" - cd "KitX Standard/KitX Plugins" - git checkout dev=main - git pull - cd "../.." - - git submodule update "KitX Standard/KitX Rules" - cd "KitX Standard/KitX Rules" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "reference" ]; -then - echo " | Reference/Common.Activity" - echo " | Reference/Common.Algorithm" - echo " | Reference/Common.BasicHelper" - echo " | Reference/Common.ExternalConsole" - echo " \ Reference/Common.Update" - echo "" - echo "executing ..." - - git submodule update "Reference/Common.Activity" - cd "Reference/Common.Activity" - git checkout dev=main - git pull - cd "../.." - - git submodule update "Reference/Common.Algorithm" - cd "Reference/Common.Algorithm" - git checkout dev=main - git pull - cd "../.." - - git submodule update "Reference/Common.BasicHelper" - cd "Reference/Common.BasicHelper" - git checkout dev=main - git pull - cd "../.." - - git submodule update "Reference/Common.ExternalConsole" - cd "Reference/Common.ExternalConsole" - git checkout dev=main - git pull - cd "../.." - - git submodule update "Reference/Common.Update" - cd "Reference/Common.Update" - git checkout dev=main - git pull - cd "../.." -fi - -if [ $1 = "all" ]; -then - echo " + All Submodules" - echo "" - echo "executing ..." - - git submodule - - git submodule update --recursive -fi From da7f2b1c17c5dd5726bc753169d691eebd110887 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 16:57:50 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=F0=9F=92=BE=20Feat(Cheese):=20Move=20fun?= =?UTF-8?q?ctions=20in=20publisher=20to=20Cheese.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX.sln | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/KitX.sln b/KitX.sln index 5889a05..92f0dd6 100644 --- a/KitX.sln +++ b/KitX.sln @@ -33,10 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Update.Replacer.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Algorithm.Interop", "Reference\Common.Algorithm\Common.Algorithm.Interop\Common.Algorithm.Interop.csproj", "{9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ToolKits", "ToolKits", "{D18593CB-C881-4796-A2E2-EFB2195A8F86}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.ToolKits.Publisher", "ToolKits\KitX.ToolKits.Publisher\KitX.ToolKits.Publisher.csproj", "{1E1253F3-F24B-4085-833F-C2BEAE6C0B64}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Algorithm.Interop.Test", "Reference\Common.Algorithm\Common.Algorithm.Interop.Test\Common.Algorithm.Interop.Test.csproj", "{3EEF8BE8-40F1-4CDD-8D04-8BA4764857E3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.BasicHelper.Test", "Reference\Common.BasicHelper\Common.BasicHelper.Test\Common.BasicHelper.Test.csproj", "{15DBFE35-0C68-4949-B275-81FABE4895CF}" @@ -339,26 +335,6 @@ Global {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x64.Build.0 = Release|Any CPU {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x86.ActiveCfg = Release|Any CPU {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x86.Build.0 = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|ARM.Build.0 = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|ARM64.Build.0 = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|x64.ActiveCfg = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|x64.Build.0 = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|x86.ActiveCfg = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Debug|x86.Build.0 = Debug|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|Any CPU.Build.0 = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|ARM.ActiveCfg = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|ARM.Build.0 = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|ARM64.ActiveCfg = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|ARM64.Build.0 = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|x64.ActiveCfg = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|x64.Build.0 = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|x86.ActiveCfg = Release|Any CPU - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64}.Release|x86.Build.0 = Release|Any CPU {3EEF8BE8-40F1-4CDD-8D04-8BA4764857E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EEF8BE8-40F1-4CDD-8D04-8BA4764857E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EEF8BE8-40F1-4CDD-8D04-8BA4764857E3}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -855,7 +831,6 @@ Global {00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F} = {F021B1E7-44AC-469B-AB4D-36541902C694} {4F5B45DC-779A-43D4-AD72-72AF9F4AF371} = {F021B1E7-44AC-469B-AB4D-36541902C694} {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1} = {F021B1E7-44AC-469B-AB4D-36541902C694} - {1E1253F3-F24B-4085-833F-C2BEAE6C0B64} = {D18593CB-C881-4796-A2E2-EFB2195A8F86} {3EEF8BE8-40F1-4CDD-8D04-8BA4764857E3} = {F021B1E7-44AC-469B-AB4D-36541902C694} {15DBFE35-0C68-4949-B275-81FABE4895CF} = {F021B1E7-44AC-469B-AB4D-36541902C694} {C2489F7B-49C0-418C-8A63-0A6C134A3E08} = {F021B1E7-44AC-469B-AB4D-36541902C694} From 2b96ec22c487d98a02c31bf52fa1e7836093faca Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 17:07:49 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX SDK | 2 +- KitX Standard | 2 +- Reference/Common.BasicHelper | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/KitX SDK b/KitX SDK index 01722f0..0338dff 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit 01722f0e009f330b1aee84b6eea94d6f483abd0c +Subproject commit 0338dff0c83c820fca761da01ec589783996c850 diff --git a/KitX Standard b/KitX Standard index 65986d0..8dc0cf2 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit 65986d0527a97d723d7ac7548c6a1da9f6a58dae +Subproject commit 8dc0cf2287102b0150dc2e2a1c6014a80bc6ce32 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index 97ee1eb..90dd2a4 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit 97ee1eb0089f0bb374425ad8b4c09e6b1f068d8b +Subproject commit 90dd2a4ce153051cc4e2bc3c58d502d9b3066518 From fd0221f0c61fc6913e0d5b7b61b3f14d3bc3334b Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 8 Feb 2024 18:16:00 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX SDK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KitX SDK b/KitX SDK index 0338dff..4ba3a7b 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit 0338dff0c83c820fca761da01ec589783996c850 +Subproject commit 4ba3a7b1f3a21352ebcf95e39f687b2f8032c286 From 313f4815ce8a7c8ee59d5574fdbace1162823324 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Fri, 9 Feb 2024 02:55:46 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX SDK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KitX SDK b/KitX SDK index 4ba3a7b..e10992a 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit 4ba3a7b1f3a21352ebcf95e39f687b2f8032c286 +Subproject commit e10992a3263ab0aa374a286611bde6d982ac8641 From 702c86f26dd1e5ccaa28c183040895e5fdd1d741 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Fri, 16 Feb 2024 23:43:59 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=F0=9F=93=9D=20Chore:=20Sync=20submodules?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 11 +++++++---- KitX Clients/KitX Dashboard | 2 +- KitX Standard | 2 +- KitX.sln | 27 +++++++++++++++++++++++++-- Reference/Common.BasicHelper | 2 +- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2b5d48b..f0b6c0a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -41,6 +41,7 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion dotnet_style_namespace_match_folder = true:suggestion dotnet_style_predefined_type_for_locals_parameters_members = true:silent dotnet_style_predefined_type_for_member_access = true:silent +dotnet_style_prefer_collection_expression = true:suggestion [*.cs] @@ -91,14 +92,14 @@ dotnet_naming_style.pascal_case.required_suffix = dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case csharp_using_directive_placement = outside_namespace:silent -csharp_style_expression_bodied_methods = false:silent -csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_methods = when_on_single_line:silent +csharp_style_expression_bodied_constructors = when_on_single_line:silent +csharp_style_expression_bodied_operators = true:silent csharp_style_expression_bodied_properties = true:silent csharp_style_expression_bodied_indexers = true:silent csharp_style_expression_bodied_accessors = true:silent csharp_style_expression_bodied_lambdas = true:silent -csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_local_functions = when_on_single_line:silent csharp_style_conditional_delegate_call = true:suggestion csharp_style_var_for_built_in_types = false:silent csharp_style_var_when_type_is_apparent = false:silent @@ -136,6 +137,8 @@ csharp_style_unused_value_expression_statement_preference = discard_variable:sil csharp_style_prefer_readonly_struct = true:suggestion csharp_style_prefer_primary_constructors = true:suggestion csharp_style_prefer_readonly_struct_member = true:suggestion +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent [*.vb] #### ������ʽ #### diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index e993df0..7dadf3a 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit e993df07d69fb091b8ba757a140c7169ca5eedde +Subproject commit 7dadf3aea588c2a231e975904addcacbf8a28a41 diff --git a/KitX Standard b/KitX Standard index 8dc0cf2..a33e6b5 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit 8dc0cf2287102b0150dc2e2a1c6014a80bc6ce32 +Subproject commit a33e6b5de3e9e650cfabb53a79f37dd803332a82 diff --git a/KitX.sln b/KitX.sln index 92f0dd6..892a1cd 100644 --- a/KitX.sln +++ b/KitX.sln @@ -81,9 +81,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Dashboard", "KitX Clie EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cheese", "KitX SDK\Cheese\Cheese.csproj", "{9663A503-6B07-4F77-A5F5-CF3DC6C682BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.Shared", "KitX Standard\KitX.Shared\KitX.Shared.csproj", "{7A13A899-AA70-4E24-94AB-DD505514DF51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Shared", "KitX Standard\KitX.Shared\KitX.Shared.csproj", "{7A13A899-AA70-4E24-94AB-DD505514DF51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.FileFormats", "KitX Standard\KitX.FileFormats\KitX.FileFormats.csproj", "{DA83377C-20F5-4954-8CE5-CFDB5BAAA910}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.FileFormats", "KitX Standard\KitX.FileFormats\KitX.FileFormats.csproj", "{DA83377C-20F5-4954-8CE5-CFDB5BAAA910}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Loaders", "KitX Loaders", "{D6625876-40E0-4222-A6A9-4449BCA61D60}" EndProject @@ -101,6 +101,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.Winform.Core", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX SDK\KitX Plugins\TestPlugin.WPF.Core\TestPlugin.WPF.Core.csproj", "{73C9C918-2222-4425-9214-887BED47C77F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.BasicHelper.ConsoleTester", "Reference\Common.BasicHelper\Common.BasicHelper.ConsoleTester\Common.BasicHelper.ConsoleTester.csproj", "{305A9FDE-A36B-4186-AE39-B116ACFFAB8A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -815,6 +817,26 @@ Global {73C9C918-2222-4425-9214-887BED47C77F}.Release|x64.Build.0 = Release|Any CPU {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.ActiveCfg = Release|Any CPU {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.Build.0 = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM.Build.0 = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM64.Build.0 = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x64.ActiveCfg = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x64.Build.0 = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x86.Build.0 = Debug|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|Any CPU.Build.0 = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM.ActiveCfg = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM.Build.0 = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM64.ActiveCfg = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM64.Build.0 = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x64.ActiveCfg = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x64.Build.0 = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.ActiveCfg = Release|Any CPU + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -862,6 +884,7 @@ Global {CE84BF72-98C0-41A1-828B-1B09FB6C47B3} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {21365AC3-9A36-4014-B9D0-A427C17E600D} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {73C9C918-2222-4425-9214-887BED47C77F} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} + {305A9FDE-A36B-4186-AE39-B116ACFFAB8A} = {F021B1E7-44AC-469B-AB4D-36541902C694} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC} diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index 90dd2a4..fce10a0 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit 90dd2a4ce153051cc4e2bc3c58d502d9b3066518 +Subproject commit fce10a0917c9a73a4c6b1d21eafee1488d52c608 From eecbb4f6d0668104cd8ec42933a65a456aebcd73 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Sat, 17 Feb 2024 22:50:41 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodule):=20Import?= =?UTF-8?q?=20`CSharpell`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ Reference/CSharpell | 1 + 2 files changed, 4 insertions(+) create mode 160000 Reference/CSharpell diff --git a/.gitmodules b/.gitmodules index a43ccdc..997230d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "KitX Standard"] path = KitX Standard url = git@github.com:Crequency/KitX-Standard.git +[submodule "Reference/CSharpell"] + path = Reference/CSharpell + url = git@github.com:Dynesshely/CSharpell.git diff --git a/Reference/CSharpell b/Reference/CSharpell new file mode 160000 index 0000000..ee7fa57 --- /dev/null +++ b/Reference/CSharpell @@ -0,0 +1 @@ +Subproject commit ee7fa571054c6106b6aa9b1cb987bda191d10e3b From 5ce76dc794900a90a3aa6123bb9a45655dbe622a Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Sun, 18 Feb 2024 01:48:59 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Dashboard | 2 +- KitX Clients/KitX Mobile | 2 +- KitX Standard | 2 +- KitX.sln | 46 +++++++++++++++++++++++++++++++++++++ Reference/CSharpell | 2 +- Reference/Common.Activity | 2 +- 6 files changed, 51 insertions(+), 5 deletions(-) diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index 7dadf3a..37e8c23 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit 7dadf3aea588c2a231e975904addcacbf8a28a41 +Subproject commit 37e8c237f3ca15e3abbef8a1256af8ed8a69c3aa diff --git a/KitX Clients/KitX Mobile b/KitX Clients/KitX Mobile index 8eab8ee..494aa13 160000 --- a/KitX Clients/KitX Mobile +++ b/KitX Clients/KitX Mobile @@ -1 +1 @@ -Subproject commit 8eab8ee82beeda732c6b8c7a72ffa9fb55c4b11e +Subproject commit 494aa131d3063ff435e49ae0d2124212949039aa diff --git a/KitX Standard b/KitX Standard index a33e6b5..a1b978e 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit a33e6b5de3e9e650cfabb53a79f37dd803332a82 +Subproject commit a1b978e7523342cc1f212af25b0a1356249e8063 diff --git a/KitX.sln b/KitX.sln index 892a1cd..15e8068 100644 --- a/KitX.sln +++ b/KitX.sln @@ -103,6 +103,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.BasicHelper.ConsoleTester", "Reference\Common.BasicHelper\Common.BasicHelper.ConsoleTester\Common.BasicHelper.ConsoleTester.csproj", "{305A9FDE-A36B-4186-AE39-B116ACFFAB8A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell", "Reference\CSharpell\Csharpell\Csharpell.csproj", "{657F7502-43A9-4FC0-8026-1C8F2D103DBA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell.Core", "Reference\CSharpell\Csharpell.Core\Csharpell.Core.csproj", "{C161612B-8AE2-4F1C-A29E-875C411F31D1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -837,6 +841,46 @@ Global {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x64.Build.0 = Release|Any CPU {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.ActiveCfg = Release|Any CPU {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.Build.0 = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|ARM.Build.0 = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|ARM64.Build.0 = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|x64.ActiveCfg = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|x64.Build.0 = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|x86.ActiveCfg = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|x86.Build.0 = Debug|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|Any CPU.Build.0 = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|ARM.ActiveCfg = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|ARM.Build.0 = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|ARM64.ActiveCfg = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|ARM64.Build.0 = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|x64.ActiveCfg = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|x64.Build.0 = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|x86.ActiveCfg = Release|Any CPU + {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Release|x86.Build.0 = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|ARM.Build.0 = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|ARM64.Build.0 = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|x64.ActiveCfg = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|x64.Build.0 = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|x86.ActiveCfg = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Debug|x86.Build.0 = Debug|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|Any CPU.Build.0 = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|ARM.ActiveCfg = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|ARM.Build.0 = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|ARM64.ActiveCfg = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|ARM64.Build.0 = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|x64.ActiveCfg = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|x64.Build.0 = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|x86.ActiveCfg = Release|Any CPU + {C161612B-8AE2-4F1C-A29E-875C411F31D1}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -885,6 +929,8 @@ Global {21365AC3-9A36-4014-B9D0-A427C17E600D} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {73C9C918-2222-4425-9214-887BED47C77F} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {305A9FDE-A36B-4186-AE39-B116ACFFAB8A} = {F021B1E7-44AC-469B-AB4D-36541902C694} + {657F7502-43A9-4FC0-8026-1C8F2D103DBA} = {F021B1E7-44AC-469B-AB4D-36541902C694} + {C161612B-8AE2-4F1C-A29E-875C411F31D1} = {F021B1E7-44AC-469B-AB4D-36541902C694} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC} diff --git a/Reference/CSharpell b/Reference/CSharpell index ee7fa57..c03618c 160000 --- a/Reference/CSharpell +++ b/Reference/CSharpell @@ -1 +1 @@ -Subproject commit ee7fa571054c6106b6aa9b1cb987bda191d10e3b +Subproject commit c03618c8864aa3f5952b003425708f2f24ce643d diff --git a/Reference/Common.Activity b/Reference/Common.Activity index 265fc32..c819089 160000 --- a/Reference/Common.Activity +++ b/Reference/Common.Activity @@ -1 +1 @@ -Subproject commit 265fc32ab18818d2173aa4f53a996161aa140143 +Subproject commit c819089dd14aa86012bcca39078f96de36c79b35 From c753f556840478d2b05c1f4bc45023cbac43936d Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 19 Feb 2024 10:42:55 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Dashboard | 2 +- KitX.sln | 23 ----------------------- Reference/CSharpell | 2 +- Reference/Common.BasicHelper | 2 +- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index 37e8c23..880469a 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit 37e8c237f3ca15e3abbef8a1256af8ed8a69c3aa +Subproject commit 880469aa1e66558d96ca71bd1214f3b4f603e069 diff --git a/KitX.sln b/KitX.sln index 15e8068..68f2e1a 100644 --- a/KitX.sln +++ b/KitX.sln @@ -101,8 +101,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.Winform.Core", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX SDK\KitX Plugins\TestPlugin.WPF.Core\TestPlugin.WPF.Core.csproj", "{73C9C918-2222-4425-9214-887BED47C77F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.BasicHelper.ConsoleTester", "Reference\Common.BasicHelper\Common.BasicHelper.ConsoleTester\Common.BasicHelper.ConsoleTester.csproj", "{305A9FDE-A36B-4186-AE39-B116ACFFAB8A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell", "Reference\CSharpell\Csharpell\Csharpell.csproj", "{657F7502-43A9-4FC0-8026-1C8F2D103DBA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell.Core", "Reference\CSharpell\Csharpell.Core\Csharpell.Core.csproj", "{C161612B-8AE2-4F1C-A29E-875C411F31D1}" @@ -821,26 +819,6 @@ Global {73C9C918-2222-4425-9214-887BED47C77F}.Release|x64.Build.0 = Release|Any CPU {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.ActiveCfg = Release|Any CPU {73C9C918-2222-4425-9214-887BED47C77F}.Release|x86.Build.0 = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM.Build.0 = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|ARM64.Build.0 = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x64.ActiveCfg = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x64.Build.0 = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x86.ActiveCfg = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Debug|x86.Build.0 = Debug|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|Any CPU.Build.0 = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM.ActiveCfg = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM.Build.0 = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM64.ActiveCfg = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|ARM64.Build.0 = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x64.ActiveCfg = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x64.Build.0 = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.ActiveCfg = Release|Any CPU - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A}.Release|x86.Build.0 = Release|Any CPU {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU {657F7502-43A9-4FC0-8026-1C8F2D103DBA}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -928,7 +906,6 @@ Global {CE84BF72-98C0-41A1-828B-1B09FB6C47B3} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {21365AC3-9A36-4014-B9D0-A427C17E600D} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} {73C9C918-2222-4425-9214-887BED47C77F} = {447D9264-1F5D-4E66-801A-C43CA36B8D4F} - {305A9FDE-A36B-4186-AE39-B116ACFFAB8A} = {F021B1E7-44AC-469B-AB4D-36541902C694} {657F7502-43A9-4FC0-8026-1C8F2D103DBA} = {F021B1E7-44AC-469B-AB4D-36541902C694} {C161612B-8AE2-4F1C-A29E-875C411F31D1} = {F021B1E7-44AC-469B-AB4D-36541902C694} EndGlobalSection diff --git a/Reference/CSharpell b/Reference/CSharpell index c03618c..642426f 160000 --- a/Reference/CSharpell +++ b/Reference/CSharpell @@ -1 +1 @@ -Subproject commit c03618c8864aa3f5952b003425708f2f24ce643d +Subproject commit 642426f19caf26c436fd0edecade156b1d165383 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index fce10a0..58eb48c 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit fce10a0917c9a73a4c6b1d21eafee1488d52c608 +Subproject commit 58eb48c93ec52239c727b37132d8003620e3a5e5 From 9f3b5a08271cfdc586082c446a2575191d56f0b2 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Wed, 21 Feb 2024 05:25:21 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Updat?= =?UTF-8?q?ed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX SDK | 2 +- KitX Standard | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/KitX SDK b/KitX SDK index e10992a..dc07f98 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit e10992a3263ab0aa374a286611bde6d982ac8641 +Subproject commit dc07f98ce4ae8165a1419d47d43cbd4015ba3a85 diff --git a/KitX Standard b/KitX Standard index a1b978e..f6fe9d2 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit a1b978e7523342cc1f212af25b0a1356249e8063 +Subproject commit f6fe9d2ccb3bb0fbbfc240e4392bb3cb17e6fb89 From 85be6aebb9ef1fed85f40b392779c642eabc86ea Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Wed, 21 Feb 2024 05:35:27 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=F0=9F=94=A7=20Fix(Actions):=20Paths.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 9 +++-- .github/workflows/build-plugins.yml | 5 +-- .github/workflows/build.yml | 15 +++----- .github/workflows/publish-packages.yml | 52 +++++++++----------------- 4 files changed, 30 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index bf47bc4..8c67d0f 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -29,12 +29,15 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Build Loaders - working-directory: "KitX Standard/KitX Loaders" + working-directory: "KitX SDK/KitX Loaders" run: | + cd "KitX.Loader.CSharp" + dotnet build -c Release + cd ".." + cd "KitX.Loader.Winform.Core" dotnet build -c Release cd ".." diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index e63674a..e63cd6c 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -29,11 +29,10 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Build Plugins - working-directory: "KitX Standard/KitX Plugins" + working-directory: "KitX SDK/KitX Plugins" run: | cd "TestPlugin.CSharp" dotnet build -c Release diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbaab63..cbc844b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Build Contracts working-directory: "KitX Standard/KitX Contracts" @@ -43,19 +42,15 @@ jobs: dotnet build -c Release cd ".." - - name: Build Rules - working-directory: "KitX Standard/KitX Rules" + - name: Build Shared + working-directory: "KitX Standard/KitX.Shared" run: | - cd "KitX.Web.Rules" dotnet build -c Release - cd ".." - - name: Build File Format Helper - working-directory: "KitX Standard/KitX File Formats" + - name: Build File Formats + working-directory: "KitX Standard/KitX.FileFormats" run: | - cd "KitX.Formats.KXP" dotnet build -c Release - cd ".." - name: Build Dashboard working-directory: "KitX Clients/KitX Dashboard/KitX Dashboard" diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index ec6e2f6..1530cdd 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -23,8 +23,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Add to GitHub Repo run: | @@ -35,29 +34,27 @@ jobs: with: nuget-version: "6.x" - - name: Build and Publish `KitX.Contract.CSharp` - if: contains(github.event.head_commit.message, '[KitX.Contract.CSharp]') || contains(github.event.head_commit.message, '[All]') + - name: Build and Publish `Cheese` + if: contains(github.event.head_commit.message, '[Cheese]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX Standard" - - cd "KitX Contracts" + cd "KitX SDK" - cd "KitX.Contract.CSharp" + cd "Cheese" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - cd "../../.." + cd "../.." - - name: Build and Publish `KitX.Web.Rules` - if: contains(github.event.head_commit.message, '[KitX.Web.Rules]') || contains(github.event.head_commit.message, '[All]') + - name: Build and Publish `KitX.Contract.CSharp` + if: contains(github.event.head_commit.message, '[KitX.Contract.CSharp]') || contains(github.event.head_commit.message, '[All]') run: | cd "KitX Standard" - cd "KitX Rules" + cd "KitX Contracts" - cd "KitX.Web.Rules" + cd "KitX.Contract.CSharp" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol @@ -65,27 +62,12 @@ jobs: cd "../../.." - - name: Build and Publish `KitX.KXP.Helper` - if: contains(github.event.head_commit.message, '[KitX.KXP.Helper]') || contains(github.event.head_commit.message, '[All]') + - name: Build and Publish `KitX.Shared` + if: contains(github.event.head_commit.message, '[KitX.Shared]') || contains(github.event.head_commit.message, '[All]') run: | cd "KitX Standard" - cd "KitX File Formats" - - cd "KitX.File.Format.KXP" - dotnet build -c Release - - nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol - nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - - cd "../../.." - - - name: Build and Publish `KitX.KXP.Tool` - if: contains(github.event.head_commit.message, '[KitX.KXP.Tool]') || contains(github.event.head_commit.message, '[All]') - run: | - cd "KitX SDK" - - cd "KitX.KXP.Tool" + cd "KitX.Shared" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol @@ -93,12 +75,12 @@ jobs: cd "../.." - - name: Build and Publish `KitX.Struct.Producer` - if: contains(github.event.head_commit.message, '[KitX.Struct.Producer]') || contains(github.event.head_commit.message, '[All]') + - name: Build and Publish `KitX.FileFormats` + if: contains(github.event.head_commit.message, '[KitX.FileFormats]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX SDK" + cd "KitX Standard" - cd "KitX.Struct.Producer" + cd "KitX.FileFormats" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol From c8bf5ea325aa948326f62335af31f85e2db8c0f2 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Wed, 21 Feb 2024 05:36:07 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Mobile | 2 +- KitX SDK | 2 +- KitX Standard | 2 +- Reference/Common.BasicHelper | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/KitX Clients/KitX Mobile b/KitX Clients/KitX Mobile index 494aa13..d57ebca 160000 --- a/KitX Clients/KitX Mobile +++ b/KitX Clients/KitX Mobile @@ -1 +1 @@ -Subproject commit 494aa131d3063ff435e49ae0d2124212949039aa +Subproject commit d57ebca24f23c5504e6e235e80cc2cf95df49802 diff --git a/KitX SDK b/KitX SDK index dc07f98..e48f9fd 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit dc07f98ce4ae8165a1419d47d43cbd4015ba3a85 +Subproject commit e48f9fd4b7bae18e6182aede76326046b6bcfb53 diff --git a/KitX Standard b/KitX Standard index f6fe9d2..a9134a4 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit f6fe9d2ccb3bb0fbbfc240e4392bb3cb17e6fb89 +Subproject commit a9134a44d352f5b10337b384c59fb5230c7d05a5 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index 58eb48c..cad9216 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit 58eb48c93ec52239c727b37132d8003620e3a5e5 +Subproject commit cad92163cb2f321dedbacddd0e9bbbb06f85a3a3 From 36d774bd7af6821a430dd8bd992d1921b1c8d56e Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Thu, 22 Feb 2024 06:28:49 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index 880469a..9d2773b 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit 880469aa1e66558d96ca71bd1214f3b4f603e069 +Subproject commit 9d2773b8c237aba826995a59f8059c3b2a3056db From 777a62eb7ca9db6f0cdbdd8cfcbd0e6eb58b5c13 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Sun, 25 Feb 2024 19:10:55 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Dashboard | 2 +- KitX Clients/KitX Installer | 2 +- KitX Docs | 2 +- KitX SDK | 2 +- KitX Standard | 2 +- Reference/Common.BasicHelper | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index 9d2773b..eefe60f 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit 9d2773b8c237aba826995a59f8059c3b2a3056db +Subproject commit eefe60fa283ab06bf464e9c2ad7ae6d6a043c1a8 diff --git a/KitX Clients/KitX Installer b/KitX Clients/KitX Installer index db730f9..252eb2f 160000 --- a/KitX Clients/KitX Installer +++ b/KitX Clients/KitX Installer @@ -1 +1 @@ -Subproject commit db730f978db7e9bc5df5357b50ecbc3ff628fb4b +Subproject commit 252eb2f832fbd1b78028b63697042c7a8ee24040 diff --git a/KitX Docs b/KitX Docs index d2075a1..a2cd92f 160000 --- a/KitX Docs +++ b/KitX Docs @@ -1 +1 @@ -Subproject commit d2075a1916cf4c98960f19d9db15958003daa422 +Subproject commit a2cd92f3953757ecdb5cfe91f6edf144a283b670 diff --git a/KitX SDK b/KitX SDK index e48f9fd..3d403da 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit e48f9fd4b7bae18e6182aede76326046b6bcfb53 +Subproject commit 3d403daea82f78f499401e9143926e8324443b5f diff --git a/KitX Standard b/KitX Standard index a9134a4..91f4e9e 160000 --- a/KitX Standard +++ b/KitX Standard @@ -1 +1 @@ -Subproject commit a9134a44d352f5b10337b384c59fb5230c7d05a5 +Subproject commit 91f4e9e02b576537f1a2c45a9467616b222c5049 diff --git a/Reference/Common.BasicHelper b/Reference/Common.BasicHelper index cad9216..0375c34 160000 --- a/Reference/Common.BasicHelper +++ b/Reference/Common.BasicHelper @@ -1 +1 @@ -Subproject commit cad92163cb2f321dedbacddd0e9bbbb06f85a3a3 +Subproject commit 0375c34e2660f0cc718c4adf8e5ce3347c195d40 From 3a32122cee7256a7782824e9e3d3e97805ef3c62 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Sun, 25 Feb 2024 23:36:53 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Submodules):=20Sync.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KitX Clients/KitX Dashboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index eefe60f..c3e8d9b 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit eefe60fa283ab06bf464e9c2ad7ae6d6a043c1a8 +Subproject commit c3e8d9b0960f3633991dd34bb06c0c581ea6b2ee From c01998ac49c80a8f69648d9d86132f6b37a13b98 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 00:40:52 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=F0=9F=93=84=20Docs(README):=20Updated.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index d75e2ab..b99d61d 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,7 @@

- Docs website: - English | 简体中文 + Docs website: English | 简体中文 🌐

@@ -108,7 +107,7 @@ In this way, plug-ins on other devices in the LAN can also be connected to the c | ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) | - | `x64` | `arm` , `arm64` | :x: | :x: | `loongarch32 (ToDo)` , `loongarch64 (ToDo)` | | ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) | - | `x64` | `arm64` | :x: | :x: | :x: | | ![Android](https://img.shields.io/badge/Android-3DDC84?logo=android&logoColor=white) | Android 5.0 + (min: 21, compiled: 33, target: 33) | `x64` | `armeabi-v7a` , `arm64-v8a` | :x: | :x: | :x: | -| ![iOS](https://img.shields.io/badge/iOS-000000?logo=ios&logoColor=white) | - | :x: | `arm64` | :x: | :x: | :x: | +| ![iOS](https://img.shields.io/badge/iOS-000000?logo=ios&logoColor=white) | iOS 12.0 + | :x: | `arm64` | :x: | :x: | :x: | | ![Raspberry Pi](https://img.shields.io/badge/-RaspberryPi-C51A4A?logo=Raspberry-Pi) | - | :x: | :x: | :x: | :x: | :x: | | ![Browser](https://img.shields.io/badge/Browser-4285F4?logo=GoogleChrome&logoColor=white) | - | :x: | :x: | :x: | :x: | :x: | @@ -134,19 +133,21 @@ git submodule init 3. Select and init your development area ```shell -# Linux / MacOS -chmod +x ToolKits/start.sh -ToolKits/start.sh +## Linux / MacOS +# chmod +x ToolKits/start.sh +# ToolKits/start.sh -# or +## or -# Windows OS -ToolKits/start.ps1 +## Windows OS +# ToolKits/start.ps1 ``` -`` is area you want to develop, you can choose `dashboard`, `mobile`, `loader`, `plugin`, `installer` +> The new development tool `Cheese` is coming. -This script help you get source code of this area, include its dependencies. +~~`` is area you want to develop, you can choose `dashboard`, `mobile`, `loader`, `plugin`, `installer`~~ + +~~This script help you get source code of this area, include its dependencies.~~ If you want to get source code of all submodules at once, please execute following command instead: @@ -202,7 +203,7 @@ git submodule update --init --recursive | [v3.22.04.6235](https://github.com/Crequency/KitX/releases/tag/v3.22.04.6235) | Release | Break | :x: | 2022.04 -> 2023.04 | `Desktop`: .Net 6 (Also Self-Contained)
`Mobile`: Native | ![Windows](https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) | | [v3.22.04.6287](https://github.com/Crequency/KitX/releases/tag/v3.22.04.6287) | Release | Evolution | :x: | 2022.04 -> 2023.04 | `Desktop`: .Net 6 (Also Self-Contained)
`Mobile`: Native | ![Windows](https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) | | [v3.23.04.6488](https://github.com/Crequency/KitX/releases/tag/v3.23.04.6488) | Release | ToYou | :white_check_mark: | 2023.04 -> 2024.04 | `Desktop`: .Net 6 (Also Self-Contained)
`Mobile`: Native | ![Windows](https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) ![Android](https://img.shields.io/badge/Android-3DDC84?logo=android&logoColor=white) ![Raspberry Pi](https://img.shields.io/badge/-RaspberryPi-C51A4A?logo=Raspberry-Pi) | -| v3.24.10.x | Release | - | developing | 2024.10 -> 2025.04 | `Desktop`: .Net 7 (Also Self-Contained)
`Mobile`: Native | ![Windows](https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) ![Android](https://img.shields.io/badge/Android-3DDC84?logo=android&logoColor=white) ![iOS](https://img.shields.io/badge/iOS-000000?logo=ios&logoColor=white) ![Browser](https://img.shields.io/badge/Browser-4285F4?logo=GoogleChrome&logoColor=white) ![Raspberry Pi](https://img.shields.io/badge/-RaspberryPi-C51A4A?logo=Raspberry-Pi) | +| v3.24.10.x | Release | - | developing | 2024.10 -> 2025.04 | `Desktop`: .Net 8 (Also Self-Contained)
`Mobile`: Native | ![Windows](https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white) ![Linux](https://img.shields.io/badge/Linux-FCC624?logo=linux&logoColor=black) ![MacOS](https://img.shields.io/badge/mac%20os-000000?logo=macos&logoColor=F0F0F0) ![Android](https://img.shields.io/badge/Android-3DDC84?logo=android&logoColor=white) ![iOS](https://img.shields.io/badge/iOS-000000?logo=ios&logoColor=white) ![Raspberry Pi](https://img.shields.io/badge/-RaspberryPi-C51A4A?logo=Raspberry-Pi) | See details in [ChangeLog](./ChangeLog.md) @@ -213,21 +214,3 @@ See details in [ChangeLog](./ChangeLog.md) # Star History [![Star History Chart](https://api.star-history.com/svg?repos=Crequency/KitX&type=Timeline)](https://star-history.com/#Crequency/KitX&Timeline) - - - - From c79d6534c68104b87f9640d86a9aadc673dd5796 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 01:07:34 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Actions):=20Updated?= =?UTF-8?q?=20and=20corrected.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 5 +++-- .github/workflows/build-plugins.yml | 5 +++-- .github/workflows/build.yml | 5 +++-- .github/workflows/pr-auto-format.yml | 2 +- .github/workflows/publish-packages.yml | 4 ++-- KitX SDK | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index 8c67d0f..de7f9da 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -21,12 +21,13 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: + ref: dev=main submodules: "true" - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index e63cd6c..d99be40 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -21,12 +21,13 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: + ref: dev=main submodules: "true" - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbc844b..c06ac2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,12 +25,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: + ref: dev=main submodules: "true" - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x diff --git a/.github/workflows/pr-auto-format.yml b/.github/workflows/pr-auto-format.yml index d01d0c8..a6f065c 100644 --- a/.github/workflows/pr-auto-format.yml +++ b/.github/workflows/pr-auto-format.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Comment on Pull Request run: | diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 1530cdd..7bab9c6 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -15,12 +15,12 @@ jobs: if: contains(github.event.head_commit.message, '[Publish Packages]') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: "true" - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x diff --git a/KitX SDK b/KitX SDK index 3d403da..75611aa 160000 --- a/KitX SDK +++ b/KitX SDK @@ -1 +1 @@ -Subproject commit 3d403daea82f78f499401e9143926e8324443b5f +Subproject commit 75611aada7fab965c02797db7d2986dde5335fde From cc35ae51b0de2c5a55077c670aea4431851fe7ca Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 01:16:46 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Actions):=20Fix=20su?= =?UTF-8?q?b-submodules'=20errors.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 5 ++++ .github/workflows/build-plugins.yml | 5 ++++ .github/workflows/build.yml | 6 ++++- .github/workflows/publish-packages.yml | 37 +++++++++++--------------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index de7f9da..2dd0ea9 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -32,6 +32,11 @@ jobs: dotnet-version: | 8.0.x + - name: Setup Sub-submodules in `KitX SDK` + working-directory: "KitX SDK" + run: | + git submodule update --init --recursive + - name: Build Loaders working-directory: "KitX SDK/KitX Loaders" run: | diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index d99be40..6d60962 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -32,6 +32,11 @@ jobs: dotnet-version: | 8.0.x + - name: Setup Sub-submodules in `KitX SDK` + working-directory: "KitX SDK" + run: | + git submodule update --init --recursive + - name: Build Plugins working-directory: "KitX SDK/KitX Plugins" run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c06ac2f..a00d72e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,16 @@ jobs: dotnet-version: | 8.0.x + - name: Setup Sub-submodules in `KitX Standard` + working-directory: "KitX Standard" + run: | + git submodule update --init --recursive + - name: Build Contracts working-directory: "KitX Standard/KitX Contracts" run: | cd "KitX.Contract.CSharp" dotnet build -c Release - cd ".." - name: Build Shared working-directory: "KitX Standard/KitX.Shared" diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 7bab9c6..3229e3a 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -17,6 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + ref: dev=main submodules: "true" - name: Setup .NET @@ -25,6 +26,16 @@ jobs: dotnet-version: | 8.0.x + - name: Setup Sub-submodules in `KitX Standard` + working-directory: "KitX Standard" + run: | + git submodule update --init --recursive + + - name: Setup Sub-submodules in `KitX SDK` + working-directory: "KitX SDK" + run: | + git submodule update --init --recursive + - name: Add to GitHub Repo run: | nuget sources add -name github -Source https://nuget.pkg.github.com/Crequency/index.json -Username Crequency -Password ${{ secrets.GitHubToken }} @@ -35,55 +46,37 @@ jobs: nuget-version: "6.x" - name: Build and Publish `Cheese` + working-directory: "KitX SDK/Cheese" if: contains(github.event.head_commit.message, '[Cheese]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX SDK" - - cd "Cheese" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - cd "../.." - - name: Build and Publish `KitX.Contract.CSharp` + working-directory: "KitX Standard/KitX Contracts/KitX.Contract.CSharp" if: contains(github.event.head_commit.message, '[KitX.Contract.CSharp]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX Standard" - - cd "KitX Contracts" - - cd "KitX.Contract.CSharp" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - cd "../../.." - - name: Build and Publish `KitX.Shared` + working-directory: "KitX Standard/KitX.Shared" if: contains(github.event.head_commit.message, '[KitX.Shared]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX Standard" - - cd "KitX.Shared" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - cd "../.." - - name: Build and Publish `KitX.FileFormats` + working-directory: "KitX Standard/KitX.FileFormats" if: contains(github.event.head_commit.message, '[KitX.FileFormats]') || contains(github.event.head_commit.message, '[All]') run: | - cd "KitX Standard" - - cd "KitX.FileFormats" dotnet build -c Release nuget push ./bin/Release/*.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NugetKey }} -NoSymbol nuget push ./bin/Release/*.nupkg -Source github -SkipDuplicate - - cd "../.." From b3f8fa1531c3106f46c0a8990f375e70cd57deee Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 01:31:07 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Actions):=20Try=20to?= =?UTF-8?q?=20use=20`checkout`=20to=20run=20git=20command=20with=20default?= =?UTF-8?q?=20token.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 6 +++--- .github/workflows/build-plugins.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- .github/workflows/publish-packages.yml | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index 2dd0ea9..23effcc 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -32,9 +32,9 @@ jobs: dotnet-version: | 8.0.x - - name: Setup Sub-submodules in `KitX SDK` - working-directory: "KitX SDK" - run: | + - uses: actions/checkout@v4 + - run: | + cd "KitX SDK" git submodule update --init --recursive - name: Build Loaders diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index 6d60962..b5d84c8 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -32,9 +32,9 @@ jobs: dotnet-version: | 8.0.x - - name: Setup Sub-submodules in `KitX SDK` - working-directory: "KitX SDK" - run: | + - uses: actions/checkout@v4 + - run: | + cd "KitX SDK" git submodule update --init --recursive - name: Build Plugins diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a00d72e..e058055 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,9 +36,9 @@ jobs: dotnet-version: | 8.0.x - - name: Setup Sub-submodules in `KitX Standard` - working-directory: "KitX Standard" - run: | + - uses: actions/checkout@v4 + - run: | + cd "KitX Standard" git submodule update --init --recursive - name: Build Contracts diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 3229e3a..84cde4c 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -26,14 +26,14 @@ jobs: dotnet-version: | 8.0.x - - name: Setup Sub-submodules in `KitX Standard` - working-directory: "KitX Standard" - run: | + - uses: actions/checkout@v4 + - run: | + cd "KitX Standard" git submodule update --init --recursive - - name: Setup Sub-submodules in `KitX SDK` - working-directory: "KitX SDK" - run: | + - uses: actions/checkout@v4 + - run: | + cd "KitX SDK" git submodule update --init --recursive - name: Add to GitHub Repo From f99b3dc8153cae1dd51f131d964ef02714afb764 Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 01:40:39 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=F0=9F=93=9D=20Chore(Actions):=20Try=20to?= =?UTF-8?q?=20checkout=20sub-submodules=20standalone.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 13 ++++++++----- .github/workflows/build-plugins.yml | 13 ++++++++----- .github/workflows/build.yml | 13 ++++++++----- .github/workflows/publish-packages.yml | 26 ++++++++++++++++---------- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index 23effcc..f520366 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -26,17 +26,20 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX SDK + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-SDK" + ref: "dev=main" + path: "KitX SDK" + submodules: "true" + - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x - - uses: actions/checkout@v4 - - run: | - cd "KitX SDK" - git submodule update --init --recursive - - name: Build Loaders working-directory: "KitX SDK/KitX Loaders" run: | diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index b5d84c8..33413fd 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -26,17 +26,20 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX SDK + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-SDK" + ref: "dev=main" + path: "KitX SDK" + submodules: "true" + - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x - - uses: actions/checkout@v4 - - run: | - cd "KitX SDK" - git submodule update --init --recursive - - name: Build Plugins working-directory: "KitX SDK/KitX Plugins" run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e058055..a502637 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,17 +30,20 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX Standard + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-Standard" + ref: "dev=main" + path: "KitX Standard" + submodules: "true" + - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x - - uses: actions/checkout@v4 - - run: | - cd "KitX Standard" - git submodule update --init --recursive - - name: Build Contracts working-directory: "KitX Standard/KitX Contracts" run: | diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 84cde4c..65885c3 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -20,22 +20,28 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX Standard + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-Standard" + ref: "dev=main" + path: "KitX Standard" + submodules: "true" + + - name: Checkout KitX SDK + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-SDK" + ref: "dev=main" + path: "KitX SDK" + submodules: "true" + - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: | 8.0.x - - uses: actions/checkout@v4 - - run: | - cd "KitX Standard" - git submodule update --init --recursive - - - uses: actions/checkout@v4 - - run: | - cd "KitX SDK" - git submodule update --init --recursive - - name: Add to GitHub Repo run: | nuget sources add -name github -Source https://nuget.pkg.github.com/Crequency/index.json -Username Crequency -Password ${{ secrets.GitHubToken }} From f67cfd1c3f27575b8b326e306dc1cf798820115c Mon Sep 17 00:00:00 2001 From: Dynesshely Date: Mon, 26 Feb 2024 01:45:18 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=F0=9F=93=9D=20=F0=9F=94=A7=20Chore,=20Fi?= =?UTF-8?q?x(Actions):=20Also=20checkout=20Standard=20for=20other=20workfl?= =?UTF-8?q?ows.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-loaders.yml | 8 ++++++++ .github/workflows/build-plugins.yml | 8 ++++++++ .github/workflows/build.yml | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml index f520366..b194acc 100644 --- a/.github/workflows/build-loaders.yml +++ b/.github/workflows/build-loaders.yml @@ -26,6 +26,14 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX Standard + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-Standard" + ref: "dev=main" + path: "KitX Standard" + submodules: "true" + - name: Checkout KitX SDK uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml index 33413fd..21be551 100644 --- a/.github/workflows/build-plugins.yml +++ b/.github/workflows/build-plugins.yml @@ -26,6 +26,14 @@ jobs: ref: dev=main submodules: "true" + - name: Checkout KitX Standard + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-Standard" + ref: "dev=main" + path: "KitX Standard" + submodules: "true" + - name: Checkout KitX SDK uses: actions/checkout@v4 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a502637..9034ff8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,14 @@ jobs: path: "KitX Standard" submodules: "true" + - name: Checkout KitX SDK + uses: actions/checkout@v4 + with: + repository: "Crequency/KitX-SDK" + ref: "dev=main" + path: "KitX SDK" + submodules: "true" + - name: Setup .NET uses: actions/setup-dotnet@v4 with: