From 09e78364464d3fd7ecaac9dea3f54456dd340975 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 18:08:14 -0500 Subject: [PATCH 1/6] Add WindowsSettings Plugin as submodule --- .gitmodules | 3 +++ Flow.Launcher.sln | 15 +++++++++++++++ Plugins/Flow.Launcher.Plugin.WindowsSettings | 1 + 3 files changed, 19 insertions(+) create mode 100644 .gitmodules create mode 160000 Plugins/Flow.Launcher.Plugin.WindowsSettings diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..c390aee5011 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".\\Plugins\\Flow.Launcher.Plugin.WindowsSettings"] + path = .\\Plugins\\Flow.Launcher.Plugin.WindowsSettings + url = git@github.com:Flow-Launcher/Flow.Plugin.WindowsSettings.git diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln index 21c3b47dc0a..cadfda274d3 100644 --- a/Flow.Launcher.sln +++ b/Flow.Launcher.sln @@ -68,6 +68,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Proces EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.PluginsManager", "Plugins\Flow.Launcher.Plugin.PluginsManager\Flow.Launcher.Plugin.PluginsManager.csproj", "{4792A74A-0CEA-4173-A8B2-30E6764C6217}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flow.Plugin.WindowsSettings", "Plugins\Flow.Launcher.Plugin.WindowsSettings\Flow.Plugin.WindowsSettings.csproj", "{5043CECE-E6A7-4867-9CBE-02D27D83747A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -283,6 +285,18 @@ Global {4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x64.Build.0 = Release|Any CPU {4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x86.ActiveCfg = Release|Any CPU {4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x86.Build.0 = Release|Any CPU + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|Any CPU.ActiveCfg = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|Any CPU.Build.0 = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x64.ActiveCfg = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x64.Build.0 = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x86.ActiveCfg = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x86.Build.0 = Debug|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|Any CPU.ActiveCfg = Release|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|Any CPU.Build.0 = Release|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.ActiveCfg = Release|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.Build.0 = Release|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.ActiveCfg = Release|x64 + {5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -300,6 +314,7 @@ Global {F9C4C081-4CC3-4146-95F1-E102B4E10A5F} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} {588088F4-3262-4F9F-9663-A05DE12534C3} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} {4792A74A-0CEA-4173-A8B2-30E6764C6217} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} + {5043CECE-E6A7-4867-9CBE-02D27D83747A} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F26ACB50-3F6C-4907-B0C9-1ADACC1D0DED} diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings b/Plugins/Flow.Launcher.Plugin.WindowsSettings new file mode 160000 index 00000000000..0a7ca4f5fef --- /dev/null +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings @@ -0,0 +1 @@ +Subproject commit 0a7ca4f5fef89af958f1d28408b273837b424c31 From 988a762e96b6a3c67f382c72f39624a9d5a72cfe Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 22:36:23 -0500 Subject: [PATCH 2/6] add submodule init for appveyor --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b45b4018689..f49a2d838e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,10 @@ init: - sc config WSearch start= auto # Starts Windows Search service- Needed for running ExplorerTest - net start WSearch +install: + - cd %APPVEYOR_BUILD_FOLDER% + - git submodule update --init --recursive + assembly_info: patch: true file: SolutionAssemblyInfo.cs From 23323211872bf08c532ca2a5dbbdea41b8755739 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 23:41:56 -0500 Subject: [PATCH 3/6] Fix Submodule Issue --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c390aee5011..39ad4b93b25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".\\Plugins\\Flow.Launcher.Plugin.WindowsSettings"] - path = .\\Plugins\\Flow.Launcher.Plugin.WindowsSettings +[submodule "Plugins/Flow.Launcher.Plugin.WindowsSettings"] + path = Plugins/Flow.Launcher.Plugin.WindowsSettings url = git@github.com:Flow-Launcher/Flow.Plugin.WindowsSettings.git From 19f63bdc1251bd98ed18af5452b16b871ed1c4c4 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 23:44:04 -0500 Subject: [PATCH 4/6] Change link to http to avoid ssh key requirement --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 39ad4b93b25..442c94d51c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Plugins/Flow.Launcher.Plugin.WindowsSettings"] path = Plugins/Flow.Launcher.Plugin.WindowsSettings - url = git@github.com:Flow-Launcher/Flow.Plugin.WindowsSettings.git + url = https://github.com/Flow-Launcher/Flow.Plugin.WindowsSettings.git From 4f137b708195461756ce35f4423a25f89e25e202 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 23:47:44 -0500 Subject: [PATCH 5/6] Update WindowsSettings Plugin --- Plugins/Flow.Launcher.Plugin.WindowsSettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings b/Plugins/Flow.Launcher.Plugin.WindowsSettings index 0a7ca4f5fef..50638832ec7 160000 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings @@ -1 +1 @@ -Subproject commit 0a7ca4f5fef89af958f1d28408b273837b424c31 +Subproject commit 50638832ec769d6d3968a4a6a1019f5f95a5780a From b9337a7039a05c8e30e0bfd337ae1893cb916a63 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Mon, 4 Oct 2021 23:52:16 -0500 Subject: [PATCH 6/6] Update WindowsSettings submodule --- Plugins/Flow.Launcher.Plugin.WindowsSettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings b/Plugins/Flow.Launcher.Plugin.WindowsSettings index 50638832ec7..b0cf10012ca 160000 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings @@ -1 +1 @@ -Subproject commit 50638832ec769d6d3968a4a6a1019f5f95a5780a +Subproject commit b0cf10012caa4e5c9e4bace103268ab5edff8aef