From a1481f37233b1bf45a177cc3a432fa2fe88c6e66 Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Sun, 22 Sep 2024 06:57:25 -0400 Subject: [PATCH] Move InteropTests under Generator (#315) --- .github/workflows/build-and-test.yml | 6 +-- CMakeLists.txt | 22 +---------- Generator/CMakeLists.txt | 37 +++++++++++++++++-- .../InteropTests}/.gitignore | 0 .../InteropTests}/.vscode/tasks.json | 1 - .../Build-WinRTComponentProjection.ps1 | 4 +- .../InteropTests}/CMakeLists.txt | 11 ++++-- .../InteropTests}/CMakePresets.json | 0 .../InteropTests}/GenerateProjection.cmake | 0 .../InteropTests}/Package.swift | 4 +- .../ActivationFactoryResolutionTests.swift | 0 .../Tests/ActivationFactoryTests.swift | 0 .../InteropTests}/Tests/ArrayTests.swift | 0 .../InteropTests}/Tests/Asserts.swift | 0 .../InteropTests}/Tests/AsyncTests.swift | 0 .../Tests/BuiltInConformancesTests.swift | 0 .../InteropTests}/Tests/ByteBufferTests.swift | 0 .../Tests/ClassInheritanceTests.swift | 0 .../InteropTests}/Tests/CollectionTests.swift | 0 .../InteropTests}/Tests/DateTimeTests.swift | 0 .../InteropTests}/Tests/EnumTests.swift | 0 .../InteropTests}/Tests/ErrorTests.swift | 0 .../InteropTests}/Tests/EventTests.swift | 0 .../Tests/InspectableBoxingTests.swift | 0 .../Tests/InterfaceImplementationTests.swift | 0 .../InteropTests}/Tests/NullValueTests.swift | 0 .../InteropTests}/Tests/NumbersTests.swift | 0 .../Tests/ObjectExportingTests.swift | 0 .../Tests/OverloadingTests.swift | 0 .../InteropTests}/Tests/PropertyTests.swift | 0 .../Tests/ReferenceBoxingTests.swift | 0 .../InteropTests}/Tests/StringTests.swift | 0 .../InteropTests}/Tests/StructTests.swift | 0 .../InteropTests}/Tests/SwiftEnumTests.swift | 0 .../Tests/ValueOutParamRoundtripTests.swift | 0 .../Tests/ValueReturnRoundtripTests.swift | 0 .../Tests/WeakReferenceTests.swift | 0 .../InteropTests}/Tests/WinRTTestCase.swift | 0 .../InteropTests}/WinRTComponent/Arrays.cpp | 0 .../InteropTests}/WinRTComponent/Arrays.h | 0 .../InteropTests}/WinRTComponent/Arrays.idl | 0 .../WinRTComponent/ByteBuffers.cpp | 0 .../WinRTComponent/ByteBuffers.h | 0 .../WinRTComponent/ByteBuffers.idl | 0 .../WinRTComponent/CMakeLists.txt | 0 .../WinRTComponent/CMakePresets.json | 0 .../WinRTComponent/Collections.cpp | 0 .../WinRTComponent/Collections.h | 0 .../WinRTComponent/Collections.idl | 0 .../WinRTComponent/DateTimes.cpp | 0 .../InteropTests}/WinRTComponent/DateTimes.h | 0 .../WinRTComponent/DateTimes.idl | 0 .../InteropTests}/WinRTComponent/Enums.idl | 0 .../InteropTests}/WinRTComponent/Errors.cpp | 0 .../InteropTests}/WinRTComponent/Errors.h | 0 .../InteropTests}/WinRTComponent/Errors.idl | 0 .../InteropTests}/WinRTComponent/Events.cpp | 0 .../InteropTests}/WinRTComponent/Events.h | 0 .../InteropTests}/WinRTComponent/Events.idl | 0 .../ForCustomActivationFactoryResolution.cpp | 0 .../ForCustomActivationFactoryResolution.h | 0 .../ForCustomActivationFactoryResolution.idl | 0 .../WinRTComponent/GenerateWinMD.cmake | 0 .../WinRTComponent/InspectableBoxing.cpp | 0 .../WinRTComponent/InspectableBoxing.h | 0 .../WinRTComponent/InspectableBoxing.idl | 0 .../WinRTComponent/Int32Wrapper.cpp | 0 .../WinRTComponent/Int32Wrapper.h | 0 .../WinRTComponent/Int32Wrapper.idl | 0 .../WinRTComponent/InterfaceCasting.cpp | 0 .../WinRTComponent/InterfaceCasting.h | 0 .../WinRTComponent/InterfaceCasting.idl | 0 .../WinRTComponent/ManualAsyncOperation.cpp | 0 .../WinRTComponent/ManualAsyncOperation.h | 0 .../WinRTComponent/ManualAsyncOperation.idl | 0 .../WinRTComponent/MinimalTypes.cpp | 0 .../WinRTComponent/MinimalTypes.h | 0 .../WinRTComponent/MinimalTypes.idl | 0 .../WinRTComponent/MinimalUnsealedClasses.cpp | 0 .../WinRTComponent/MinimalUnsealedClasses.h | 0 .../WinRTComponent/MinimalUnsealedClasses.idl | 0 .../WinRTComponent/NullValues.cpp | 0 .../InteropTests}/WinRTComponent/NullValues.h | 0 .../WinRTComponent/NullValues.idl | 0 .../InteropTests}/WinRTComponent/Numbers.cpp | 0 .../InteropTests}/WinRTComponent/Numbers.h | 0 .../InteropTests}/WinRTComponent/Numbers.idl | 0 .../WinRTComponent/ObjectReferencer.cpp | 0 .../WinRTComponent/ObjectReferencer.h | 0 .../WinRTComponent/ObjectReferencer.idl | 0 .../WinRTComponent/OutputArgument.cpp | 0 .../WinRTComponent/OutputArgument.h | 0 .../WinRTComponent/OutputArgument.idl | 0 .../WinRTComponent/OverloadedSum.cpp | 0 .../WinRTComponent/OverloadedSum.h | 0 .../WinRTComponent/OverloadedSum.idl | 0 .../WinRTComponent/ReferenceBoxing.cpp | 0 .../WinRTComponent/ReferenceBoxing.h | 0 .../WinRTComponent/ReferenceBoxing.idl | 0 .../WinRTComponent/ReturnArgument.cpp | 0 .../WinRTComponent/ReturnArgument.h | 0 .../WinRTComponent/ReturnArgument.idl | 0 .../InteropTests}/WinRTComponent/Strings.cpp | 0 .../InteropTests}/WinRTComponent/Strings.h | 0 .../InteropTests}/WinRTComponent/Strings.idl | 0 .../InteropTests}/WinRTComponent/Structs.cpp | 0 .../InteropTests}/WinRTComponent/Structs.h | 0 .../InteropTests}/WinRTComponent/Structs.idl | 0 .../WinRTComponent/SwiftAttributes.cpp | 0 .../WinRTComponent/SwiftAttributes.h | 0 .../WinRTComponent/SwiftAttributes.idl | 0 .../WinRTComponent/SwiftEnum.idl | 0 .../WinRTComponent/WeakReferencer.cpp | 0 .../WinRTComponent/WeakReferencer.h | 0 .../WinRTComponent/WeakReferencer.idl | 0 .../WinRTComponent/WinRTComponent.def | 0 .../WinRTComponent/WinRTComponent.idl | 0 .../WinRTComponent/packages.config | 0 .../InteropTests}/WinRTComponent/pch.h | 0 .../InteropTests}/projection.json | 0 InteropTests/.vscode/settings.json | 6 --- 121 files changed, 48 insertions(+), 43 deletions(-) rename {InteropTests => Generator/InteropTests}/.gitignore (100%) rename {InteropTests => Generator/InteropTests}/.vscode/tasks.json (89%) rename {InteropTests => Generator/InteropTests}/Build-WinRTComponentProjection.ps1 (94%) rename {InteropTests => Generator/InteropTests}/CMakeLists.txt (82%) rename {InteropTests => Generator/InteropTests}/CMakePresets.json (100%) rename {InteropTests => Generator/InteropTests}/GenerateProjection.cmake (100%) rename {InteropTests => Generator/InteropTests}/Package.swift (86%) rename {InteropTests => Generator/InteropTests}/Tests/ActivationFactoryResolutionTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ActivationFactoryTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ArrayTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/Asserts.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/AsyncTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/BuiltInConformancesTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ByteBufferTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ClassInheritanceTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/CollectionTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/DateTimeTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/EnumTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ErrorTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/EventTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/InspectableBoxingTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/InterfaceImplementationTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/NullValueTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/NumbersTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ObjectExportingTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/OverloadingTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/PropertyTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ReferenceBoxingTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/StringTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/StructTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/SwiftEnumTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ValueOutParamRoundtripTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/ValueReturnRoundtripTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/WeakReferenceTests.swift (100%) rename {InteropTests => Generator/InteropTests}/Tests/WinRTTestCase.swift (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Arrays.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Arrays.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Arrays.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ByteBuffers.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ByteBuffers.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ByteBuffers.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/CMakeLists.txt (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/CMakePresets.json (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Collections.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Collections.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Collections.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/DateTimes.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/DateTimes.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/DateTimes.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Enums.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Errors.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Errors.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Errors.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Events.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Events.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Events.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ForCustomActivationFactoryResolution.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ForCustomActivationFactoryResolution.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ForCustomActivationFactoryResolution.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/GenerateWinMD.cmake (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InspectableBoxing.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InspectableBoxing.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InspectableBoxing.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Int32Wrapper.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Int32Wrapper.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Int32Wrapper.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InterfaceCasting.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InterfaceCasting.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/InterfaceCasting.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ManualAsyncOperation.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ManualAsyncOperation.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ManualAsyncOperation.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalTypes.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalTypes.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalTypes.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalUnsealedClasses.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalUnsealedClasses.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/MinimalUnsealedClasses.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/NullValues.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/NullValues.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/NullValues.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Numbers.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Numbers.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Numbers.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ObjectReferencer.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ObjectReferencer.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ObjectReferencer.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OutputArgument.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OutputArgument.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OutputArgument.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OverloadedSum.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OverloadedSum.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/OverloadedSum.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReferenceBoxing.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReferenceBoxing.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReferenceBoxing.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReturnArgument.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReturnArgument.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/ReturnArgument.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Strings.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Strings.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Strings.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Structs.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Structs.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/Structs.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/SwiftAttributes.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/SwiftAttributes.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/SwiftAttributes.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/SwiftEnum.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/WeakReferencer.cpp (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/WeakReferencer.h (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/WeakReferencer.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/WinRTComponent.def (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/WinRTComponent.idl (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/packages.config (100%) rename {InteropTests => Generator/InteropTests}/WinRTComponent/pch.h (100%) rename {InteropTests => Generator/InteropTests}/projection.json (100%) delete mode 100644 InteropTests/.vscode/settings.json diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6f0a181e..80eb8403 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -47,18 +47,18 @@ jobs: run: swift test --verbose --skip-build - name: Build WinRTComponent - working-directory: InteropTests + working-directory: Generator/InteropTests shell: pwsh run: | & .\Build-WinRTComponentProjection.ps1 -SwiftWinRT "$Env:GITHUB_WORKSPACE\Generator\.build\debug\SwiftWinRT.exe" - name: Build InteropTests - working-directory: InteropTests + working-directory: Generator/InteropTests shell: pwsh run: swift build --verbose --build-tests - name: Run InteropTests - working-directory: InteropTests + working-directory: Generator/InteropTests shell: pwsh run: swift test --verbose --skip-build diff --git a/CMakeLists.txt b/CMakeLists.txt index f9705d21..6fb65428 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,24 +3,4 @@ cmake_minimum_required(VERSION 3.21.0) project(SwiftWinRT LANGUAGES C Swift) add_subdirectory(Support) - -# InteropTests depends on SwiftWinRT.exe, so build it now -message(STATUS "Configuring Generator subproject...") -execute_process( - COMMAND ${CMAKE_COMMAND} - -S "${CMAKE_CURRENT_SOURCE_DIR}/Generator" - -B "${CMAKE_CURRENT_BINARY_DIR}/Generator" - -G "${CMAKE_GENERATOR}" - -D "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" - -D "CMAKE_C_COMPILER=${CMAKE_C_COMPILER}" - -D "CMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER}" - COMMAND_ERROR_IS_FATAL ANY) - -message(STATUS "Building Generator subproject...") -execute_process( - COMMAND ${CMAKE_COMMAND} --build "${CMAKE_CURRENT_BINARY_DIR}/Generator" - COMMAND_ERROR_IS_FATAL ANY) -set(SWIFTWINRT_EXE "${CMAKE_CURRENT_BINARY_DIR}/Generator/Sources/SwiftWinRT/SwiftWinRT.exe") - -# Now build InteropTests, which depends on SWIFTWINRT_EXE -add_subdirectory(InteropTests) \ No newline at end of file +add_subdirectory(Generator) diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt index 65f9496d..c2bc7ecf 100644 --- a/Generator/CMakeLists.txt +++ b/Generator/CMakeLists.txt @@ -1,6 +1,35 @@ -cmake_minimum_required(VERSION 3.21.0) +# This directory can be built in two modes: standalone or as a subdirectory. +message(STATUS "CMAKE_PROJECT_NAME: ${CMAKE_PROJECT_NAME}") +if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") + # Standalone mode. Only build the code generator. + # We can't build InteropTests in this mode because it depends on SwiftWinRT.exe + cmake_minimum_required(VERSION 3.21.0) -project(SwiftWinRT LANGUAGES C Swift) + project(SwiftWinRT LANGUAGES C Swift) -add_subdirectory(Dependencies) -add_subdirectory(Sources) \ No newline at end of file + add_subdirectory(Dependencies) + add_subdirectory(Sources) +else() + # Subdirectory mode. Build both the code generator and InteropTests. + # Recursively invoke this build in standalone mode so that the code generator is built first, + # and can be used when building InteropTests. + message(STATUS "Configuring Generator as subproject...") + execute_process( + COMMAND ${CMAKE_COMMAND} + -S "${CMAKE_CURRENT_SOURCE_DIR}" + -B "${CMAKE_CURRENT_BINARY_DIR}" + -G "${CMAKE_GENERATOR}" + -D "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + -D "CMAKE_C_COMPILER=${CMAKE_C_COMPILER}" + -D "CMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER}" + COMMAND_ERROR_IS_FATAL ANY) + + message(STATUS "Building Generator as subproject...") + execute_process( + COMMAND ${CMAKE_COMMAND} --build "${CMAKE_CURRENT_BINARY_DIR}" + COMMAND_ERROR_IS_FATAL ANY) + + # Now build InteropTests, which depends on SWIFTWINRT_EXE + set(SWIFTWINRT_EXE "${CMAKE_CURRENT_BINARY_DIR}/Sources/SwiftWinRT/SwiftWinRT.exe") + add_subdirectory(InteropTests) +endif() diff --git a/InteropTests/.gitignore b/Generator/InteropTests/.gitignore similarity index 100% rename from InteropTests/.gitignore rename to Generator/InteropTests/.gitignore diff --git a/InteropTests/.vscode/tasks.json b/Generator/InteropTests/.vscode/tasks.json similarity index 89% rename from InteropTests/.vscode/tasks.json rename to Generator/InteropTests/.vscode/tasks.json index 9e97e8ee..95781792 100644 --- a/InteropTests/.vscode/tasks.json +++ b/Generator/InteropTests/.vscode/tasks.json @@ -9,7 +9,6 @@ "-Xlinker", "-debug:dwarf" ], - "cwd": "d:\\swift-winrt\\InteropTests", "disableTaskQueue": true, "problemMatcher": [ "$swiftc" diff --git a/InteropTests/Build-WinRTComponentProjection.ps1 b/Generator/InteropTests/Build-WinRTComponentProjection.ps1 similarity index 94% rename from InteropTests/Build-WinRTComponentProjection.ps1 rename to Generator/InteropTests/Build-WinRTComponentProjection.ps1 index 22fed06f..85d862c1 100644 --- a/InteropTests/Build-WinRTComponentProjection.ps1 +++ b/Generator/InteropTests/Build-WinRTComponentProjection.ps1 @@ -17,7 +17,7 @@ $ErrorActionPreference = "Stop" if (-not $SwiftWinRT) { Write-Host -ForegroundColor Cyan "Building SwiftWinRT.exe with SPM..." $SwiftConfiguration = "debug" - $GeneratorProjectDir = "$PSScriptRoot\..\Generator" + $GeneratorProjectDir = "$PSScriptRoot\.." & swift.exe build ` --package-path $GeneratorProjectDir ` --configuration $SwiftConfiguration ` @@ -40,7 +40,7 @@ Write-Host -ForegroundColor Cyan "Generating Swift projection for WinRT componen -D "WINRTCOMPONENT_WINMD=$WinRTComponentBinDir\WinRTComponent.winmd" ` -D "PROJECTION_JSON=$PSScriptRoot\projection.json" ` -D "PROJECTION_DIR=$PSScriptRoot\Generated" ` - -D "SPM_SUPPORT_PACKAGE_DIR=$PSScriptRoot\.." ` + -D "SPM_SUPPORT_PACKAGE_DIR=$PSScriptRoot\..\.." ` -P "$PSScriptRoot\GenerateProjection.cmake" Write-Host -ForegroundColor Cyan "Copying the WinRT component dll next to the test..." diff --git a/InteropTests/CMakeLists.txt b/Generator/InteropTests/CMakeLists.txt similarity index 82% rename from InteropTests/CMakeLists.txt rename to Generator/InteropTests/CMakeLists.txt index 06ea06d8..145e76b9 100644 --- a/InteropTests/CMakeLists.txt +++ b/Generator/InteropTests/CMakeLists.txt @@ -1,6 +1,7 @@ -cmake_minimum_required(VERSION 3.21.0) +# Support using this directory as a standalone project or as a subdirectory. +if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") + cmake_minimum_required(VERSION 3.21.0) -if(NOT DEFINED CMAKE_PROJECT_NAME) project(InteropTests LANGUAGES C Swift) endif() @@ -9,6 +10,8 @@ if (NOT DEFINED SWIFTWINRT_EXE) endif() cmake_path(ABSOLUTE_PATH SWIFTWINRT_EXE NORMALIZE OUTPUT_VARIABLE SWIFTWINRT_EXE) +set(REPO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../..") + # Generating projection sources will depend on WinRTComponent.winmd, so build it now include(WinRTComponent/GenerateWinMD.cmake) set(WINRTCOMPONENT_WINMD "${CMAKE_CURRENT_BINARY_DIR}/WinRTComponent.winmd") @@ -24,7 +27,7 @@ generate_projection( WINRTCOMPONENT_WINMD "${WINRTCOMPONENT_WINMD}" PROJECTION_JSON "${CMAKE_CURRENT_SOURCE_DIR}/projection.json" PROJECTION_DIR "${CMAKE_CURRENT_BINARY_DIR}/Projection/Sources" - SPM_SUPPORT_PACKAGE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") + SPM_SUPPORT_PACKAGE_DIR "${REPO_ROOT}") # Define WinRTComponent build (requires the cl.exe compiler) include(ExternalProject) @@ -41,7 +44,7 @@ ExternalProject_Add(WinRTComponent # Build the support module if not already the case (by root CMakeLists.txt) if(NOT TARGET WindowsRuntime) - add_subdirectory(../Support "${CMAKE_CURRENT_BINARY_DIR}/Support") + add_subdirectory("${REPO_ROOT}/Support/Sources" "${CMAKE_CURRENT_BINARY_DIR}/Support") endif() # Build the Swift projection diff --git a/InteropTests/CMakePresets.json b/Generator/InteropTests/CMakePresets.json similarity index 100% rename from InteropTests/CMakePresets.json rename to Generator/InteropTests/CMakePresets.json diff --git a/InteropTests/GenerateProjection.cmake b/Generator/InteropTests/GenerateProjection.cmake similarity index 100% rename from InteropTests/GenerateProjection.cmake rename to Generator/InteropTests/GenerateProjection.cmake diff --git a/InteropTests/Package.swift b/Generator/InteropTests/Package.swift similarity index 86% rename from InteropTests/Package.swift rename to Generator/InteropTests/Package.swift index 08782d23..bf0b06af 100644 --- a/InteropTests/Package.swift +++ b/Generator/InteropTests/Package.swift @@ -4,14 +4,14 @@ import PackageDescription let package = Package( name: "InteropTests", dependencies: [ - .package(path: ".."), // Support package + .package(name: "Support", path: "../.."), .package(path: "Generated"), ], targets: [ .testTarget( name: "Tests", dependencies: [ - .product(name: "WindowsRuntime", package: "swift-winrt"), + .product(name: "WindowsRuntime", package: "Support"), .product(name: "UWP", package: "Generated"), .product(name: "WinRTComponent", package: "Generated"), ], diff --git a/InteropTests/Tests/ActivationFactoryResolutionTests.swift b/Generator/InteropTests/Tests/ActivationFactoryResolutionTests.swift similarity index 100% rename from InteropTests/Tests/ActivationFactoryResolutionTests.swift rename to Generator/InteropTests/Tests/ActivationFactoryResolutionTests.swift diff --git a/InteropTests/Tests/ActivationFactoryTests.swift b/Generator/InteropTests/Tests/ActivationFactoryTests.swift similarity index 100% rename from InteropTests/Tests/ActivationFactoryTests.swift rename to Generator/InteropTests/Tests/ActivationFactoryTests.swift diff --git a/InteropTests/Tests/ArrayTests.swift b/Generator/InteropTests/Tests/ArrayTests.swift similarity index 100% rename from InteropTests/Tests/ArrayTests.swift rename to Generator/InteropTests/Tests/ArrayTests.swift diff --git a/InteropTests/Tests/Asserts.swift b/Generator/InteropTests/Tests/Asserts.swift similarity index 100% rename from InteropTests/Tests/Asserts.swift rename to Generator/InteropTests/Tests/Asserts.swift diff --git a/InteropTests/Tests/AsyncTests.swift b/Generator/InteropTests/Tests/AsyncTests.swift similarity index 100% rename from InteropTests/Tests/AsyncTests.swift rename to Generator/InteropTests/Tests/AsyncTests.swift diff --git a/InteropTests/Tests/BuiltInConformancesTests.swift b/Generator/InteropTests/Tests/BuiltInConformancesTests.swift similarity index 100% rename from InteropTests/Tests/BuiltInConformancesTests.swift rename to Generator/InteropTests/Tests/BuiltInConformancesTests.swift diff --git a/InteropTests/Tests/ByteBufferTests.swift b/Generator/InteropTests/Tests/ByteBufferTests.swift similarity index 100% rename from InteropTests/Tests/ByteBufferTests.swift rename to Generator/InteropTests/Tests/ByteBufferTests.swift diff --git a/InteropTests/Tests/ClassInheritanceTests.swift b/Generator/InteropTests/Tests/ClassInheritanceTests.swift similarity index 100% rename from InteropTests/Tests/ClassInheritanceTests.swift rename to Generator/InteropTests/Tests/ClassInheritanceTests.swift diff --git a/InteropTests/Tests/CollectionTests.swift b/Generator/InteropTests/Tests/CollectionTests.swift similarity index 100% rename from InteropTests/Tests/CollectionTests.swift rename to Generator/InteropTests/Tests/CollectionTests.swift diff --git a/InteropTests/Tests/DateTimeTests.swift b/Generator/InteropTests/Tests/DateTimeTests.swift similarity index 100% rename from InteropTests/Tests/DateTimeTests.swift rename to Generator/InteropTests/Tests/DateTimeTests.swift diff --git a/InteropTests/Tests/EnumTests.swift b/Generator/InteropTests/Tests/EnumTests.swift similarity index 100% rename from InteropTests/Tests/EnumTests.swift rename to Generator/InteropTests/Tests/EnumTests.swift diff --git a/InteropTests/Tests/ErrorTests.swift b/Generator/InteropTests/Tests/ErrorTests.swift similarity index 100% rename from InteropTests/Tests/ErrorTests.swift rename to Generator/InteropTests/Tests/ErrorTests.swift diff --git a/InteropTests/Tests/EventTests.swift b/Generator/InteropTests/Tests/EventTests.swift similarity index 100% rename from InteropTests/Tests/EventTests.swift rename to Generator/InteropTests/Tests/EventTests.swift diff --git a/InteropTests/Tests/InspectableBoxingTests.swift b/Generator/InteropTests/Tests/InspectableBoxingTests.swift similarity index 100% rename from InteropTests/Tests/InspectableBoxingTests.swift rename to Generator/InteropTests/Tests/InspectableBoxingTests.swift diff --git a/InteropTests/Tests/InterfaceImplementationTests.swift b/Generator/InteropTests/Tests/InterfaceImplementationTests.swift similarity index 100% rename from InteropTests/Tests/InterfaceImplementationTests.swift rename to Generator/InteropTests/Tests/InterfaceImplementationTests.swift diff --git a/InteropTests/Tests/NullValueTests.swift b/Generator/InteropTests/Tests/NullValueTests.swift similarity index 100% rename from InteropTests/Tests/NullValueTests.swift rename to Generator/InteropTests/Tests/NullValueTests.swift diff --git a/InteropTests/Tests/NumbersTests.swift b/Generator/InteropTests/Tests/NumbersTests.swift similarity index 100% rename from InteropTests/Tests/NumbersTests.swift rename to Generator/InteropTests/Tests/NumbersTests.swift diff --git a/InteropTests/Tests/ObjectExportingTests.swift b/Generator/InteropTests/Tests/ObjectExportingTests.swift similarity index 100% rename from InteropTests/Tests/ObjectExportingTests.swift rename to Generator/InteropTests/Tests/ObjectExportingTests.swift diff --git a/InteropTests/Tests/OverloadingTests.swift b/Generator/InteropTests/Tests/OverloadingTests.swift similarity index 100% rename from InteropTests/Tests/OverloadingTests.swift rename to Generator/InteropTests/Tests/OverloadingTests.swift diff --git a/InteropTests/Tests/PropertyTests.swift b/Generator/InteropTests/Tests/PropertyTests.swift similarity index 100% rename from InteropTests/Tests/PropertyTests.swift rename to Generator/InteropTests/Tests/PropertyTests.swift diff --git a/InteropTests/Tests/ReferenceBoxingTests.swift b/Generator/InteropTests/Tests/ReferenceBoxingTests.swift similarity index 100% rename from InteropTests/Tests/ReferenceBoxingTests.swift rename to Generator/InteropTests/Tests/ReferenceBoxingTests.swift diff --git a/InteropTests/Tests/StringTests.swift b/Generator/InteropTests/Tests/StringTests.swift similarity index 100% rename from InteropTests/Tests/StringTests.swift rename to Generator/InteropTests/Tests/StringTests.swift diff --git a/InteropTests/Tests/StructTests.swift b/Generator/InteropTests/Tests/StructTests.swift similarity index 100% rename from InteropTests/Tests/StructTests.swift rename to Generator/InteropTests/Tests/StructTests.swift diff --git a/InteropTests/Tests/SwiftEnumTests.swift b/Generator/InteropTests/Tests/SwiftEnumTests.swift similarity index 100% rename from InteropTests/Tests/SwiftEnumTests.swift rename to Generator/InteropTests/Tests/SwiftEnumTests.swift diff --git a/InteropTests/Tests/ValueOutParamRoundtripTests.swift b/Generator/InteropTests/Tests/ValueOutParamRoundtripTests.swift similarity index 100% rename from InteropTests/Tests/ValueOutParamRoundtripTests.swift rename to Generator/InteropTests/Tests/ValueOutParamRoundtripTests.swift diff --git a/InteropTests/Tests/ValueReturnRoundtripTests.swift b/Generator/InteropTests/Tests/ValueReturnRoundtripTests.swift similarity index 100% rename from InteropTests/Tests/ValueReturnRoundtripTests.swift rename to Generator/InteropTests/Tests/ValueReturnRoundtripTests.swift diff --git a/InteropTests/Tests/WeakReferenceTests.swift b/Generator/InteropTests/Tests/WeakReferenceTests.swift similarity index 100% rename from InteropTests/Tests/WeakReferenceTests.swift rename to Generator/InteropTests/Tests/WeakReferenceTests.swift diff --git a/InteropTests/Tests/WinRTTestCase.swift b/Generator/InteropTests/Tests/WinRTTestCase.swift similarity index 100% rename from InteropTests/Tests/WinRTTestCase.swift rename to Generator/InteropTests/Tests/WinRTTestCase.swift diff --git a/InteropTests/WinRTComponent/Arrays.cpp b/Generator/InteropTests/WinRTComponent/Arrays.cpp similarity index 100% rename from InteropTests/WinRTComponent/Arrays.cpp rename to Generator/InteropTests/WinRTComponent/Arrays.cpp diff --git a/InteropTests/WinRTComponent/Arrays.h b/Generator/InteropTests/WinRTComponent/Arrays.h similarity index 100% rename from InteropTests/WinRTComponent/Arrays.h rename to Generator/InteropTests/WinRTComponent/Arrays.h diff --git a/InteropTests/WinRTComponent/Arrays.idl b/Generator/InteropTests/WinRTComponent/Arrays.idl similarity index 100% rename from InteropTests/WinRTComponent/Arrays.idl rename to Generator/InteropTests/WinRTComponent/Arrays.idl diff --git a/InteropTests/WinRTComponent/ByteBuffers.cpp b/Generator/InteropTests/WinRTComponent/ByteBuffers.cpp similarity index 100% rename from InteropTests/WinRTComponent/ByteBuffers.cpp rename to Generator/InteropTests/WinRTComponent/ByteBuffers.cpp diff --git a/InteropTests/WinRTComponent/ByteBuffers.h b/Generator/InteropTests/WinRTComponent/ByteBuffers.h similarity index 100% rename from InteropTests/WinRTComponent/ByteBuffers.h rename to Generator/InteropTests/WinRTComponent/ByteBuffers.h diff --git a/InteropTests/WinRTComponent/ByteBuffers.idl b/Generator/InteropTests/WinRTComponent/ByteBuffers.idl similarity index 100% rename from InteropTests/WinRTComponent/ByteBuffers.idl rename to Generator/InteropTests/WinRTComponent/ByteBuffers.idl diff --git a/InteropTests/WinRTComponent/CMakeLists.txt b/Generator/InteropTests/WinRTComponent/CMakeLists.txt similarity index 100% rename from InteropTests/WinRTComponent/CMakeLists.txt rename to Generator/InteropTests/WinRTComponent/CMakeLists.txt diff --git a/InteropTests/WinRTComponent/CMakePresets.json b/Generator/InteropTests/WinRTComponent/CMakePresets.json similarity index 100% rename from InteropTests/WinRTComponent/CMakePresets.json rename to Generator/InteropTests/WinRTComponent/CMakePresets.json diff --git a/InteropTests/WinRTComponent/Collections.cpp b/Generator/InteropTests/WinRTComponent/Collections.cpp similarity index 100% rename from InteropTests/WinRTComponent/Collections.cpp rename to Generator/InteropTests/WinRTComponent/Collections.cpp diff --git a/InteropTests/WinRTComponent/Collections.h b/Generator/InteropTests/WinRTComponent/Collections.h similarity index 100% rename from InteropTests/WinRTComponent/Collections.h rename to Generator/InteropTests/WinRTComponent/Collections.h diff --git a/InteropTests/WinRTComponent/Collections.idl b/Generator/InteropTests/WinRTComponent/Collections.idl similarity index 100% rename from InteropTests/WinRTComponent/Collections.idl rename to Generator/InteropTests/WinRTComponent/Collections.idl diff --git a/InteropTests/WinRTComponent/DateTimes.cpp b/Generator/InteropTests/WinRTComponent/DateTimes.cpp similarity index 100% rename from InteropTests/WinRTComponent/DateTimes.cpp rename to Generator/InteropTests/WinRTComponent/DateTimes.cpp diff --git a/InteropTests/WinRTComponent/DateTimes.h b/Generator/InteropTests/WinRTComponent/DateTimes.h similarity index 100% rename from InteropTests/WinRTComponent/DateTimes.h rename to Generator/InteropTests/WinRTComponent/DateTimes.h diff --git a/InteropTests/WinRTComponent/DateTimes.idl b/Generator/InteropTests/WinRTComponent/DateTimes.idl similarity index 100% rename from InteropTests/WinRTComponent/DateTimes.idl rename to Generator/InteropTests/WinRTComponent/DateTimes.idl diff --git a/InteropTests/WinRTComponent/Enums.idl b/Generator/InteropTests/WinRTComponent/Enums.idl similarity index 100% rename from InteropTests/WinRTComponent/Enums.idl rename to Generator/InteropTests/WinRTComponent/Enums.idl diff --git a/InteropTests/WinRTComponent/Errors.cpp b/Generator/InteropTests/WinRTComponent/Errors.cpp similarity index 100% rename from InteropTests/WinRTComponent/Errors.cpp rename to Generator/InteropTests/WinRTComponent/Errors.cpp diff --git a/InteropTests/WinRTComponent/Errors.h b/Generator/InteropTests/WinRTComponent/Errors.h similarity index 100% rename from InteropTests/WinRTComponent/Errors.h rename to Generator/InteropTests/WinRTComponent/Errors.h diff --git a/InteropTests/WinRTComponent/Errors.idl b/Generator/InteropTests/WinRTComponent/Errors.idl similarity index 100% rename from InteropTests/WinRTComponent/Errors.idl rename to Generator/InteropTests/WinRTComponent/Errors.idl diff --git a/InteropTests/WinRTComponent/Events.cpp b/Generator/InteropTests/WinRTComponent/Events.cpp similarity index 100% rename from InteropTests/WinRTComponent/Events.cpp rename to Generator/InteropTests/WinRTComponent/Events.cpp diff --git a/InteropTests/WinRTComponent/Events.h b/Generator/InteropTests/WinRTComponent/Events.h similarity index 100% rename from InteropTests/WinRTComponent/Events.h rename to Generator/InteropTests/WinRTComponent/Events.h diff --git a/InteropTests/WinRTComponent/Events.idl b/Generator/InteropTests/WinRTComponent/Events.idl similarity index 100% rename from InteropTests/WinRTComponent/Events.idl rename to Generator/InteropTests/WinRTComponent/Events.idl diff --git a/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.cpp b/Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.cpp similarity index 100% rename from InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.cpp rename to Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.cpp diff --git a/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.h b/Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.h similarity index 100% rename from InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.h rename to Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.h diff --git a/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.idl b/Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.idl similarity index 100% rename from InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.idl rename to Generator/InteropTests/WinRTComponent/ForCustomActivationFactoryResolution.idl diff --git a/InteropTests/WinRTComponent/GenerateWinMD.cmake b/Generator/InteropTests/WinRTComponent/GenerateWinMD.cmake similarity index 100% rename from InteropTests/WinRTComponent/GenerateWinMD.cmake rename to Generator/InteropTests/WinRTComponent/GenerateWinMD.cmake diff --git a/InteropTests/WinRTComponent/InspectableBoxing.cpp b/Generator/InteropTests/WinRTComponent/InspectableBoxing.cpp similarity index 100% rename from InteropTests/WinRTComponent/InspectableBoxing.cpp rename to Generator/InteropTests/WinRTComponent/InspectableBoxing.cpp diff --git a/InteropTests/WinRTComponent/InspectableBoxing.h b/Generator/InteropTests/WinRTComponent/InspectableBoxing.h similarity index 100% rename from InteropTests/WinRTComponent/InspectableBoxing.h rename to Generator/InteropTests/WinRTComponent/InspectableBoxing.h diff --git a/InteropTests/WinRTComponent/InspectableBoxing.idl b/Generator/InteropTests/WinRTComponent/InspectableBoxing.idl similarity index 100% rename from InteropTests/WinRTComponent/InspectableBoxing.idl rename to Generator/InteropTests/WinRTComponent/InspectableBoxing.idl diff --git a/InteropTests/WinRTComponent/Int32Wrapper.cpp b/Generator/InteropTests/WinRTComponent/Int32Wrapper.cpp similarity index 100% rename from InteropTests/WinRTComponent/Int32Wrapper.cpp rename to Generator/InteropTests/WinRTComponent/Int32Wrapper.cpp diff --git a/InteropTests/WinRTComponent/Int32Wrapper.h b/Generator/InteropTests/WinRTComponent/Int32Wrapper.h similarity index 100% rename from InteropTests/WinRTComponent/Int32Wrapper.h rename to Generator/InteropTests/WinRTComponent/Int32Wrapper.h diff --git a/InteropTests/WinRTComponent/Int32Wrapper.idl b/Generator/InteropTests/WinRTComponent/Int32Wrapper.idl similarity index 100% rename from InteropTests/WinRTComponent/Int32Wrapper.idl rename to Generator/InteropTests/WinRTComponent/Int32Wrapper.idl diff --git a/InteropTests/WinRTComponent/InterfaceCasting.cpp b/Generator/InteropTests/WinRTComponent/InterfaceCasting.cpp similarity index 100% rename from InteropTests/WinRTComponent/InterfaceCasting.cpp rename to Generator/InteropTests/WinRTComponent/InterfaceCasting.cpp diff --git a/InteropTests/WinRTComponent/InterfaceCasting.h b/Generator/InteropTests/WinRTComponent/InterfaceCasting.h similarity index 100% rename from InteropTests/WinRTComponent/InterfaceCasting.h rename to Generator/InteropTests/WinRTComponent/InterfaceCasting.h diff --git a/InteropTests/WinRTComponent/InterfaceCasting.idl b/Generator/InteropTests/WinRTComponent/InterfaceCasting.idl similarity index 100% rename from InteropTests/WinRTComponent/InterfaceCasting.idl rename to Generator/InteropTests/WinRTComponent/InterfaceCasting.idl diff --git a/InteropTests/WinRTComponent/ManualAsyncOperation.cpp b/Generator/InteropTests/WinRTComponent/ManualAsyncOperation.cpp similarity index 100% rename from InteropTests/WinRTComponent/ManualAsyncOperation.cpp rename to Generator/InteropTests/WinRTComponent/ManualAsyncOperation.cpp diff --git a/InteropTests/WinRTComponent/ManualAsyncOperation.h b/Generator/InteropTests/WinRTComponent/ManualAsyncOperation.h similarity index 100% rename from InteropTests/WinRTComponent/ManualAsyncOperation.h rename to Generator/InteropTests/WinRTComponent/ManualAsyncOperation.h diff --git a/InteropTests/WinRTComponent/ManualAsyncOperation.idl b/Generator/InteropTests/WinRTComponent/ManualAsyncOperation.idl similarity index 100% rename from InteropTests/WinRTComponent/ManualAsyncOperation.idl rename to Generator/InteropTests/WinRTComponent/ManualAsyncOperation.idl diff --git a/InteropTests/WinRTComponent/MinimalTypes.cpp b/Generator/InteropTests/WinRTComponent/MinimalTypes.cpp similarity index 100% rename from InteropTests/WinRTComponent/MinimalTypes.cpp rename to Generator/InteropTests/WinRTComponent/MinimalTypes.cpp diff --git a/InteropTests/WinRTComponent/MinimalTypes.h b/Generator/InteropTests/WinRTComponent/MinimalTypes.h similarity index 100% rename from InteropTests/WinRTComponent/MinimalTypes.h rename to Generator/InteropTests/WinRTComponent/MinimalTypes.h diff --git a/InteropTests/WinRTComponent/MinimalTypes.idl b/Generator/InteropTests/WinRTComponent/MinimalTypes.idl similarity index 100% rename from InteropTests/WinRTComponent/MinimalTypes.idl rename to Generator/InteropTests/WinRTComponent/MinimalTypes.idl diff --git a/InteropTests/WinRTComponent/MinimalUnsealedClasses.cpp b/Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.cpp similarity index 100% rename from InteropTests/WinRTComponent/MinimalUnsealedClasses.cpp rename to Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.cpp diff --git a/InteropTests/WinRTComponent/MinimalUnsealedClasses.h b/Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.h similarity index 100% rename from InteropTests/WinRTComponent/MinimalUnsealedClasses.h rename to Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.h diff --git a/InteropTests/WinRTComponent/MinimalUnsealedClasses.idl b/Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.idl similarity index 100% rename from InteropTests/WinRTComponent/MinimalUnsealedClasses.idl rename to Generator/InteropTests/WinRTComponent/MinimalUnsealedClasses.idl diff --git a/InteropTests/WinRTComponent/NullValues.cpp b/Generator/InteropTests/WinRTComponent/NullValues.cpp similarity index 100% rename from InteropTests/WinRTComponent/NullValues.cpp rename to Generator/InteropTests/WinRTComponent/NullValues.cpp diff --git a/InteropTests/WinRTComponent/NullValues.h b/Generator/InteropTests/WinRTComponent/NullValues.h similarity index 100% rename from InteropTests/WinRTComponent/NullValues.h rename to Generator/InteropTests/WinRTComponent/NullValues.h diff --git a/InteropTests/WinRTComponent/NullValues.idl b/Generator/InteropTests/WinRTComponent/NullValues.idl similarity index 100% rename from InteropTests/WinRTComponent/NullValues.idl rename to Generator/InteropTests/WinRTComponent/NullValues.idl diff --git a/InteropTests/WinRTComponent/Numbers.cpp b/Generator/InteropTests/WinRTComponent/Numbers.cpp similarity index 100% rename from InteropTests/WinRTComponent/Numbers.cpp rename to Generator/InteropTests/WinRTComponent/Numbers.cpp diff --git a/InteropTests/WinRTComponent/Numbers.h b/Generator/InteropTests/WinRTComponent/Numbers.h similarity index 100% rename from InteropTests/WinRTComponent/Numbers.h rename to Generator/InteropTests/WinRTComponent/Numbers.h diff --git a/InteropTests/WinRTComponent/Numbers.idl b/Generator/InteropTests/WinRTComponent/Numbers.idl similarity index 100% rename from InteropTests/WinRTComponent/Numbers.idl rename to Generator/InteropTests/WinRTComponent/Numbers.idl diff --git a/InteropTests/WinRTComponent/ObjectReferencer.cpp b/Generator/InteropTests/WinRTComponent/ObjectReferencer.cpp similarity index 100% rename from InteropTests/WinRTComponent/ObjectReferencer.cpp rename to Generator/InteropTests/WinRTComponent/ObjectReferencer.cpp diff --git a/InteropTests/WinRTComponent/ObjectReferencer.h b/Generator/InteropTests/WinRTComponent/ObjectReferencer.h similarity index 100% rename from InteropTests/WinRTComponent/ObjectReferencer.h rename to Generator/InteropTests/WinRTComponent/ObjectReferencer.h diff --git a/InteropTests/WinRTComponent/ObjectReferencer.idl b/Generator/InteropTests/WinRTComponent/ObjectReferencer.idl similarity index 100% rename from InteropTests/WinRTComponent/ObjectReferencer.idl rename to Generator/InteropTests/WinRTComponent/ObjectReferencer.idl diff --git a/InteropTests/WinRTComponent/OutputArgument.cpp b/Generator/InteropTests/WinRTComponent/OutputArgument.cpp similarity index 100% rename from InteropTests/WinRTComponent/OutputArgument.cpp rename to Generator/InteropTests/WinRTComponent/OutputArgument.cpp diff --git a/InteropTests/WinRTComponent/OutputArgument.h b/Generator/InteropTests/WinRTComponent/OutputArgument.h similarity index 100% rename from InteropTests/WinRTComponent/OutputArgument.h rename to Generator/InteropTests/WinRTComponent/OutputArgument.h diff --git a/InteropTests/WinRTComponent/OutputArgument.idl b/Generator/InteropTests/WinRTComponent/OutputArgument.idl similarity index 100% rename from InteropTests/WinRTComponent/OutputArgument.idl rename to Generator/InteropTests/WinRTComponent/OutputArgument.idl diff --git a/InteropTests/WinRTComponent/OverloadedSum.cpp b/Generator/InteropTests/WinRTComponent/OverloadedSum.cpp similarity index 100% rename from InteropTests/WinRTComponent/OverloadedSum.cpp rename to Generator/InteropTests/WinRTComponent/OverloadedSum.cpp diff --git a/InteropTests/WinRTComponent/OverloadedSum.h b/Generator/InteropTests/WinRTComponent/OverloadedSum.h similarity index 100% rename from InteropTests/WinRTComponent/OverloadedSum.h rename to Generator/InteropTests/WinRTComponent/OverloadedSum.h diff --git a/InteropTests/WinRTComponent/OverloadedSum.idl b/Generator/InteropTests/WinRTComponent/OverloadedSum.idl similarity index 100% rename from InteropTests/WinRTComponent/OverloadedSum.idl rename to Generator/InteropTests/WinRTComponent/OverloadedSum.idl diff --git a/InteropTests/WinRTComponent/ReferenceBoxing.cpp b/Generator/InteropTests/WinRTComponent/ReferenceBoxing.cpp similarity index 100% rename from InteropTests/WinRTComponent/ReferenceBoxing.cpp rename to Generator/InteropTests/WinRTComponent/ReferenceBoxing.cpp diff --git a/InteropTests/WinRTComponent/ReferenceBoxing.h b/Generator/InteropTests/WinRTComponent/ReferenceBoxing.h similarity index 100% rename from InteropTests/WinRTComponent/ReferenceBoxing.h rename to Generator/InteropTests/WinRTComponent/ReferenceBoxing.h diff --git a/InteropTests/WinRTComponent/ReferenceBoxing.idl b/Generator/InteropTests/WinRTComponent/ReferenceBoxing.idl similarity index 100% rename from InteropTests/WinRTComponent/ReferenceBoxing.idl rename to Generator/InteropTests/WinRTComponent/ReferenceBoxing.idl diff --git a/InteropTests/WinRTComponent/ReturnArgument.cpp b/Generator/InteropTests/WinRTComponent/ReturnArgument.cpp similarity index 100% rename from InteropTests/WinRTComponent/ReturnArgument.cpp rename to Generator/InteropTests/WinRTComponent/ReturnArgument.cpp diff --git a/InteropTests/WinRTComponent/ReturnArgument.h b/Generator/InteropTests/WinRTComponent/ReturnArgument.h similarity index 100% rename from InteropTests/WinRTComponent/ReturnArgument.h rename to Generator/InteropTests/WinRTComponent/ReturnArgument.h diff --git a/InteropTests/WinRTComponent/ReturnArgument.idl b/Generator/InteropTests/WinRTComponent/ReturnArgument.idl similarity index 100% rename from InteropTests/WinRTComponent/ReturnArgument.idl rename to Generator/InteropTests/WinRTComponent/ReturnArgument.idl diff --git a/InteropTests/WinRTComponent/Strings.cpp b/Generator/InteropTests/WinRTComponent/Strings.cpp similarity index 100% rename from InteropTests/WinRTComponent/Strings.cpp rename to Generator/InteropTests/WinRTComponent/Strings.cpp diff --git a/InteropTests/WinRTComponent/Strings.h b/Generator/InteropTests/WinRTComponent/Strings.h similarity index 100% rename from InteropTests/WinRTComponent/Strings.h rename to Generator/InteropTests/WinRTComponent/Strings.h diff --git a/InteropTests/WinRTComponent/Strings.idl b/Generator/InteropTests/WinRTComponent/Strings.idl similarity index 100% rename from InteropTests/WinRTComponent/Strings.idl rename to Generator/InteropTests/WinRTComponent/Strings.idl diff --git a/InteropTests/WinRTComponent/Structs.cpp b/Generator/InteropTests/WinRTComponent/Structs.cpp similarity index 100% rename from InteropTests/WinRTComponent/Structs.cpp rename to Generator/InteropTests/WinRTComponent/Structs.cpp diff --git a/InteropTests/WinRTComponent/Structs.h b/Generator/InteropTests/WinRTComponent/Structs.h similarity index 100% rename from InteropTests/WinRTComponent/Structs.h rename to Generator/InteropTests/WinRTComponent/Structs.h diff --git a/InteropTests/WinRTComponent/Structs.idl b/Generator/InteropTests/WinRTComponent/Structs.idl similarity index 100% rename from InteropTests/WinRTComponent/Structs.idl rename to Generator/InteropTests/WinRTComponent/Structs.idl diff --git a/InteropTests/WinRTComponent/SwiftAttributes.cpp b/Generator/InteropTests/WinRTComponent/SwiftAttributes.cpp similarity index 100% rename from InteropTests/WinRTComponent/SwiftAttributes.cpp rename to Generator/InteropTests/WinRTComponent/SwiftAttributes.cpp diff --git a/InteropTests/WinRTComponent/SwiftAttributes.h b/Generator/InteropTests/WinRTComponent/SwiftAttributes.h similarity index 100% rename from InteropTests/WinRTComponent/SwiftAttributes.h rename to Generator/InteropTests/WinRTComponent/SwiftAttributes.h diff --git a/InteropTests/WinRTComponent/SwiftAttributes.idl b/Generator/InteropTests/WinRTComponent/SwiftAttributes.idl similarity index 100% rename from InteropTests/WinRTComponent/SwiftAttributes.idl rename to Generator/InteropTests/WinRTComponent/SwiftAttributes.idl diff --git a/InteropTests/WinRTComponent/SwiftEnum.idl b/Generator/InteropTests/WinRTComponent/SwiftEnum.idl similarity index 100% rename from InteropTests/WinRTComponent/SwiftEnum.idl rename to Generator/InteropTests/WinRTComponent/SwiftEnum.idl diff --git a/InteropTests/WinRTComponent/WeakReferencer.cpp b/Generator/InteropTests/WinRTComponent/WeakReferencer.cpp similarity index 100% rename from InteropTests/WinRTComponent/WeakReferencer.cpp rename to Generator/InteropTests/WinRTComponent/WeakReferencer.cpp diff --git a/InteropTests/WinRTComponent/WeakReferencer.h b/Generator/InteropTests/WinRTComponent/WeakReferencer.h similarity index 100% rename from InteropTests/WinRTComponent/WeakReferencer.h rename to Generator/InteropTests/WinRTComponent/WeakReferencer.h diff --git a/InteropTests/WinRTComponent/WeakReferencer.idl b/Generator/InteropTests/WinRTComponent/WeakReferencer.idl similarity index 100% rename from InteropTests/WinRTComponent/WeakReferencer.idl rename to Generator/InteropTests/WinRTComponent/WeakReferencer.idl diff --git a/InteropTests/WinRTComponent/WinRTComponent.def b/Generator/InteropTests/WinRTComponent/WinRTComponent.def similarity index 100% rename from InteropTests/WinRTComponent/WinRTComponent.def rename to Generator/InteropTests/WinRTComponent/WinRTComponent.def diff --git a/InteropTests/WinRTComponent/WinRTComponent.idl b/Generator/InteropTests/WinRTComponent/WinRTComponent.idl similarity index 100% rename from InteropTests/WinRTComponent/WinRTComponent.idl rename to Generator/InteropTests/WinRTComponent/WinRTComponent.idl diff --git a/InteropTests/WinRTComponent/packages.config b/Generator/InteropTests/WinRTComponent/packages.config similarity index 100% rename from InteropTests/WinRTComponent/packages.config rename to Generator/InteropTests/WinRTComponent/packages.config diff --git a/InteropTests/WinRTComponent/pch.h b/Generator/InteropTests/WinRTComponent/pch.h similarity index 100% rename from InteropTests/WinRTComponent/pch.h rename to Generator/InteropTests/WinRTComponent/pch.h diff --git a/InteropTests/projection.json b/Generator/InteropTests/projection.json similarity index 100% rename from InteropTests/projection.json rename to Generator/InteropTests/projection.json diff --git a/InteropTests/.vscode/settings.json b/InteropTests/.vscode/settings.json deleted file mode 100644 index a1e72023..00000000 --- a/InteropTests/.vscode/settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "files.associations": { - "xhash": "cpp", - "thread": "cpp" - } -} \ No newline at end of file