From eb8b1c36cbd592ce0f36b80ec4ffb599bd98864d Mon Sep 17 00:00:00 2001 From: Mark Schofield Date: Mon, 9 Mar 2026 16:55:53 -0700 Subject: [PATCH] Partition the 'overlay' folders better to avoid collisions (#27) --- CMakeLists.txt | 2 +- .../microsoft.windows.cppwinrt-config.cmake | 0 .../microsoft.windows.implementationlibrary-config.cmake | 0 .../microsoft.windowsappsdk.foundation-config.cmake | 0 .../microsoft.windowsappsdk.foundation.manifest | 0 .../microsoft.windowsappsdk.interactiveexperiences-config.cmake | 0 .../microsoft.windowsappsdk.interactiveexperiences.manifest | 0 .../microsoft.windowsappsdk.ml}/Stub/winml/Runtime.cpp | 0 .../microsoft.windowsappsdk.ml}/Stub/winml/Runtime.h | 0 .../microsoft.windowsappsdk.ml-config.cmake | 0 .../microsoft.windowsappsdk.ml.manifest | 0 .../microsoft.windowsappsdk.runtime-config.cmake | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename {build/cmake => overlay/microsoft.windows.cppwinrt}/microsoft.windows.cppwinrt-config.cmake (100%) rename {build/cmake => overlay/microsoft.windows.implementationlibrary}/microsoft.windows.implementationlibrary-config.cmake (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.foundation}/microsoft.windowsappsdk.foundation-config.cmake (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.foundation}/microsoft.windowsappsdk.foundation.manifest (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.interactiveexperiences}/microsoft.windowsappsdk.interactiveexperiences-config.cmake (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.interactiveexperiences}/microsoft.windowsappsdk.interactiveexperiences.manifest (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.ml}/Stub/winml/Runtime.cpp (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.ml}/Stub/winml/Runtime.h (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.ml}/microsoft.windowsappsdk.ml-config.cmake (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.ml}/microsoft.windowsappsdk.ml.manifest (100%) rename {build/cmake => overlay/microsoft.windowsappsdk.runtime}/microsoft.windowsappsdk.runtime-config.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1883a16..e9bef74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,7 +292,7 @@ function(add_nuget_packages) "${NUGET_LOCATION}/build/cmake/${PACKAGE_NAME_LOWER}-config.cmake" "${NUGET_LOCATION}/build/native/${PACKAGE_NAME_LOWER}.cmake" "${NUGET_LOCATION}/build/${PACKAGE_NAME_LOWER}.cmake" - "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/build/cmake/${PACKAGE_NAME_LOWER}-config.cmake" + "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/overlay/${PACKAGE_NAME_LOWER}/${PACKAGE_NAME_LOWER}-config.cmake" ) foreach(PROBE_PATH ${PROBE_PATHS}) diff --git a/build/cmake/microsoft.windows.cppwinrt-config.cmake b/overlay/microsoft.windows.cppwinrt/microsoft.windows.cppwinrt-config.cmake similarity index 100% rename from build/cmake/microsoft.windows.cppwinrt-config.cmake rename to overlay/microsoft.windows.cppwinrt/microsoft.windows.cppwinrt-config.cmake diff --git a/build/cmake/microsoft.windows.implementationlibrary-config.cmake b/overlay/microsoft.windows.implementationlibrary/microsoft.windows.implementationlibrary-config.cmake similarity index 100% rename from build/cmake/microsoft.windows.implementationlibrary-config.cmake rename to overlay/microsoft.windows.implementationlibrary/microsoft.windows.implementationlibrary-config.cmake diff --git a/build/cmake/microsoft.windowsappsdk.foundation-config.cmake b/overlay/microsoft.windowsappsdk.foundation/microsoft.windowsappsdk.foundation-config.cmake similarity index 100% rename from build/cmake/microsoft.windowsappsdk.foundation-config.cmake rename to overlay/microsoft.windowsappsdk.foundation/microsoft.windowsappsdk.foundation-config.cmake diff --git a/build/cmake/microsoft.windowsappsdk.foundation.manifest b/overlay/microsoft.windowsappsdk.foundation/microsoft.windowsappsdk.foundation.manifest similarity index 100% rename from build/cmake/microsoft.windowsappsdk.foundation.manifest rename to overlay/microsoft.windowsappsdk.foundation/microsoft.windowsappsdk.foundation.manifest diff --git a/build/cmake/microsoft.windowsappsdk.interactiveexperiences-config.cmake b/overlay/microsoft.windowsappsdk.interactiveexperiences/microsoft.windowsappsdk.interactiveexperiences-config.cmake similarity index 100% rename from build/cmake/microsoft.windowsappsdk.interactiveexperiences-config.cmake rename to overlay/microsoft.windowsappsdk.interactiveexperiences/microsoft.windowsappsdk.interactiveexperiences-config.cmake diff --git a/build/cmake/microsoft.windowsappsdk.interactiveexperiences.manifest b/overlay/microsoft.windowsappsdk.interactiveexperiences/microsoft.windowsappsdk.interactiveexperiences.manifest similarity index 100% rename from build/cmake/microsoft.windowsappsdk.interactiveexperiences.manifest rename to overlay/microsoft.windowsappsdk.interactiveexperiences/microsoft.windowsappsdk.interactiveexperiences.manifest diff --git a/build/cmake/Stub/winml/Runtime.cpp b/overlay/microsoft.windowsappsdk.ml/Stub/winml/Runtime.cpp similarity index 100% rename from build/cmake/Stub/winml/Runtime.cpp rename to overlay/microsoft.windowsappsdk.ml/Stub/winml/Runtime.cpp diff --git a/build/cmake/Stub/winml/Runtime.h b/overlay/microsoft.windowsappsdk.ml/Stub/winml/Runtime.h similarity index 100% rename from build/cmake/Stub/winml/Runtime.h rename to overlay/microsoft.windowsappsdk.ml/Stub/winml/Runtime.h diff --git a/build/cmake/microsoft.windowsappsdk.ml-config.cmake b/overlay/microsoft.windowsappsdk.ml/microsoft.windowsappsdk.ml-config.cmake similarity index 100% rename from build/cmake/microsoft.windowsappsdk.ml-config.cmake rename to overlay/microsoft.windowsappsdk.ml/microsoft.windowsappsdk.ml-config.cmake diff --git a/build/cmake/microsoft.windowsappsdk.ml.manifest b/overlay/microsoft.windowsappsdk.ml/microsoft.windowsappsdk.ml.manifest similarity index 100% rename from build/cmake/microsoft.windowsappsdk.ml.manifest rename to overlay/microsoft.windowsappsdk.ml/microsoft.windowsappsdk.ml.manifest diff --git a/build/cmake/microsoft.windowsappsdk.runtime-config.cmake b/overlay/microsoft.windowsappsdk.runtime/microsoft.windowsappsdk.runtime-config.cmake similarity index 100% rename from build/cmake/microsoft.windowsappsdk.runtime-config.cmake rename to overlay/microsoft.windowsappsdk.runtime/microsoft.windowsappsdk.runtime-config.cmake