From fd3c55866eb5f587d42211d902bc2a4993e05fff Mon Sep 17 00:00:00 2001 From: Den Delimarsky <1389609+dend@users.noreply.github.com> Date: Sun, 9 May 2021 17:14:48 -0700 Subject: [PATCH] Fix naming --- PowerToys.sln | 18 +++++++++--------- .../{Espresso.Shell.csproj => Espresso.csproj} | 0 .../EspressoConstants.h | 0 .../EspressoModuleInterface.rc} | 0 .../EspressoModuleInterface.vcxproj} | 4 ++-- .../EspressoModuleInterface.vcxproj.filters} | 2 +- .../dllmain.cpp | 0 .../packages.config | 0 .../pch.cpp | 0 .../pch.h | 0 .../resource.h | 0 .../trace.cpp | 0 .../trace.h | 0 src/runner/main.cpp | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename src/modules/espresso/Espresso.Shell/{Espresso.Shell.csproj => Espresso.csproj} (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/EspressoConstants.h (100%) rename src/modules/espresso/{Espresso/Espresso.rc => EspressoModuleInterface/EspressoModuleInterface.rc} (100%) rename src/modules/espresso/{Espresso/Espresso.vcxproj => EspressoModuleInterface/EspressoModuleInterface.vcxproj} (97%) rename src/modules/espresso/{Espresso/Espresso.vcxproj.filters => EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters} (96%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/dllmain.cpp (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/packages.config (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/pch.cpp (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/pch.h (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/resource.h (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/trace.cpp (100%) rename src/modules/espresso/{Espresso => EspressoModuleInterface}/trace.h (100%) diff --git a/PowerToys.sln b/PowerToys.sln index c379a605d4..76271df75d 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -326,9 +326,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorTest", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "espresso", "espresso", "{127F38E0-40AA-4594-B955-5616BF206882}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Espresso", "src\modules\espresso\Espresso\Espresso.vcxproj", "{5E7360A8-D048-4ED3-8F09-0BFD64C5529A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Espresso", "src\modules\espresso\Espresso.Shell\Espresso.csproj", "{3B77A64A-8005-4D43-B31A-F692E213BAE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Espresso.Shell", "src\modules\espresso\Espresso.Shell\Espresso.Shell.csproj", "{3B77A64A-8005-4D43-B31A-F692E213BAE4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EspressoModuleInterface", "src\modules\espresso\EspressoModuleInterface\EspressoModuleInterface.vcxproj", "{5E7360A8-D048-4ED3-8F09-0BFD64C5529A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -836,12 +836,6 @@ Global {62173D9A-6724-4C00-A1C8-FB646480A9EC}.Release|Any CPU.ActiveCfg = Release|x64 {62173D9A-6724-4C00-A1C8-FB646480A9EC}.Release|x64.ActiveCfg = Release|x64 {62173D9A-6724-4C00-A1C8-FB646480A9EC}.Release|x64.Build.0 = Release|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|Any CPU.ActiveCfg = Debug|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|x64.ActiveCfg = Debug|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|x64.Build.0 = Debug|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|Any CPU.ActiveCfg = Release|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|x64.ActiveCfg = Release|x64 - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|x64.Build.0 = Release|x64 {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Debug|x64.ActiveCfg = Debug|x64 @@ -850,6 +844,12 @@ Global {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Release|Any CPU.Build.0 = Release|Any CPU {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Release|x64.ActiveCfg = Release|Any CPU {3B77A64A-8005-4D43-B31A-F692E213BAE4}.Release|x64.Build.0 = Release|Any CPU + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|Any CPU.ActiveCfg = Debug|x64 + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|x64.ActiveCfg = Debug|x64 + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Debug|x64.Build.0 = Debug|x64 + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|Any CPU.ActiveCfg = Release|x64 + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|x64.ActiveCfg = Release|x64 + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -950,8 +950,8 @@ Global {23D2070D-E4AD-4ADD-85A7-083D9C76AD49} = {38BDB927-829B-4C65-9CD9-93FB05D66D65} {62173D9A-6724-4C00-A1C8-FB646480A9EC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65} {127F38E0-40AA-4594-B955-5616BF206882} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} - {5E7360A8-D048-4ED3-8F09-0BFD64C5529A} = {127F38E0-40AA-4594-B955-5616BF206882} {3B77A64A-8005-4D43-B31A-F692E213BAE4} = {127F38E0-40AA-4594-B955-5616BF206882} + {5E7360A8-D048-4ED3-8F09-0BFD64C5529A} = {127F38E0-40AA-4594-B955-5616BF206882} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/src/modules/espresso/Espresso.Shell/Espresso.Shell.csproj b/src/modules/espresso/Espresso.Shell/Espresso.csproj similarity index 100% rename from src/modules/espresso/Espresso.Shell/Espresso.Shell.csproj rename to src/modules/espresso/Espresso.Shell/Espresso.csproj diff --git a/src/modules/espresso/Espresso/EspressoConstants.h b/src/modules/espresso/EspressoModuleInterface/EspressoConstants.h similarity index 100% rename from src/modules/espresso/Espresso/EspressoConstants.h rename to src/modules/espresso/EspressoModuleInterface/EspressoConstants.h diff --git a/src/modules/espresso/Espresso/Espresso.rc b/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.rc similarity index 100% rename from src/modules/espresso/Espresso/Espresso.rc rename to src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.rc diff --git a/src/modules/espresso/Espresso/Espresso.vcxproj b/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj similarity index 97% rename from src/modules/espresso/Espresso/Espresso.vcxproj rename to src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj index 52c37c5126..33ee183a86 100644 --- a/src/modules/espresso/Espresso/Espresso.vcxproj +++ b/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj @@ -16,7 +16,7 @@ {5e7360a8-d048-4ed3-8f09-0bfd64c5529a} Win32Proj Espresso - Espresso + EspressoModuleInterface @@ -71,7 +71,7 @@ - + diff --git a/src/modules/espresso/Espresso/Espresso.vcxproj.filters b/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters similarity index 96% rename from src/modules/espresso/Espresso/Espresso.vcxproj.filters rename to src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters index d890c2b1e6..2dd5624a53 100644 --- a/src/modules/espresso/Espresso/Espresso.vcxproj.filters +++ b/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters @@ -43,7 +43,7 @@ - + Resource Files diff --git a/src/modules/espresso/Espresso/dllmain.cpp b/src/modules/espresso/EspressoModuleInterface/dllmain.cpp similarity index 100% rename from src/modules/espresso/Espresso/dllmain.cpp rename to src/modules/espresso/EspressoModuleInterface/dllmain.cpp diff --git a/src/modules/espresso/Espresso/packages.config b/src/modules/espresso/EspressoModuleInterface/packages.config similarity index 100% rename from src/modules/espresso/Espresso/packages.config rename to src/modules/espresso/EspressoModuleInterface/packages.config diff --git a/src/modules/espresso/Espresso/pch.cpp b/src/modules/espresso/EspressoModuleInterface/pch.cpp similarity index 100% rename from src/modules/espresso/Espresso/pch.cpp rename to src/modules/espresso/EspressoModuleInterface/pch.cpp diff --git a/src/modules/espresso/Espresso/pch.h b/src/modules/espresso/EspressoModuleInterface/pch.h similarity index 100% rename from src/modules/espresso/Espresso/pch.h rename to src/modules/espresso/EspressoModuleInterface/pch.h diff --git a/src/modules/espresso/Espresso/resource.h b/src/modules/espresso/EspressoModuleInterface/resource.h similarity index 100% rename from src/modules/espresso/Espresso/resource.h rename to src/modules/espresso/EspressoModuleInterface/resource.h diff --git a/src/modules/espresso/Espresso/trace.cpp b/src/modules/espresso/EspressoModuleInterface/trace.cpp similarity index 100% rename from src/modules/espresso/Espresso/trace.cpp rename to src/modules/espresso/EspressoModuleInterface/trace.cpp diff --git a/src/modules/espresso/Espresso/trace.h b/src/modules/espresso/EspressoModuleInterface/trace.h similarity index 100% rename from src/modules/espresso/Espresso/trace.h rename to src/modules/espresso/EspressoModuleInterface/trace.h diff --git a/src/runner/main.cpp b/src/runner/main.cpp index cf9245c239..e070073600 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -157,7 +157,7 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe) L"modules/PowerRename/PowerRenameExt.dll", L"modules/ShortcutGuide/ShortcutGuide.dll", L"modules/ColorPicker/ColorPicker.dll", - L"modules/Espresso/Espresso.dll", + L"modules/EspressoModuleInterface/EspressoModuleInterface.dll", }; for (const auto& moduleSubdir : knownModules)