From a849f5e745991cd3c809bb70af3bde507418b805 Mon Sep 17 00:00:00 2001 From: chyyran Date: Mon, 26 Feb 2024 18:49:59 -0500 Subject: [PATCH] dep: unify on windows 0.52.0 --- Cargo.lock | 10 ++++++---- Cargo.toml | 3 +++ librashader-cache/Cargo.toml | 2 +- librashader-capi/Cargo.toml | 2 +- librashader-common/Cargo.toml | 2 +- librashader-runtime-d3d11/Cargo.toml | 2 +- librashader-runtime-d3d12/Cargo.toml | 2 +- librashader/Cargo.toml | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c08db1..69adb2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1482,7 +1482,7 @@ dependencies = [ "rayon", "wgpu", "wgpu-types", - "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -1506,7 +1506,7 @@ dependencies = [ "platform-dirs", "serde", "thiserror", - "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -1523,7 +1523,7 @@ dependencies = [ "rustc-hash", "sptr", "thiserror", - "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -1537,7 +1537,7 @@ dependencies = [ "num-traits", "rustc-hash", "wgpu-types", - "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -1621,6 +1621,7 @@ dependencies = [ "rayon", "thiserror", "windows 0.48.0", + "windows 0.52.0", ] [[package]] @@ -1644,6 +1645,7 @@ dependencies = [ "thiserror", "widestring", "windows 0.48.0", + "windows 0.52.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2bf778d..908ebcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,9 @@ members = [ "librashader-build-script"] resolver = "2" +[workspace.dependencies] +windows = "0.52.0" + [workspace.metadata.release] [profile.optimized] diff --git a/librashader-cache/Cargo.toml b/librashader-cache/Cargo.toml index 46df432..323937e 100644 --- a/librashader-cache/Cargo.toml +++ b/librashader-cache/Cargo.toml @@ -23,7 +23,7 @@ persy = "1.4.7" bytemuck = "1.13.0" [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +workspace = true features = [ "Win32_Graphics_Direct3D", "Win32_Graphics_Direct3D_Fxc", diff --git a/librashader-capi/Cargo.toml b/librashader-capi/Cargo.toml index b2c13b8..61e6f35 100644 --- a/librashader-capi/Cargo.toml +++ b/librashader-capi/Cargo.toml @@ -45,7 +45,7 @@ default-features = false features = ["reflect", "presets", "preprocess"] [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +workspace = true optional = true [target.'cfg(target_vendor="apple")'.dependencies] diff --git a/librashader-common/Cargo.toml b/librashader-common/Cargo.toml index c97b01e..12cbead 100644 --- a/librashader-common/Cargo.toml +++ b/librashader-common/Cargo.toml @@ -31,7 +31,7 @@ halfbrown = "0.2.4" [target.'cfg(windows)'.dependencies.windows] optional = true -version = "0.48.0" +workspace = true features = [ "Win32_Foundation", "Win32_Graphics_Dxgi_Common", diff --git a/librashader-runtime-d3d11/Cargo.toml b/librashader-runtime-d3d11/Cargo.toml index 5182db9..d900665 100644 --- a/librashader-runtime-d3d11/Cargo.toml +++ b/librashader-runtime-d3d11/Cargo.toml @@ -25,7 +25,7 @@ rayon = "1.6.1" array-concat = "0.5.2" [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +workspace = true features = [ "Win32_Foundation", "Win32_Graphics_Dxgi_Common", diff --git a/librashader-runtime-d3d12/Cargo.toml b/librashader-runtime-d3d12/Cargo.toml index 623b62b..d8c9390 100644 --- a/librashader-runtime-d3d12/Cargo.toml +++ b/librashader-runtime-d3d12/Cargo.toml @@ -32,7 +32,7 @@ mach-siegbert-vogt-dxcsa = "0.1.3" rayon = "1.6.1" [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +workspace = true features = [ "Win32_Foundation", "Win32_Graphics_Dxgi_Common", diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml index 1dfdb45..4d6cac9 100644 --- a/librashader/Cargo.toml +++ b/librashader/Cargo.toml @@ -34,7 +34,7 @@ librashader-runtime-wgpu = { path = "../librashader-runtime-wgpu", version = "0. wgpu-types = { version = "0.19", optional = true } [target.'cfg(windows)'.dependencies.windows] -version = "0.48.0" +workspace = true optional = true [target.'cfg(target_vendor="apple")'.dependencies]