From e7952e2a7683776304654798ff87ba4f785cafad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Mon, 13 Feb 2023 15:30:46 +0100 Subject: [PATCH] Add submodules and configure dependencies --- .gitmodules | 3 +++ Connected.UI.sln | 31 ++++++++++++---------------- dependencies/Connected | 2 +- dependencies/Connected.Components | 1 + src/Connected.UI/Connected.UI.csproj | 4 ++-- 5 files changed, 20 insertions(+), 21 deletions(-) create mode 160000 dependencies/Connected.Components diff --git a/.gitmodules b/.gitmodules index 6f752c3..c8ecba3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dependencies/Connected"] path = dependencies/Connected url = https://git.tompit.com/Connected/Connected.git +[submodule "dependencies/Connected.Components"] + path = dependencies/Connected.Components + url = https://git.tompit.com/Connected/Connected.Components.git diff --git a/Connected.UI.sln b/Connected.UI.sln index 3a6e345..d8d3af3 100644 --- a/Connected.UI.sln +++ b/Connected.UI.sln @@ -3,15 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.32916.344 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "src\Connected\Connected.csproj", "{26AD2745-4DB4-4603-A944-C54D1A374032}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "src\Connected.Client\Connected.Client.csproj", "{F0E0F91D-DFCB-44B7-8BA1-5E74C5E008F5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "src\Connected.UI\Connected.UI.csproj", "{52D89174-140B-4017-8B52-B83FA936D809}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{0A1EBC0F-0567-41FB-9187-7DE1722FAB4E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\src\Connected.Components\Connected.Components.csproj", "{7A6A8DFF-E5B4-482D-98F9-B2AE76235093}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "dependencies\Connected\src\Connected.Client\Connected.Client.csproj", "{74A5C323-008A-4928-900B-9FC6559FF1AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "dependencies\Connected.Components\src\Connected.Components\Connected.Components.csproj", "{78850429-4E96-46CC-A099-7BF7D97DEA3A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,28 +17,25 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26AD2745-4DB4-4603-A944-C54D1A374032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26AD2745-4DB4-4603-A944-C54D1A374032}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26AD2745-4DB4-4603-A944-C54D1A374032}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26AD2745-4DB4-4603-A944-C54D1A374032}.Release|Any CPU.Build.0 = Release|Any CPU - {F0E0F91D-DFCB-44B7-8BA1-5E74C5E008F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0E0F91D-DFCB-44B7-8BA1-5E74C5E008F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0E0F91D-DFCB-44B7-8BA1-5E74C5E008F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0E0F91D-DFCB-44B7-8BA1-5E74C5E008F5}.Release|Any CPU.Build.0 = Release|Any CPU {52D89174-140B-4017-8B52-B83FA936D809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52D89174-140B-4017-8B52-B83FA936D809}.Debug|Any CPU.Build.0 = Debug|Any CPU {52D89174-140B-4017-8B52-B83FA936D809}.Release|Any CPU.ActiveCfg = Release|Any CPU {52D89174-140B-4017-8B52-B83FA936D809}.Release|Any CPU.Build.0 = Release|Any CPU - {7A6A8DFF-E5B4-482D-98F9-B2AE76235093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A6A8DFF-E5B4-482D-98F9-B2AE76235093}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A6A8DFF-E5B4-482D-98F9-B2AE76235093}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A6A8DFF-E5B4-482D-98F9-B2AE76235093}.Release|Any CPU.Build.0 = Release|Any CPU + {74A5C323-008A-4928-900B-9FC6559FF1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74A5C323-008A-4928-900B-9FC6559FF1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74A5C323-008A-4928-900B-9FC6559FF1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74A5C323-008A-4928-900B-9FC6559FF1AF}.Release|Any CPU.Build.0 = Release|Any CPU + {78850429-4E96-46CC-A099-7BF7D97DEA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {78850429-4E96-46CC-A099-7BF7D97DEA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78850429-4E96-46CC-A099-7BF7D97DEA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {78850429-4E96-46CC-A099-7BF7D97DEA3A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {7A6A8DFF-E5B4-482D-98F9-B2AE76235093} = {0A1EBC0F-0567-41FB-9187-7DE1722FAB4E} + {74A5C323-008A-4928-900B-9FC6559FF1AF} = {0A1EBC0F-0567-41FB-9187-7DE1722FAB4E} + {78850429-4E96-46CC-A099-7BF7D97DEA3A} = {0A1EBC0F-0567-41FB-9187-7DE1722FAB4E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4BE29712-DF74-4798-8F2E-92D7446D2465} diff --git a/dependencies/Connected b/dependencies/Connected index 5721864..cc259df 160000 --- a/dependencies/Connected +++ b/dependencies/Connected @@ -1 +1 @@ -Subproject commit 5721864f19815bd8f906ce52ae9f74301db69657 +Subproject commit cc259dfc18c4ad6989898fa813e281b9249c3bd3 diff --git a/dependencies/Connected.Components b/dependencies/Connected.Components new file mode 160000 index 0000000..a63bd4e --- /dev/null +++ b/dependencies/Connected.Components @@ -0,0 +1 @@ +Subproject commit a63bd4e5edec2e40f70fceebc700be4e3ac13def diff --git a/src/Connected.UI/Connected.UI.csproj b/src/Connected.UI/Connected.UI.csproj index e99c91c..7b2bd9a 100644 --- a/src/Connected.UI/Connected.UI.csproj +++ b/src/Connected.UI/Connected.UI.csproj @@ -16,8 +16,8 @@ - - + +