Use workspace dependencies where practical (#3248)

microsoft · Sep 4, 2024 · edef61b · edef61b
1 parent 143ab9b
commit edef61b
Show file tree

Hide file tree

Showing 122 changed files with 200 additions and 187 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,12 +5,12 @@ edition = "2021"
 publish = false
 
 [dependencies.windows]
-path = "../../../libs/windows"
+workspace = true
 features = [
     "implement",
     "Win32_System_Com",
     "Win32_Networking_BackgroundIntelligentTransferService",
 ]
 
 [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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies.windows]
-path = "../../../libs/windows"
+workspace = true
 features = [
     "Win32_System_Com",
     "Win32_Globalization",