Fix windows-targets semver linker path compatibility (#2870)

microsoft · Feb 22, 2024 · 8fd448b · 8fd448b
1 parent c5511e7
commit 8fd448b
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml
@@ -72,7 +72,7 @@ jobs:
           foreach($Test in $Tests) {
             $Target = $Test.Item1
             $Magic = $Test.Item2
-            $Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.52.1.lib)
+            $Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.52.0.lib)
             if($Output -match "Machine\s*: $Magic" -ne $True) {
               Write-Error "Import lib check failed for $Target ($Magic)."
               Exit 1

diff --git a/crates/libs/targets/Cargo.toml b/crates/libs/targets/Cargo.toml
@@ -1,7 +1,7 @@
 
 [package]
 name = "windows-targets"
-version = "0.52.2"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"
@@ -14,22 +14,22 @@ readme = "readme.md"
 workspace = true
 
 [target.'cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
-windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.1" }
+windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.3" }
 
 [target.'cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
-windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.1" }
+windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.3" }
 
 [target.'cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
-windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.1" }
+windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.3" }
 
 [target.'cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))'.dependencies]
-windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.1" }
+windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.3" }
 
 [target.'cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))'.dependencies]
-windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.1" }
+windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.3" }
 
 [target.x86_64-pc-windows-gnullvm.dependencies]
-windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.1" }
+windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.3" }
 
 [target.aarch64-pc-windows-gnullvm.dependencies]
-windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.1" }
+windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.3" }
diff --git a/crates/libs/targets/src/lib.rs b/crates/libs/targets/src/lib.rs
@@ -35,7 +35,7 @@ macro_rules! link {
 #[macro_export]
 macro_rules! link {
     ($library:literal $abi:literal $($link_name:literal)? $(#[$doc:meta])? fn $($function:tt)*) => (
-        #[link(name = "windows.0.52.1")]
+        #[link(name = "windows.0.52.0")]
         extern $abi {
             $(#[link_name=$link_name])?
             pub fn $($function)*;

diff --git a/crates/targets/aarch64_gnullvm/Cargo.toml b/crates/targets/aarch64_gnullvm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_aarch64_gnullvm"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/...s/aarch64_gnullvm/lib/libwindows.0.52.1.a → ...s/aarch64_gnullvm/lib/libwindows.0.52.0.a b/...s/aarch64_gnullvm/lib/libwindows.0.52.1.a → ...s/aarch64_gnullvm/lib/libwindows.0.52.0.a
diff --git a/crates/targets/aarch64_msvc/Cargo.toml b/crates/targets/aarch64_msvc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_aarch64_msvc"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/...rgets/aarch64_msvc/lib/windows.0.52.1.lib → ...rgets/aarch64_msvc/lib/windows.0.52.0.lib b/...rgets/aarch64_msvc/lib/windows.0.52.1.lib → ...rgets/aarch64_msvc/lib/windows.0.52.0.lib
diff --git a/crates/targets/i686_gnu/Cargo.toml b/crates/targets/i686_gnu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_i686_gnu"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/.../targets/i686_gnu/lib/libwindows.0.52.1.a → .../targets/i686_gnu/lib/libwindows.0.52.0.a b/.../targets/i686_gnu/lib/libwindows.0.52.1.a → .../targets/i686_gnu/lib/libwindows.0.52.0.a
diff --git a/crates/targets/i686_msvc/Cargo.toml b/crates/targets/i686_msvc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_i686_msvc"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/.../targets/i686_msvc/lib/windows.0.52.1.lib → .../targets/i686_msvc/lib/windows.0.52.0.lib b/.../targets/i686_msvc/lib/windows.0.52.1.lib → .../targets/i686_msvc/lib/windows.0.52.0.lib
diff --git a/crates/targets/x86_64_gnu/Cargo.toml b/crates/targets/x86_64_gnu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_x86_64_gnu"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/...argets/x86_64_gnu/lib/libwindows.0.52.1.a → ...argets/x86_64_gnu/lib/libwindows.0.52.0.a b/...argets/x86_64_gnu/lib/libwindows.0.52.1.a → ...argets/x86_64_gnu/lib/libwindows.0.52.0.a
diff --git a/crates/targets/x86_64_gnullvm/Cargo.toml b/crates/targets/x86_64_gnullvm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_x86_64_gnullvm"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/...ts/x86_64_gnullvm/lib/libwindows.0.52.1.a → ...ts/x86_64_gnullvm/lib/libwindows.0.52.0.a b/...ts/x86_64_gnullvm/lib/libwindows.0.52.1.a → ...ts/x86_64_gnullvm/lib/libwindows.0.52.0.a
diff --git a/crates/targets/x86_64_msvc/Cargo.toml b/crates/targets/x86_64_msvc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windows_x86_64_msvc"
-version = "0.52.1"
+version = "0.52.3"
 authors = ["Microsoft"]
 edition = "2021"
 rust-version = "1.60"

diff --git a/...argets/x86_64_msvc/lib/windows.0.52.1.lib → ...argets/x86_64_msvc/lib/windows.0.52.0.lib b/...argets/x86_64_msvc/lib/windows.0.52.1.lib → ...argets/x86_64_msvc/lib/windows.0.52.0.lib
diff --git a/crates/tests/targets/tests/files.rs b/crates/tests/targets/tests/files.rs
@@ -5,13 +5,15 @@
 fn test() {
     let targets = tool_lib::crates("../../targets");
     assert_eq!(7, targets.len());
-    assert!(targets.iter().all(|(_, version)| version == "0.52.1"));
+    assert!(targets.iter().all(|(_, version)| version == "0.52.3"));
 
-    std::include_bytes!("../../../targets/aarch64_gnullvm/lib/libwindows.0.52.1.a");
-    std::include_bytes!("../../../targets/aarch64_msvc/lib/windows.0.52.1.lib");
-    std::include_bytes!("../../../targets/i686_gnu/lib/libwindows.0.52.1.a");
-    std::include_bytes!("../../../targets/i686_msvc/lib/windows.0.52.1.lib");
-    std::include_bytes!("../../../targets/x86_64_gnu/lib/libwindows.0.52.1.a");
-    std::include_bytes!("../../../targets/x86_64_gnullvm/lib/libwindows.0.52.1.a");
-    std::include_bytes!("../../../targets/x86_64_msvc/lib/windows.0.52.1.lib");
+    // The lib names can't change for minor (semver) updates as that breaks linker search.
+    // https://github.com/microsoft/windows-rs/issues/2869
+    std::include_bytes!("../../../targets/aarch64_gnullvm/lib/libwindows.0.52.0.a");
+    std::include_bytes!("../../../targets/aarch64_msvc/lib/windows.0.52.0.lib");
+    std::include_bytes!("../../../targets/i686_gnu/lib/libwindows.0.52.0.a");
+    std::include_bytes!("../../../targets/i686_msvc/lib/windows.0.52.0.lib");
+    std::include_bytes!("../../../targets/x86_64_gnu/lib/libwindows.0.52.0.a");
+    std::include_bytes!("../../../targets/x86_64_gnullvm/lib/libwindows.0.52.0.a");
+    std::include_bytes!("../../../targets/x86_64_msvc/lib/windows.0.52.0.lib");
 }
diff --git a/crates/tools/gnu/Cargo.toml b/crates/tools/gnu/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tool_gnu"
-version = "0.52.1"
+version = "0.52.0"
 edition = "2021"
 publish = false
 

diff --git a/crates/tools/msvc/Cargo.toml b/crates/tools/msvc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tool_msvc"
-version = "0.52.1"
+version = "0.52.0"
 edition = "2021"
 publish = false