From edef61b72cd6747203d555a01bcafe6d956139ca Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Wed, 4 Sep 2024 12:21:35 -0500 Subject: [PATCH] Use workspace dependencies where practical (#3248) --- Cargo.toml | 13 +++++++++++++ .../components/json_validator/Cargo.toml | 2 +- .../json_validator_client/Cargo.toml | 2 +- .../components/json_validator_winrt/Cargo.toml | 6 +++--- .../json_validator_winrt_client/Cargo.toml | 6 +++--- .../json_validator_winrt_client_cpp/Cargo.toml | 4 ++-- crates/samples/windows-sys/counter/Cargo.toml | 2 +- .../windows-sys/create_window/Cargo.toml | 2 +- .../samples/windows-sys/delay_load/Cargo.toml | 2 +- .../windows-sys/enum_windows/Cargo.toml | 2 +- .../samples/windows-sys/message_box/Cargo.toml | 2 +- .../samples/windows-sys/privileges/Cargo.toml | 2 +- .../samples/windows-sys/task_dialog/Cargo.toml | 2 +- .../windows-sys/thread_pool_work/Cargo.toml | 2 +- crates/samples/windows/bits/Cargo.toml | 4 ++-- crates/samples/windows/com_uri/Cargo.toml | 2 +- crates/samples/windows/consent/Cargo.toml | 2 +- crates/samples/windows/core_app/Cargo.toml | 4 ++-- crates/samples/windows/counter/Cargo.toml | 2 +- .../samples/windows/create_window/Cargo.toml | 2 +- crates/samples/windows/credentials/Cargo.toml | 2 +- .../samples/windows/data_protection/Cargo.toml | 2 +- crates/samples/windows/dcomp/Cargo.toml | 2 +- crates/samples/windows/delay_load/Cargo.toml | 2 +- .../samples/windows/device_watcher/Cargo.toml | 2 +- crates/samples/windows/direct2d/Cargo.toml | 2 +- crates/samples/windows/direct3d12/Cargo.toml | 2 +- crates/samples/windows/enum_windows/Cargo.toml | 2 +- crates/samples/windows/file_dialogs/Cargo.toml | 2 +- crates/samples/windows/kernel_event/Cargo.toml | 2 +- .../samples/windows/memory_buffer/Cargo.toml | 2 +- crates/samples/windows/message_box/Cargo.toml | 2 +- crates/samples/windows/ocr/Cargo.toml | 2 +- crates/samples/windows/overlapped/Cargo.toml | 2 +- crates/samples/windows/privileges/Cargo.toml | 2 +- crates/samples/windows/rss/Cargo.toml | 2 +- crates/samples/windows/shell/Cargo.toml | 2 +- crates/samples/windows/simple/Cargo.toml | 2 +- crates/samples/windows/spellchecker/Cargo.toml | 2 +- crates/samples/windows/task_dialog/Cargo.toml | 2 +- .../windows/thread_pool_work/Cargo.toml | 2 +- crates/samples/windows/uiautomation/Cargo.toml | 2 +- crates/samples/windows/wmi/Cargo.toml | 2 +- crates/samples/windows/xml/Cargo.toml | 2 +- crates/tests/agile/Cargo.toml | 2 +- crates/tests/agile_reference/Cargo.toml | 2 +- crates/tests/alternate_success_code/Cargo.toml | 2 +- crates/tests/arch/Cargo.toml | 4 ++-- crates/tests/arch_feature/Cargo.toml | 4 ++-- crates/tests/array/Cargo.toml | 2 +- crates/tests/async/Cargo.toml | 2 +- crates/tests/bcrypt/Cargo.toml | 4 ++-- crates/tests/calling_convention/Cargo.toml | 4 ++-- crates/tests/cfg_generic/Cargo.toml | 2 +- crates/tests/class_hierarchy/Cargo.toml | 2 +- crates/tests/collections/Cargo.toml | 4 ++-- crates/tests/component/Cargo.toml | 6 +++--- crates/tests/component_client/Cargo.toml | 6 +++--- crates/tests/const_fields/Cargo.toml | 4 ++-- crates/tests/const_params/Cargo.toml | 4 ++-- crates/tests/const_ptrs/Cargo.toml | 2 +- crates/tests/constructors/Cargo.toml | 6 +++--- crates/tests/constructors_client/Cargo.toml | 6 +++--- crates/tests/core/Cargo.toml | 6 +++--- crates/tests/debug/Cargo.toml | 2 +- crates/tests/debugger_visualizer/Cargo.toml | 4 ++-- crates/tests/deprecated/Cargo.toml | 2 +- crates/tests/dispatch/Cargo.toml | 2 +- crates/tests/does_not_return/Cargo.toml | 4 ++-- crates/tests/enums/Cargo.toml | 4 ++-- crates/tests/error/Cargo.toml | 2 +- crates/tests/event/Cargo.toml | 2 +- crates/tests/extensions/Cargo.toml | 2 +- crates/tests/handles/Cargo.toml | 4 ++-- crates/tests/helpers/Cargo.toml | 2 +- crates/tests/implement/Cargo.toml | 4 ++-- crates/tests/implement_core/Cargo.toml | 2 +- crates/tests/interface/Cargo.toml | 4 ++-- crates/tests/interface_core/Cargo.toml | 2 +- crates/tests/interop/Cargo.toml | 2 +- crates/tests/lib/Cargo.toml | 6 +++--- crates/tests/linux/Cargo.toml | 4 ++-- crates/tests/literals/Cargo.toml | 4 ++-- crates/tests/match/Cargo.toml | 2 +- crates/tests/matrix3x2/Cargo.toml | 2 +- crates/tests/metadata/Cargo.toml | 6 +++--- crates/tests/metadata/tests/attribute_enum.rs | 2 +- crates/tests/metadata/tests/fn_call_size.rs | 2 +- crates/tests/metadata/tests/unused.rs | 2 +- crates/tests/msrv/Cargo.toml | 2 +- crates/tests/no_std/Cargo.toml | 3 +-- crates/tests/no_use/Cargo.toml | 4 ++-- crates/tests/noexcept/Cargo.toml | 6 +++--- crates/tests/not_dll/Cargo.toml | 4 ++-- crates/tests/query_signature/Cargo.toml | 2 +- crates/tests/readme/Cargo.toml | 18 +++++++++--------- crates/tests/registry/Cargo.toml | 10 +++++----- crates/tests/registry_default/Cargo.toml | 2 +- crates/tests/reserved/Cargo.toml | 4 ++-- crates/tests/resources/Cargo.toml | 4 ++-- crates/tests/result/Cargo.toml | 4 ++-- crates/tests/return_handle/Cargo.toml | 2 +- crates/tests/return_struct/Cargo.toml | 2 +- crates/tests/riddle/Cargo.toml | 6 +++--- crates/tests/standalone/Cargo.toml | 4 ++-- crates/tests/string_param/Cargo.toml | 2 +- crates/tests/strings/Cargo.toml | 6 +++--- crates/tests/structs/Cargo.toml | 2 +- crates/tests/sys/Cargo.toml | 2 +- crates/tests/targets/Cargo.toml | 6 +++--- crates/tests/unions/Cargo.toml | 4 ++-- crates/tests/variant/Cargo.toml | 4 ++-- crates/tests/wdk/Cargo.toml | 4 ++-- crates/tests/weak/Cargo.toml | 2 +- crates/tests/weak_ref/Cargo.toml | 2 +- crates/tests/win32/Cargo.toml | 2 +- crates/tests/win32_arrays/Cargo.toml | 2 +- crates/tests/window_long/Cargo.toml | 4 ++-- crates/tools/bindings/Cargo.toml | 2 +- crates/tools/lib/Cargo.toml | 2 +- crates/tools/lib/src/lib.rs | 1 + crates/tools/standalone/Cargo.toml | 2 +- 122 files changed, 200 insertions(+), 187 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ec929dcdb0..4396030fe6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,3 +17,16 @@ exclude = [ rust_2018_idioms = { level = "warn", priority = -1 } missing_docs = "warn" unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_raw_dylib, windows_debugger_visualizer, windows_slim_errors)'] } + +[workspace.dependencies] +cppwinrt = { path = "crates/libs/cppwinrt" } +windows = { path = "crates/libs/windows" } +windows-bindgen = { path = "crates/libs/bindgen" } +windows-core = { path = "crates/libs/core" } +windows-metadata = { path = "crates/libs/metadata" } +windows-registry = { path = "crates/libs/registry" } +windows-result = { path = "crates/libs/result" } +windows-strings = { path = "crates/libs/strings" } +windows-sys = { path = "crates/libs/sys" } +windows-targets = { path = "crates/libs/targets" } +windows-version = { path = "crates/libs/version" } diff --git a/crates/samples/components/json_validator/Cargo.toml b/crates/samples/components/json_validator/Cargo.toml index 525f6c7f19..bf4c7b96e4 100644 --- a/crates/samples/components/json_validator/Cargo.toml +++ b/crates/samples/components/json_validator/Cargo.toml @@ -12,7 +12,7 @@ jsonschema = { version = "0.18", default-features = false } serde_json = {version = "1.0", default-features = false } [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", ] diff --git a/crates/samples/components/json_validator_client/Cargo.toml b/crates/samples/components/json_validator_client/Cargo.toml index ca6dbe9b69..e4a548d0fc 100644 --- a/crates/samples/components/json_validator_client/Cargo.toml +++ b/crates/samples/components/json_validator_client/Cargo.toml @@ -8,7 +8,7 @@ publish = false cc = "1.0" [dependencies.windows-targets] -path = "../../../../crates/libs/targets" +workspace = true # TODO: this causes a warning about lack of linkage target. The point is to ensure that this binary dependency is built first but # Cargo doesn't respect cdylib targets. https://github.com/rust-lang/cargo/issues/7825 diff --git a/crates/samples/components/json_validator_winrt/Cargo.toml b/crates/samples/components/json_validator_winrt/Cargo.toml index 64ab5edfc1..987d55f1c4 100644 --- a/crates/samples/components/json_validator_winrt/Cargo.toml +++ b/crates/samples/components/json_validator_winrt/Cargo.toml @@ -13,14 +13,14 @@ jsonschema = { version = "0.18", default-features = false } serde_json = {version = "1.0", default-features = false } [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "implement", "Win32_System_WinRT", ] [dependencies.windows-core] -path = "../../../libs/core" +workspace = true [build-dependencies.windows-bindgen] -path = "../../../libs/bindgen" +workspace = true diff --git a/crates/samples/components/json_validator_winrt_client/Cargo.toml b/crates/samples/components/json_validator_winrt_client/Cargo.toml index 608ae5af00..4cbb9efdf3 100644 --- a/crates/samples/components/json_validator_winrt_client/Cargo.toml +++ b/crates/samples/components/json_validator_winrt_client/Cargo.toml @@ -5,16 +5,16 @@ edition = "2021" publish = false [dev-dependencies.windows-core] -path = "../../../libs/core" +workspace = true [dev-dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Foundation", ] [build-dependencies.windows-bindgen] -path = "../../../libs/bindgen" +workspace = true # TODO: this causes a warning about lack of linkage target. The point is to ensure that this binary dependency is built first but # Cargo doesn't respect cdylib targets. https://github.com/rust-lang/cargo/issues/7825 diff --git a/crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml b/crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml index 6e5dbd2125..50efb87f39 100644 --- a/crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml +++ b/crates/samples/components/json_validator_winrt_client_cpp/Cargo.toml @@ -8,10 +8,10 @@ publish = false cc = "1.0" [build-dependencies.cppwinrt] -path = "../../../../crates/libs/cppwinrt" +workspace = true [dependencies.windows-targets] -path = "../../../../crates/libs/targets" +workspace = true # TODO: this causes a warning about lack of linkage target. The point is to ensure that this binary dependency is built first but # Cargo doesn't respect cdylib targets. https://github.com/rust-lang/cargo/issues/7825 diff --git a/crates/samples/windows-sys/counter/Cargo.toml b/crates/samples/windows-sys/counter/Cargo.toml index f1ce4d7c4e..cb83bb747f 100644 --- a/crates/samples/windows-sys/counter/Cargo.toml +++ b/crates/samples/windows-sys/counter/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_System_Performance", ] diff --git a/crates/samples/windows-sys/create_window/Cargo.toml b/crates/samples/windows-sys/create_window/Cargo.toml index 9cb9fb620b..0eac875fc6 100644 --- a/crates/samples/windows-sys/create_window/Cargo.toml +++ b/crates/samples/windows-sys/create_window/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_System_LibraryLoader", diff --git a/crates/samples/windows-sys/delay_load/Cargo.toml b/crates/samples/windows-sys/delay_load/Cargo.toml index df6b1462ff..be2d212578 100644 --- a/crates/samples/windows-sys/delay_load/Cargo.toml +++ b/crates/samples/windows-sys/delay_load/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_System_LibraryLoader", ] diff --git a/crates/samples/windows-sys/enum_windows/Cargo.toml b/crates/samples/windows-sys/enum_windows/Cargo.toml index 2f947fa3da..c7a6abea29 100644 --- a/crates/samples/windows-sys/enum_windows/Cargo.toml +++ b/crates/samples/windows-sys/enum_windows/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", ] diff --git a/crates/samples/windows-sys/message_box/Cargo.toml b/crates/samples/windows-sys/message_box/Cargo.toml index baec9d3341..052d4ffc80 100644 --- a/crates/samples/windows-sys/message_box/Cargo.toml +++ b/crates/samples/windows-sys/message_box/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", "Win32_UI_Shell", diff --git a/crates/samples/windows-sys/privileges/Cargo.toml b/crates/samples/windows-sys/privileges/Cargo.toml index b3178563f4..984708a383 100644 --- a/crates/samples/windows-sys/privileges/Cargo.toml +++ b/crates/samples/windows-sys/privileges/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_Security", "Win32_System_Threading", diff --git a/crates/samples/windows-sys/task_dialog/Cargo.toml b/crates/samples/windows-sys/task_dialog/Cargo.toml index c6001abb56..dceda6acd1 100644 --- a/crates/samples/windows-sys/task_dialog/Cargo.toml +++ b/crates/samples/windows-sys/task_dialog/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_UI_Controls", "Win32_UI_WindowsAndMessaging", diff --git a/crates/samples/windows-sys/thread_pool_work/Cargo.toml b/crates/samples/windows-sys/thread_pool_work/Cargo.toml index ff43c8955b..7d16c32883 100644 --- a/crates/samples/windows-sys/thread_pool_work/Cargo.toml +++ b/crates/samples/windows-sys/thread_pool_work/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows-sys] -path = "../../../libs/sys" +workspace = true features = [ "Win32_System_Threading", ] diff --git a/crates/samples/windows/bits/Cargo.toml b/crates/samples/windows/bits/Cargo.toml index ff88828b0b..bb9dc05b75 100644 --- a/crates/samples/windows/bits/Cargo.toml +++ b/crates/samples/windows/bits/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "implement", "Win32_System_Com", @@ -13,4 +13,4 @@ features = [ ] [dependencies.windows-core] -path = "../../../libs/core" +workspace = true diff --git a/crates/samples/windows/com_uri/Cargo.toml b/crates/samples/windows/com_uri/Cargo.toml index e9e7118114..a07d0a9cef 100644 --- a/crates/samples/windows/com_uri/Cargo.toml +++ b/crates/samples/windows/com_uri/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", ] diff --git a/crates/samples/windows/consent/Cargo.toml b/crates/samples/windows/consent/Cargo.toml index dd889cf8d9..729e341101 100644 --- a/crates/samples/windows/consent/Cargo.toml +++ b/crates/samples/windows/consent/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Security_Credentials_UI", "Win32_System_WinRT", diff --git a/crates/samples/windows/core_app/Cargo.toml b/crates/samples/windows/core_app/Cargo.toml index 833f4cbef1..d0e93d5046 100644 --- a/crates/samples/windows/core_app/Cargo.toml +++ b/crates/samples/windows/core_app/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "implement", "ApplicationModel_Core", @@ -16,4 +16,4 @@ features = [ ] [dependencies.windows-core] -path = "../../../libs/core" +workspace = true diff --git a/crates/samples/windows/counter/Cargo.toml b/crates/samples/windows/counter/Cargo.toml index 42ef12772b..5c713814fc 100644 --- a/crates/samples/windows/counter/Cargo.toml +++ b/crates/samples/windows/counter/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Performance", ] diff --git a/crates/samples/windows/create_window/Cargo.toml b/crates/samples/windows/create_window/Cargo.toml index 97085ca0a8..a7e539e988 100644 --- a/crates/samples/windows/create_window/Cargo.toml +++ b/crates/samples/windows/create_window/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_System_LibraryLoader", diff --git a/crates/samples/windows/credentials/Cargo.toml b/crates/samples/windows/credentials/Cargo.toml index 0001ed3072..3ceec98e10 100644 --- a/crates/samples/windows/credentials/Cargo.toml +++ b/crates/samples/windows/credentials/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Security_Credentials" ] diff --git a/crates/samples/windows/data_protection/Cargo.toml b/crates/samples/windows/data_protection/Cargo.toml index e8efc4ddd8..25478887e9 100644 --- a/crates/samples/windows/data_protection/Cargo.toml +++ b/crates/samples/windows/data_protection/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Storage_Streams", "Security_Cryptography_DataProtection", diff --git a/crates/samples/windows/dcomp/Cargo.toml b/crates/samples/windows/dcomp/Cargo.toml index a91a45aefa..a6435813a8 100644 --- a/crates/samples/windows/dcomp/Cargo.toml +++ b/crates/samples/windows/dcomp/Cargo.toml @@ -8,7 +8,7 @@ publish = false rand = "0.8.5" [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Foundation_Numerics", "Win32_Graphics_Direct2D_Common", diff --git a/crates/samples/windows/delay_load/Cargo.toml b/crates/samples/windows/delay_load/Cargo.toml index 5566a95d2f..a9769fc8cc 100644 --- a/crates/samples/windows/delay_load/Cargo.toml +++ b/crates/samples/windows/delay_load/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_LibraryLoader", ] diff --git a/crates/samples/windows/device_watcher/Cargo.toml b/crates/samples/windows/device_watcher/Cargo.toml index 91e4d5e852..0cf36d9a85 100644 --- a/crates/samples/windows/device_watcher/Cargo.toml +++ b/crates/samples/windows/device_watcher/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Devices_Enumeration", "Foundation_Collections", diff --git a/crates/samples/windows/direct2d/Cargo.toml b/crates/samples/windows/direct2d/Cargo.toml index 605c70ecf0..077c3f673f 100644 --- a/crates/samples/windows/direct2d/Cargo.toml +++ b/crates/samples/windows/direct2d/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Foundation_Numerics", "Win32_System_Com", diff --git a/crates/samples/windows/direct3d12/Cargo.toml b/crates/samples/windows/direct3d12/Cargo.toml index 1787fa993c..dce77f0d1f 100644 --- a/crates/samples/windows/direct3d12/Cargo.toml +++ b/crates/samples/windows/direct3d12/Cargo.toml @@ -8,7 +8,7 @@ publish = false array-init = "2.0.0" [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Graphics_Direct3D_Fxc", "Win32_Graphics_Direct3D12", diff --git a/crates/samples/windows/enum_windows/Cargo.toml b/crates/samples/windows/enum_windows/Cargo.toml index f87bc91c32..ac6f752e97 100644 --- a/crates/samples/windows/enum_windows/Cargo.toml +++ b/crates/samples/windows/enum_windows/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", ] diff --git a/crates/samples/windows/file_dialogs/Cargo.toml b/crates/samples/windows/file_dialogs/Cargo.toml index 115cbdc4bb..d2cad6b1dc 100644 --- a/crates/samples/windows/file_dialogs/Cargo.toml +++ b/crates/samples/windows/file_dialogs/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_UI_Shell_Common", "Win32_System_Com", diff --git a/crates/samples/windows/kernel_event/Cargo.toml b/crates/samples/windows/kernel_event/Cargo.toml index 0c92ef0899..8fdab31797 100644 --- a/crates/samples/windows/kernel_event/Cargo.toml +++ b/crates/samples/windows/kernel_event/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Security", "Win32_System_Threading", diff --git a/crates/samples/windows/memory_buffer/Cargo.toml b/crates/samples/windows/memory_buffer/Cargo.toml index 38b2cc6688..1111ce2d8d 100644 --- a/crates/samples/windows/memory_buffer/Cargo.toml +++ b/crates/samples/windows/memory_buffer/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Foundation", "Win32_System_WinRT", diff --git a/crates/samples/windows/message_box/Cargo.toml b/crates/samples/windows/message_box/Cargo.toml index 86298f127d..cdb0eaa1e0 100644 --- a/crates/samples/windows/message_box/Cargo.toml +++ b/crates/samples/windows/message_box/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", "Win32_UI_Shell", diff --git a/crates/samples/windows/ocr/Cargo.toml b/crates/samples/windows/ocr/Cargo.toml index 377ff0e03a..e0df90d4af 100644 --- a/crates/samples/windows/ocr/Cargo.toml +++ b/crates/samples/windows/ocr/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Media_Ocr", "Graphics_Imaging", diff --git a/crates/samples/windows/overlapped/Cargo.toml b/crates/samples/windows/overlapped/Cargo.toml index 476ab949e8..5d87253693 100644 --- a/crates/samples/windows/overlapped/Cargo.toml +++ b/crates/samples/windows/overlapped/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Security", "Win32_Storage_FileSystem", diff --git a/crates/samples/windows/privileges/Cargo.toml b/crates/samples/windows/privileges/Cargo.toml index 342ec95d9a..0c54d398f9 100644 --- a/crates/samples/windows/privileges/Cargo.toml +++ b/crates/samples/windows/privileges/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_Security", "Win32_System_Threading", diff --git a/crates/samples/windows/rss/Cargo.toml b/crates/samples/windows/rss/Cargo.toml index 032b875cb2..48e4b96363 100644 --- a/crates/samples/windows/rss/Cargo.toml +++ b/crates/samples/windows/rss/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Foundation_Collections", "Web_Syndication", diff --git a/crates/samples/windows/shell/Cargo.toml b/crates/samples/windows/shell/Cargo.toml index 91517c92ac..b5794bbebd 100644 --- a/crates/samples/windows/shell/Cargo.toml +++ b/crates/samples/windows/shell/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", "Win32_System_Ole", diff --git a/crates/samples/windows/simple/Cargo.toml b/crates/samples/windows/simple/Cargo.toml index 72a2541975..284f5eface 100644 --- a/crates/samples/windows/simple/Cargo.toml +++ b/crates/samples/windows/simple/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "UI", ] diff --git a/crates/samples/windows/spellchecker/Cargo.toml b/crates/samples/windows/spellchecker/Cargo.toml index f100bbccd9..435b5591c6 100644 --- a/crates/samples/windows/spellchecker/Cargo.toml +++ b/crates/samples/windows/spellchecker/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", "Win32_Globalization", diff --git a/crates/samples/windows/task_dialog/Cargo.toml b/crates/samples/windows/task_dialog/Cargo.toml index 028232b4e4..631a7b3103 100644 --- a/crates/samples/windows/task_dialog/Cargo.toml +++ b/crates/samples/windows/task_dialog/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_UI_Controls", "Win32_UI_WindowsAndMessaging", diff --git a/crates/samples/windows/thread_pool_work/Cargo.toml b/crates/samples/windows/thread_pool_work/Cargo.toml index 0979215b75..5617178065 100644 --- a/crates/samples/windows/thread_pool_work/Cargo.toml +++ b/crates/samples/windows/thread_pool_work/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Threading", ] diff --git a/crates/samples/windows/uiautomation/Cargo.toml b/crates/samples/windows/uiautomation/Cargo.toml index 6a79e1e748..4503385edf 100644 --- a/crates/samples/windows/uiautomation/Cargo.toml +++ b/crates/samples/windows/uiautomation/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", "Win32_UI_Accessibility", diff --git a/crates/samples/windows/wmi/Cargo.toml b/crates/samples/windows/wmi/Cargo.toml index 28c87ac66a..2050bc853c 100644 --- a/crates/samples/windows/wmi/Cargo.toml +++ b/crates/samples/windows/wmi/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Win32_System_Com", "Win32_System_Ole", diff --git a/crates/samples/windows/xml/Cargo.toml b/crates/samples/windows/xml/Cargo.toml index 8e1bc9df2e..68d825c1d2 100644 --- a/crates/samples/windows/xml/Cargo.toml +++ b/crates/samples/windows/xml/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../../libs/windows" +workspace = true features = [ "Data_Xml_Dom", ] diff --git a/crates/tests/agile/Cargo.toml b/crates/tests/agile/Cargo.toml index 077c352b71..b44377e78b 100644 --- a/crates/tests/agile/Cargo.toml +++ b/crates/tests/agile/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", "Win32_System_WinRT", diff --git a/crates/tests/agile_reference/Cargo.toml b/crates/tests/agile_reference/Cargo.toml index d204e05d1a..7a1846202f 100644 --- a/crates/tests/agile_reference/Cargo.toml +++ b/crates/tests/agile_reference/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Media_Control", "Foundation_Collections" diff --git a/crates/tests/alternate_success_code/Cargo.toml b/crates/tests/alternate_success_code/Cargo.toml index 32a459442e..38447c0729 100644 --- a/crates/tests/alternate_success_code/Cargo.toml +++ b/crates/tests/alternate_success_code/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Ole", "Win32_System_Com", diff --git a/crates/tests/arch/Cargo.toml b/crates/tests/arch/Cargo.toml index 4556ee9a8a..ad9274bb8b 100644 --- a/crates/tests/arch/Cargo.toml +++ b/crates/tests/arch/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Diagnostics_Debug", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_System_Diagnostics_Debug", ] diff --git a/crates/tests/arch_feature/Cargo.toml b/crates/tests/arch_feature/Cargo.toml index 20d3581e19..75d60436e2 100644 --- a/crates/tests/arch_feature/Cargo.toml +++ b/crates/tests/arch_feature/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Diagnostics_Debug", "Win32_System_SystemServices", @@ -18,7 +18,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_System_Diagnostics_Debug", "Win32_System_SystemServices", diff --git a/crates/tests/array/Cargo.toml b/crates/tests/array/Cargo.toml index 310e403e3f..e13be6d458 100644 --- a/crates/tests/array/Cargo.toml +++ b/crates/tests/array/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", "Win32_Media_MediaFoundation", diff --git a/crates/tests/async/Cargo.toml b/crates/tests/async/Cargo.toml index 5780bc35fa..f86fc5a082 100644 --- a/crates/tests/async/Cargo.toml +++ b/crates/tests/async/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Storage_Streams", diff --git a/crates/tests/bcrypt/Cargo.toml b/crates/tests/bcrypt/Cargo.toml index ef67f65db5..11478a4fa2 100644 --- a/crates/tests/bcrypt/Cargo.toml +++ b/crates/tests/bcrypt/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Security_Cryptography", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Security_Cryptography", ] diff --git a/crates/tests/calling_convention/Cargo.toml b/crates/tests/calling_convention/Cargo.toml index e35f5bac29..2f61794c6e 100644 --- a/crates/tests/calling_convention/Cargo.toml +++ b/crates/tests/calling_convention/Cargo.toml @@ -12,14 +12,14 @@ doctest = false unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_raw_dylib)'] } [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Networking_Ldap", "Win32_System_SystemInformation", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Networking_Ldap", "Win32_System_SystemInformation", diff --git a/crates/tests/cfg_generic/Cargo.toml b/crates/tests/cfg_generic/Cargo.toml index ba45f2f5be..ac57a3a5f5 100644 --- a/crates/tests/cfg_generic/Cargo.toml +++ b/crates/tests/cfg_generic/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation_Collections", "Media_Playback", diff --git a/crates/tests/class_hierarchy/Cargo.toml b/crates/tests/class_hierarchy/Cargo.toml index 1f3c5c9d1c..5d016d96e4 100644 --- a/crates/tests/class_hierarchy/Cargo.toml +++ b/crates/tests/class_hierarchy/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", ] diff --git a/crates/tests/collections/Cargo.toml b/crates/tests/collections/Cargo.toml index 2aa27fffd7..c2c34241ea 100644 --- a/crates/tests/collections/Cargo.toml +++ b/crates/tests/collections/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation_Collections", @@ -18,4 +18,4 @@ features = [ ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true diff --git a/crates/tests/component/Cargo.toml b/crates/tests/component/Cargo.toml index b2facd19e9..8e5abf7635 100644 --- a/crates/tests/component/Cargo.toml +++ b/crates/tests/component/Cargo.toml @@ -10,10 +10,10 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", @@ -21,4 +21,4 @@ features = [ ] [build-dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true diff --git a/crates/tests/component_client/Cargo.toml b/crates/tests/component_client/Cargo.toml index f1bbaf78b7..e1dee083e7 100644 --- a/crates/tests/component_client/Cargo.toml +++ b/crates/tests/component_client/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [build-dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", diff --git a/crates/tests/const_fields/Cargo.toml b/crates/tests/const_fields/Cargo.toml index e3d4a27057..7592840ca6 100644 --- a/crates/tests/const_fields/Cargo.toml +++ b/crates/tests/const_fields/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Storage_CloudFilters", "Win32_System_CorrelationVector", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Storage_CloudFilters", "Win32_System_CorrelationVector", diff --git a/crates/tests/const_params/Cargo.toml b/crates/tests/const_params/Cargo.toml index d56327ba87..4e3ee22561 100644 --- a/crates/tests/const_params/Cargo.toml +++ b/crates/tests/const_params/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_UI_Shell", "Win32_System_WinRT", @@ -17,7 +17,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_UI_Shell", ] diff --git a/crates/tests/const_ptrs/Cargo.toml b/crates/tests/const_ptrs/Cargo.toml index c019ffc598..a79b0ac73b 100644 --- a/crates/tests/const_ptrs/Cargo.toml +++ b/crates/tests/const_ptrs/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Com_StructuredStorage", "Win32_System_Variant", diff --git a/crates/tests/constructors/Cargo.toml b/crates/tests/constructors/Cargo.toml index b61e9e1bd4..03062df0fb 100644 --- a/crates/tests/constructors/Cargo.toml +++ b/crates/tests/constructors/Cargo.toml @@ -10,13 +10,13 @@ doc = false doctest = false [build-dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", diff --git a/crates/tests/constructors_client/Cargo.toml b/crates/tests/constructors_client/Cargo.toml index 3ddec0e501..1aead9ffdf 100644 --- a/crates/tests/constructors_client/Cargo.toml +++ b/crates/tests/constructors_client/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [build-dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", diff --git a/crates/tests/core/Cargo.toml b/crates/tests/core/Cargo.toml index 7f6e14bdb4..ca168f7d98 100644 --- a/crates/tests/core/Cargo.toml +++ b/crates/tests/core/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Win32_System_WinRT", @@ -19,10 +19,10 @@ features = [ ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true [dev-dependencies] helpers = { package = "test_helpers", path = "../helpers" } diff --git a/crates/tests/debug/Cargo.toml b/crates/tests/debug/Cargo.toml index 2d10258936..e66f29ee8b 100644 --- a/crates/tests/debug/Cargo.toml +++ b/crates/tests/debug/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", ] diff --git a/crates/tests/debugger_visualizer/Cargo.toml b/crates/tests/debugger_visualizer/Cargo.toml index ae8ce92be9..3cf9b41356 100644 --- a/crates/tests/debugger_visualizer/Cargo.toml +++ b/crates/tests/debugger_visualizer/Cargo.toml @@ -12,14 +12,14 @@ doctest = false unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_debugger_visualizer)'] } [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Win32_System_Com", ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dev-dependencies] debugger_test = "0.1.0" diff --git a/crates/tests/deprecated/Cargo.toml b/crates/tests/deprecated/Cargo.toml index ec4e990aab..6629f73295 100644 --- a/crates/tests/deprecated/Cargo.toml +++ b/crates/tests/deprecated/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "deprecated", "ApplicationModel_Contacts", diff --git a/crates/tests/dispatch/Cargo.toml b/crates/tests/dispatch/Cargo.toml index 2655b04417..f42b7d4ffb 100644 --- a/crates/tests/dispatch/Cargo.toml +++ b/crates/tests/dispatch/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Com", "Win32_System_Ole", diff --git a/crates/tests/does_not_return/Cargo.toml b/crates/tests/does_not_return/Cargo.toml index 9cdef4e527..06288d6557 100644 --- a/crates/tests/does_not_return/Cargo.toml +++ b/crates/tests/does_not_return/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Diagnostics_Debug", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_System_Diagnostics_Debug", ] diff --git a/crates/tests/enums/Cargo.toml b/crates/tests/enums/Cargo.toml index 722da2c38b..fef13627ef 100644 --- a/crates/tests/enums/Cargo.toml +++ b/crates/tests/enums/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Storage_Streams", "Win32_UI_WindowsAndMessaging", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", ] diff --git a/crates/tests/error/Cargo.toml b/crates/tests/error/Cargo.toml index 792682f409..87a5fb2ad2 100644 --- a/crates/tests/error/Cargo.toml +++ b/crates/tests/error/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", diff --git a/crates/tests/event/Cargo.toml b/crates/tests/event/Cargo.toml index daec155298..ef21dac692 100644 --- a/crates/tests/event/Cargo.toml +++ b/crates/tests/event/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", "Win32_System_WinRT", diff --git a/crates/tests/extensions/Cargo.toml b/crates/tests/extensions/Cargo.toml index 2eac8e32d9..7b44ffc26c 100644 --- a/crates/tests/extensions/Cargo.toml +++ b/crates/tests/extensions/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Security_Cryptography", "Win32_NetworkManagement_IpHelper", diff --git a/crates/tests/handles/Cargo.toml b/crates/tests/handles/Cargo.toml index e00344efcf..f61928f7f5 100644 --- a/crates/tests/handles/Cargo.toml +++ b/crates/tests/handles/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_System_Registry", @@ -19,7 +19,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Graphics_Gdi", ] diff --git a/crates/tests/helpers/Cargo.toml b/crates/tests/helpers/Cargo.toml index 96e696faff..80a20e9be6 100644 --- a/crates/tests/helpers/Cargo.toml +++ b/crates/tests/helpers/Cargo.toml @@ -9,4 +9,4 @@ doc = false doctest = false [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true diff --git a/crates/tests/implement/Cargo.toml b/crates/tests/implement/Cargo.toml index 159c013c33..545fd9d6b4 100644 --- a/crates/tests/implement/Cargo.toml +++ b/crates/tests/implement/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "ApplicationModel_Activation", @@ -27,7 +27,7 @@ features = [ ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies] static_assertions = "1.1" diff --git a/crates/tests/implement_core/Cargo.toml b/crates/tests/implement_core/Cargo.toml index b90a6c1bd2..820c21a148 100644 --- a/crates/tests/implement_core/Cargo.toml +++ b/crates/tests/implement_core/Cargo.toml @@ -8,7 +8,7 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies] static_assertions = "1.1" diff --git a/crates/tests/interface/Cargo.toml b/crates/tests/interface/Cargo.toml index 10381cb1f5..26124b4af4 100644 --- a/crates/tests/interface/Cargo.toml +++ b/crates/tests/interface/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Win32_Graphics_Direct3D", @@ -21,4 +21,4 @@ features = [ ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true diff --git a/crates/tests/interface_core/Cargo.toml b/crates/tests/interface_core/Cargo.toml index f1f8c0fa35..f8a27215a2 100644 --- a/crates/tests/interface_core/Cargo.toml +++ b/crates/tests/interface_core/Cargo.toml @@ -9,4 +9,4 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true diff --git a/crates/tests/interop/Cargo.toml b/crates/tests/interop/Cargo.toml index 57d4a07ede..33d9cb04f6 100644 --- a/crates/tests/interop/Cargo.toml +++ b/crates/tests/interop/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation_Collections", "Win32_System_Com", diff --git a/crates/tests/lib/Cargo.toml b/crates/tests/lib/Cargo.toml index a213883ec0..f6e4ab4cdf 100644 --- a/crates/tests/lib/Cargo.toml +++ b/crates/tests/lib/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Direct3D_Fxc", "Win32_Graphics_Direct3D11", @@ -19,7 +19,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_Security", @@ -29,4 +29,4 @@ features = [ ] [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true diff --git a/crates/tests/linux/Cargo.toml b/crates/tests/linux/Cargo.toml index 8285f3b1ab..65fc4e1843 100644 --- a/crates/tests/linux/Cargo.toml +++ b/crates/tests/linux/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows-result] -path = "../../libs/result" +workspace = true [dependencies.windows-core] -path = "../../libs/core" +workspace = true diff --git a/crates/tests/literals/Cargo.toml b/crates/tests/literals/Cargo.toml index 9dada3c6b2..0a0343c266 100644 --- a/crates/tests/literals/Cargo.toml +++ b/crates/tests/literals/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true diff --git a/crates/tests/match/Cargo.toml b/crates/tests/match/Cargo.toml index 1808ed5828..cc2c9c033c 100644 --- a/crates/tests/match/Cargo.toml +++ b/crates/tests/match/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", "Win32_Foundation", diff --git a/crates/tests/matrix3x2/Cargo.toml b/crates/tests/matrix3x2/Cargo.toml index 14051ddbe6..547039e49c 100644 --- a/crates/tests/matrix3x2/Cargo.toml +++ b/crates/tests/matrix3x2/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation_Numerics", ] diff --git a/crates/tests/metadata/Cargo.toml b/crates/tests/metadata/Cargo.toml index b028067277..44ffd25b5d 100644 --- a/crates/tests/metadata/Cargo.toml +++ b/crates/tests/metadata/Cargo.toml @@ -9,17 +9,17 @@ doc = false doctest = false [dependencies] -metadata = { package = "windows-metadata", path = "../../libs/metadata" } +windows-metadata = { workspace = true } [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_System_SystemServices", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_System_SystemServices", diff --git a/crates/tests/metadata/tests/attribute_enum.rs b/crates/tests/metadata/tests/attribute_enum.rs index 6692e3d028..bde1630c5a 100644 --- a/crates/tests/metadata/tests/attribute_enum.rs +++ b/crates/tests/metadata/tests/attribute_enum.rs @@ -1,4 +1,4 @@ -use metadata::*; +use windows_metadata::*; #[test] fn attribute_enum() { diff --git a/crates/tests/metadata/tests/fn_call_size.rs b/crates/tests/metadata/tests/fn_call_size.rs index 4e1c7182b1..b67262fa3b 100644 --- a/crates/tests/metadata/tests/fn_call_size.rs +++ b/crates/tests/metadata/tests/fn_call_size.rs @@ -1,4 +1,4 @@ -use metadata::*; +use windows_metadata::*; #[test] fn size() { diff --git a/crates/tests/metadata/tests/unused.rs b/crates/tests/metadata/tests/unused.rs index a70c257f7a..f2f2665277 100644 --- a/crates/tests/metadata/tests/unused.rs +++ b/crates/tests/metadata/tests/unused.rs @@ -1,4 +1,4 @@ -use metadata::*; +use windows_metadata::*; #[test] fn test() { diff --git a/crates/tests/msrv/Cargo.toml b/crates/tests/msrv/Cargo.toml index 4d08c5886f..52fa33d228 100644 --- a/crates/tests/msrv/Cargo.toml +++ b/crates/tests/msrv/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Globalization", "Win32_Graphics_Direct2D", diff --git a/crates/tests/no_std/Cargo.toml b/crates/tests/no_std/Cargo.toml index 1dc004b79f..6481d54566 100644 --- a/crates/tests/no_std/Cargo.toml +++ b/crates/tests/no_std/Cargo.toml @@ -28,8 +28,7 @@ path = "../../libs/sys" default-features = false [dependencies.windows-targets] -path = "../../libs/targets" -default-features = false +workspace = true [dependencies.windows-version] path = "../../libs/version" diff --git a/crates/tests/no_use/Cargo.toml b/crates/tests/no_use/Cargo.toml index 85d44b6b9a..145fb8e4ae 100644 --- a/crates/tests/no_use/Cargo.toml +++ b/crates/tests/no_use/Cargo.toml @@ -9,11 +9,11 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Foundation", ] [dependencies.windows-core] -path = "../../libs/core" +workspace = true diff --git a/crates/tests/noexcept/Cargo.toml b/crates/tests/noexcept/Cargo.toml index f62bf7f55d..58a22343a2 100644 --- a/crates/tests/noexcept/Cargo.toml +++ b/crates/tests/noexcept/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [build-dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true [build-dependencies] cc = "1.0" [build-dependencies.cppwinrt] -path = "../../libs/cppwinrt" +workspace = true diff --git a/crates/tests/not_dll/Cargo.toml b/crates/tests/not_dll/Cargo.toml index 8d9708b577..94b23fc374 100644 --- a/crates/tests/not_dll/Cargo.toml +++ b/crates/tests/not_dll/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Printing", "Win32_Graphics_Gdi", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Graphics_Printing", "Win32_Graphics_Gdi", diff --git a/crates/tests/query_signature/Cargo.toml b/crates/tests/query_signature/Cargo.toml index fd71e744a9..a121f38fd6 100644 --- a/crates/tests/query_signature/Cargo.toml +++ b/crates/tests/query_signature/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Diagnostics_Debug_Extensions", ] diff --git a/crates/tests/readme/Cargo.toml b/crates/tests/readme/Cargo.toml index 4bf2c16b15..bc7898549b 100644 --- a/crates/tests/readme/Cargo.toml +++ b/crates/tests/readme/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Data_Xml_Dom", "Win32_Security", @@ -14,7 +14,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Security", "Win32_System_Threading", @@ -22,22 +22,22 @@ features = [ ] [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true [dependencies.windows-metadata] -path = "../../libs/metadata" +workspace = true [dev-dependencies.windows-result] -path = "../../libs/result" +workspace = true [dev-dependencies.windows-registry] -path = "../../libs/registry" +workspace = true [dev-dependencies.windows-version] -path = "../../libs/version" +workspace = true [dev-dependencies.windows-strings] -path = "../../libs/strings" +workspace = true [dev-dependencies.cppwinrt] -path = "../../libs/cppwinrt" +workspace = true diff --git a/crates/tests/registry/Cargo.toml b/crates/tests/registry/Cargo.toml index f4ddc3d3d2..13555012af 100644 --- a/crates/tests/registry/Cargo.toml +++ b/crates/tests/registry/Cargo.toml @@ -9,18 +9,18 @@ doc = false doctest = false [dependencies.windows-registry] -path = "../../libs/registry" +workspace = true [dependencies.windows-result] -path = "../../libs/result" +workspace = true [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = ["Win32_System_Registry"] [dependencies.windows] -path = "../../libs/windows" +workspace = true features = ["Win32_System_Registry"] [dependencies.windows-strings] -path = "../../libs/strings" +workspace = true diff --git a/crates/tests/registry_default/Cargo.toml b/crates/tests/registry_default/Cargo.toml index 141fa4956a..260293891b 100644 --- a/crates/tests/registry_default/Cargo.toml +++ b/crates/tests/registry_default/Cargo.toml @@ -9,4 +9,4 @@ doc = false doctest = false [dependencies.windows-registry] -path = "../../libs/registry" +workspace = true diff --git a/crates/tests/reserved/Cargo.toml b/crates/tests/reserved/Cargo.toml index 4e9f9e5a61..cec9070349 100644 --- a/crates/tests/reserved/Cargo.toml +++ b/crates/tests/reserved/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Registry", "Win32_UI_WindowsAndMessaging", @@ -17,7 +17,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_System_Registry", "Win32_UI_WindowsAndMessaging", diff --git a/crates/tests/resources/Cargo.toml b/crates/tests/resources/Cargo.toml index 7722b427be..4995e44db4 100644 --- a/crates/tests/resources/Cargo.toml +++ b/crates/tests/resources/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_UI_Controls", "Win32_UI_WindowsAndMessaging", @@ -17,7 +17,7 @@ features = [ ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_UI_Controls", "Win32_UI_WindowsAndMessaging", diff --git a/crates/tests/result/Cargo.toml b/crates/tests/result/Cargo.toml index d724747228..93e80b6e10 100644 --- a/crates/tests/result/Cargo.toml +++ b/crates/tests/result/Cargo.toml @@ -9,10 +9,10 @@ doc = false doctest = false [dependencies.windows-result] -path = "../../libs/result" +workspace = true [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true [dependencies] helpers = { package = "test_helpers", path = "../helpers" } diff --git a/crates/tests/return_handle/Cargo.toml b/crates/tests/return_handle/Cargo.toml index 7351f7b8bd..7f60c6422a 100644 --- a/crates/tests/return_handle/Cargo.toml +++ b/crates/tests/return_handle/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_Threading", "Win32_Security", diff --git a/crates/tests/return_struct/Cargo.toml b/crates/tests/return_struct/Cargo.toml index a5564532e2..dcdf2d3476 100644 --- a/crates/tests/return_struct/Cargo.toml +++ b/crates/tests/return_struct/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Direct2D_Common" ] diff --git a/crates/tests/riddle/Cargo.toml b/crates/tests/riddle/Cargo.toml index 6b3126191b..039fce0a26 100644 --- a/crates/tests/riddle/Cargo.toml +++ b/crates/tests/riddle/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows-metadata] -path = "../../libs/metadata" +workspace = true [dependencies.tool_lib] path = "../../tools/lib" [dependencies.windows-bindgen] -path = "../../libs/bindgen" +workspace = true diff --git a/crates/tests/standalone/Cargo.toml b/crates/tests/standalone/Cargo.toml index f986a8ae43..ee10c56fe5 100644 --- a/crates/tests/standalone/Cargo.toml +++ b/crates/tests/standalone/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true diff --git a/crates/tests/string_param/Cargo.toml b/crates/tests/string_param/Cargo.toml index 416eefc201..015c86dc31 100644 --- a/crates/tests/string_param/Cargo.toml +++ b/crates/tests/string_param/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_UI_Shell", ] diff --git a/crates/tests/strings/Cargo.toml b/crates/tests/strings/Cargo.toml index 9beb9eb280..1b0b3834e5 100644 --- a/crates/tests/strings/Cargo.toml +++ b/crates/tests/strings/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows-strings] -path = "../../libs/strings" +workspace = true [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Foundation", "Win32_System_WinRT", diff --git a/crates/tests/structs/Cargo.toml b/crates/tests/structs/Cargo.toml index 1a9c694684..68fe573798 100644 --- a/crates/tests/structs/Cargo.toml +++ b/crates/tests/structs/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "implement", "Storage_Search", diff --git a/crates/tests/sys/Cargo.toml b/crates/tests/sys/Cargo.toml index 20b8b8cb08..90f5eb027a 100644 --- a/crates/tests/sys/Cargo.toml +++ b/crates/tests/sys/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Graphics_Gdi", "Win32_Security", diff --git a/crates/tests/targets/Cargo.toml b/crates/tests/targets/Cargo.toml index d63a13146a..96f46f86be 100644 --- a/crates/tests/targets/Cargo.toml +++ b/crates/tests/targets/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows-targets] -path = "../../libs/targets" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Security_Authentication_Identity" ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_Security_Authentication_Identity" ] [dependencies.tool_lib] diff --git a/crates/tests/unions/Cargo.toml b/crates/tests/unions/Cargo.toml index c51959cfce..7046a752e8 100644 --- a/crates/tests/unions/Cargo.toml +++ b/crates/tests/unions/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Direct3D12", "Win32_System_IO", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_System_IO", ] diff --git a/crates/tests/variant/Cargo.toml b/crates/tests/variant/Cargo.toml index 3d22334f4d..caeefea3e8 100644 --- a/crates/tests/variant/Cargo.toml +++ b/crates/tests/variant/Cargo.toml @@ -9,10 +9,10 @@ doc = false doctest = false [dependencies.windows-core] -path = "../../libs/core" +workspace = true [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", "Win32_System_Com_Events", diff --git a/crates/tests/wdk/Cargo.toml b/crates/tests/wdk/Cargo.toml index a9f939d7c4..ddca57f0af 100644 --- a/crates/tests/wdk/Cargo.toml +++ b/crates/tests/wdk/Cargo.toml @@ -9,14 +9,14 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Wdk_System_SystemServices", "Wdk_System_OfflineRegistry", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Wdk_System_SystemServices", "Wdk_System_OfflineRegistry", diff --git a/crates/tests/weak/Cargo.toml b/crates/tests/weak/Cargo.toml index 229a816b24..649330b0ed 100644 --- a/crates/tests/weak/Cargo.toml +++ b/crates/tests/weak/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Foundation", ] diff --git a/crates/tests/weak_ref/Cargo.toml b/crates/tests/weak_ref/Cargo.toml index 93c2cb20f5..202322a592 100644 --- a/crates/tests/weak_ref/Cargo.toml +++ b/crates/tests/weak_ref/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_System_WinRT", ] diff --git a/crates/tests/win32/Cargo.toml b/crates/tests/win32/Cargo.toml index 3f33f06b64..306e809798 100644 --- a/crates/tests/win32/Cargo.toml +++ b/crates/tests/win32/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Gaming", "Win32_Graphics_Direct2D", diff --git a/crates/tests/win32_arrays/Cargo.toml b/crates/tests/win32_arrays/Cargo.toml index 7bb6ab71fe..3b60a8c0c5 100644 --- a/crates/tests/win32_arrays/Cargo.toml +++ b/crates/tests/win32_arrays/Cargo.toml @@ -9,7 +9,7 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_Graphics_Dxgi", "Win32_Graphics_Gdi", diff --git a/crates/tests/window_long/Cargo.toml b/crates/tests/window_long/Cargo.toml index 587abcd9c2..72dac7e388 100644 --- a/crates/tests/window_long/Cargo.toml +++ b/crates/tests/window_long/Cargo.toml @@ -9,13 +9,13 @@ doc = false doctest = false [dependencies.windows] -path = "../../libs/windows" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", ] [dependencies.windows-sys] -path = "../../libs/sys" +workspace = true features = [ "Win32_UI_WindowsAndMessaging", ] diff --git a/crates/tools/bindings/Cargo.toml b/crates/tools/bindings/Cargo.toml index a42bc8aad4..9b41f60903 100644 --- a/crates/tools/bindings/Cargo.toml +++ b/crates/tools/bindings/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" publish = false [dependencies] -windows-bindgen = { path = "../../libs/bindgen" } +windows-bindgen = { workspace = true } diff --git a/crates/tools/lib/Cargo.toml b/crates/tools/lib/Cargo.toml index 1549cce132..231a30d851 100644 --- a/crates/tools/lib/Cargo.toml +++ b/crates/tools/lib/Cargo.toml @@ -6,4 +6,4 @@ publish = false [dependencies] regex = "1.7" -metadata = { package = "windows-metadata", path = "../../libs/metadata" } +windows-metadata = { workspace = true } diff --git a/crates/tools/lib/src/lib.rs b/crates/tools/lib/src/lib.rs index cf57dd83ed..aa60516282 100644 --- a/crates/tools/lib/src/lib.rs +++ b/crates/tools/lib/src/lib.rs @@ -1,6 +1,7 @@ use regex::Regex; use std::collections::BTreeMap; use std::path::Path; +use windows_metadata as metadata; pub enum CallingConvention { Stdcall(usize), diff --git a/crates/tools/standalone/Cargo.toml b/crates/tools/standalone/Cargo.toml index 28b4065a60..656d79bca4 100644 --- a/crates/tools/standalone/Cargo.toml +++ b/crates/tools/standalone/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -windows-bindgen = { path = "../../libs/bindgen" } +windows-bindgen = { workspace = true } [lints] workspace = true