Skip to content

Commit 8fd448b

Browse files
authored
Fix windows-targets semver linker path compatibility (#2870)
1 parent c5511e7 commit 8fd448b

File tree

20 files changed

+29
-27
lines changed

20 files changed

+29
-27
lines changed

.github/workflows/lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
foreach($Test in $Tests) {
7373
$Target = $Test.Item1
7474
$Magic = $Test.Item2
75-
$Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.52.1.lib)
75+
$Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.52.0.lib)
7676
if($Output -match "Machine\s*: $Magic" -ne $True) {
7777
Write-Error "Import lib check failed for $Target ($Magic)."
7878
Exit 1

crates/libs/targets/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[package]
33
name = "windows-targets"
4-
version = "0.52.2"
4+
version = "0.52.3"
55
authors = ["Microsoft"]
66
edition = "2021"
77
rust-version = "1.60"
@@ -14,22 +14,22 @@ readme = "readme.md"
1414
workspace = true
1515

1616
[target.'cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
17-
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.1" }
17+
windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.3" }
1818

1919
[target.'cfg(all(target_arch = "x86_64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
20-
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.1" }
20+
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.52.3" }
2121

2222
[target.'cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
23-
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.1" }
23+
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.52.3" }
2424

2525
[target.'cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))'.dependencies]
26-
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.1" }
26+
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.52.3" }
2727

2828
[target.'cfg(all(target_arch = "x86_64", target_env = "gnu", not(target_abi = "llvm"), not(windows_raw_dylib)))'.dependencies]
29-
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.1" }
29+
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.52.3" }
3030

3131
[target.x86_64-pc-windows-gnullvm.dependencies]
32-
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.1" }
32+
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.52.3" }
3333

3434
[target.aarch64-pc-windows-gnullvm.dependencies]
35-
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.1" }
35+
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.52.3" }

crates/libs/targets/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ macro_rules! link {
3535
#[macro_export]
3636
macro_rules! link {
3737
($library:literal $abi:literal $($link_name:literal)? $(#[$doc:meta])? fn $($function:tt)*) => (
38-
#[link(name = "windows.0.52.1")]
38+
#[link(name = "windows.0.52.0")]
3939
extern $abi {
4040
$(#[link_name=$link_name])?
4141
pub fn $($function)*;

crates/targets/aarch64_gnullvm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "windows_aarch64_gnullvm"
3-
version = "0.52.1"
3+
version = "0.52.3"
44
authors = ["Microsoft"]
55
edition = "2021"
66
rust-version = "1.60"

crates/targets/aarch64_gnullvm/lib/libwindows.0.52.1.a renamed to crates/targets/aarch64_gnullvm/lib/libwindows.0.52.0.a

File renamed without changes.

crates/targets/aarch64_msvc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "windows_aarch64_msvc"
3-
version = "0.52.1"
3+
version = "0.52.3"
44
authors = ["Microsoft"]
55
edition = "2021"
66
rust-version = "1.60"
File renamed without changes.

crates/targets/i686_gnu/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "windows_i686_gnu"
3-
version = "0.52.1"
3+
version = "0.52.3"
44
authors = ["Microsoft"]
55
edition = "2021"
66
rust-version = "1.60"
File renamed without changes.

crates/targets/i686_msvc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "windows_i686_msvc"
3-
version = "0.52.1"
3+
version = "0.52.3"
44
authors = ["Microsoft"]
55
edition = "2021"
66
rust-version = "1.60"

0 commit comments

Comments
 (0)