From cdb90d83feadc68ed4ea8fb33d1e944ab2679e0c Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Fri, 18 Aug 2023 08:24:09 -0500 Subject: [PATCH] 0.48.4 (#2613) --- .github/workflows/lib.yml | 2 +- crates/libs/core/Cargo.toml | 2 +- crates/libs/sys/Cargo.toml | 2 +- crates/libs/targets/Cargo.toml | 18 +++++++++--------- crates/libs/targets/src/lib.rs | 2 +- crates/libs/windows/Cargo.toml | 2 +- crates/targets/aarch64_gnullvm/Cargo.toml | 4 ++-- ...ibwindows.0.48.3.a => libwindows.0.48.4.a} | Bin crates/targets/aarch64_msvc/Cargo.toml | 4 ++-- ...{windows.0.48.3.lib => windows.0.48.4.lib} | Bin crates/targets/i686_gnu/Cargo.toml | 4 ++-- ...ibwindows.0.48.3.a => libwindows.0.48.4.a} | Bin crates/targets/i686_msvc/Cargo.toml | 4 ++-- ...{windows.0.48.3.lib => windows.0.48.4.lib} | Bin crates/targets/x86_64_gnu/Cargo.toml | 4 ++-- ...ibwindows.0.48.3.a => libwindows.0.48.4.a} | Bin crates/targets/x86_64_gnullvm/Cargo.toml | 4 ++-- ...ibwindows.0.48.3.a => libwindows.0.48.4.a} | Bin crates/targets/x86_64_msvc/Cargo.toml | 4 ++-- ...{windows.0.48.3.lib => windows.0.48.4.lib} | Bin crates/tests/targets/tests/files.rs | 14 +++++++------- crates/tools/gnu/Cargo.toml | 2 +- crates/tools/msvc/Cargo.toml | 2 +- 23 files changed, 37 insertions(+), 37 deletions(-) rename crates/targets/aarch64_gnullvm/lib/{libwindows.0.48.3.a => libwindows.0.48.4.a} (100%) rename crates/targets/aarch64_msvc/lib/{windows.0.48.3.lib => windows.0.48.4.lib} (100%) rename crates/targets/i686_gnu/lib/{libwindows.0.48.3.a => libwindows.0.48.4.a} (100%) rename crates/targets/i686_msvc/lib/{windows.0.48.3.lib => windows.0.48.4.lib} (100%) rename crates/targets/x86_64_gnu/lib/{libwindows.0.48.3.a => libwindows.0.48.4.a} (100%) rename crates/targets/x86_64_gnullvm/lib/{libwindows.0.48.3.a => libwindows.0.48.4.a} (100%) rename crates/targets/x86_64_msvc/lib/{windows.0.48.3.lib => windows.0.48.4.lib} (100%) diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml index dd9ad411cb..9e0de3ecc0 100644 --- a/.github/workflows/lib.yml +++ b/.github/workflows/lib.yml @@ -70,7 +70,7 @@ jobs: foreach($Test in $Tests) { $Target = $Test.Item1 $Magic = $Test.Item2 - $Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.48.3.lib) + $Output = [string](& $DumpbinPath /headers crates/targets/$Target/lib/windows.0.48.4.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/core/Cargo.toml b/crates/libs/core/Cargo.toml index 9a23a188d8..2c01b28990 100644 --- a/crates/libs/core/Cargo.toml +++ b/crates/libs/core/Cargo.toml @@ -16,7 +16,7 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies.windows-targets] -version = "0.48.3" +version = "0.48.4" path = "../targets" [features] diff --git a/crates/libs/sys/Cargo.toml b/crates/libs/sys/Cargo.toml index d77dccaef1..bc2c7320a8 100644 --- a/crates/libs/sys/Cargo.toml +++ b/crates/libs/sys/Cargo.toml @@ -17,7 +17,7 @@ targets = [] all-features = true [dependencies.windows-targets] -version = "0.48.3" +version = "0.48.4" path = "../targets" [features] diff --git a/crates/libs/targets/Cargo.toml b/crates/libs/targets/Cargo.toml index e7642e7453..f833356c76 100644 --- a/crates/libs/targets/Cargo.toml +++ b/crates/libs/targets/Cargo.toml @@ -1,31 +1,31 @@ [package] name = "windows-targets" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import libs for Windows" repository = "https://github.com/microsoft/windows-rs" readme = "../../../docs/readme.md" [target.'cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))'.dependencies] -windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.48.3" } +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.48.4" } [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.48.3" } +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.48.4" } [target.'cfg(all(target_arch = "aarch64", target_env = "msvc", not(windows_raw_dylib)))'.dependencies] -windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.48.3" } +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.48.4" } [target.'cfg(all(target_arch = "x86", target_env = "gnu", not(windows_raw_dylib)))'.dependencies] -windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.48.3" } +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.48.4" } [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.48.3" } +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.48.4" } [target.x86_64-pc-windows-gnullvm.dependencies] -windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.48.3" } +windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.48.4" } [target.aarch64-pc-windows-gnullvm.dependencies] -windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.48.3" } +windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.48.4" } diff --git a/crates/libs/targets/src/lib.rs b/crates/libs/targets/src/lib.rs index 1eeb39d5d5..84b0d7c8f4 100644 --- a/crates/libs/targets/src/lib.rs +++ b/crates/libs/targets/src/lib.rs @@ -34,7 +34,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.48.3")] + #[link(name = "windows.0.48.4")] extern $abi { $(#[$doc])? $(#[link_name=$link_name])? diff --git a/crates/libs/windows/Cargo.toml b/crates/libs/windows/Cargo.toml index e27f100ac6..a7d91695e4 100644 --- a/crates/libs/windows/Cargo.toml +++ b/crates/libs/windows/Cargo.toml @@ -19,7 +19,7 @@ rustc-args = ["--cfg", "docsrs"] [dependencies] windows-core = { path = "../core", version = "0.51.1" } -windows-targets = { path = "../targets", version = "0.48.3" } +windows-targets = { path = "../targets", version = "0.48.4" } windows-implement = { path = "../implement", version = "0.51.1", optional = true } windows-interface = { path = "../interface", version = "0.51.1", optional = true } diff --git a/crates/targets/aarch64_gnullvm/Cargo.toml b/crates/targets/aarch64_gnullvm/Cargo.toml index 19d8f940b9..5ea877d579 100644 --- a/crates/targets/aarch64_gnullvm/Cargo.toml +++ b/crates/targets/aarch64_gnullvm/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_aarch64_gnullvm" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/aarch64_gnullvm/lib/libwindows.0.48.3.a b/crates/targets/aarch64_gnullvm/lib/libwindows.0.48.4.a similarity index 100% rename from crates/targets/aarch64_gnullvm/lib/libwindows.0.48.3.a rename to crates/targets/aarch64_gnullvm/lib/libwindows.0.48.4.a diff --git a/crates/targets/aarch64_msvc/Cargo.toml b/crates/targets/aarch64_msvc/Cargo.toml index 7e28936a89..82df06e16f 100644 --- a/crates/targets/aarch64_msvc/Cargo.toml +++ b/crates/targets/aarch64_msvc/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_aarch64_msvc" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/aarch64_msvc/lib/windows.0.48.3.lib b/crates/targets/aarch64_msvc/lib/windows.0.48.4.lib similarity index 100% rename from crates/targets/aarch64_msvc/lib/windows.0.48.3.lib rename to crates/targets/aarch64_msvc/lib/windows.0.48.4.lib diff --git a/crates/targets/i686_gnu/Cargo.toml b/crates/targets/i686_gnu/Cargo.toml index 82c54bae2d..27aed41dd0 100644 --- a/crates/targets/i686_gnu/Cargo.toml +++ b/crates/targets/i686_gnu/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_i686_gnu" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/i686_gnu/lib/libwindows.0.48.3.a b/crates/targets/i686_gnu/lib/libwindows.0.48.4.a similarity index 100% rename from crates/targets/i686_gnu/lib/libwindows.0.48.3.a rename to crates/targets/i686_gnu/lib/libwindows.0.48.4.a diff --git a/crates/targets/i686_msvc/Cargo.toml b/crates/targets/i686_msvc/Cargo.toml index 4465f3a658..08dafdb3dd 100644 --- a/crates/targets/i686_msvc/Cargo.toml +++ b/crates/targets/i686_msvc/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_i686_msvc" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/i686_msvc/lib/windows.0.48.3.lib b/crates/targets/i686_msvc/lib/windows.0.48.4.lib similarity index 100% rename from crates/targets/i686_msvc/lib/windows.0.48.3.lib rename to crates/targets/i686_msvc/lib/windows.0.48.4.lib diff --git a/crates/targets/x86_64_gnu/Cargo.toml b/crates/targets/x86_64_gnu/Cargo.toml index 9aabbf51b0..db5add5d5d 100644 --- a/crates/targets/x86_64_gnu/Cargo.toml +++ b/crates/targets/x86_64_gnu/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_x86_64_gnu" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/x86_64_gnu/lib/libwindows.0.48.3.a b/crates/targets/x86_64_gnu/lib/libwindows.0.48.4.a similarity index 100% rename from crates/targets/x86_64_gnu/lib/libwindows.0.48.3.a rename to crates/targets/x86_64_gnu/lib/libwindows.0.48.4.a diff --git a/crates/targets/x86_64_gnullvm/Cargo.toml b/crates/targets/x86_64_gnullvm/Cargo.toml index 5dcce7f05c..904de51240 100644 --- a/crates/targets/x86_64_gnullvm/Cargo.toml +++ b/crates/targets/x86_64_gnullvm/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_x86_64_gnullvm" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/x86_64_gnullvm/lib/libwindows.0.48.3.a b/crates/targets/x86_64_gnullvm/lib/libwindows.0.48.4.a similarity index 100% rename from crates/targets/x86_64_gnullvm/lib/libwindows.0.48.3.a rename to crates/targets/x86_64_gnullvm/lib/libwindows.0.48.4.a diff --git a/crates/targets/x86_64_msvc/Cargo.toml b/crates/targets/x86_64_msvc/Cargo.toml index 33563a9cfa..c83b949b8e 100644 --- a/crates/targets/x86_64_msvc/Cargo.toml +++ b/crates/targets/x86_64_msvc/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "windows_x86_64_msvc" -version = "0.48.3" +version = "0.48.4" authors = ["Microsoft"] -edition = "2021" +edition = "2018" license = "MIT OR Apache-2.0" description = "Import lib for Windows" repository = "https://github.com/microsoft/windows-rs" diff --git a/crates/targets/x86_64_msvc/lib/windows.0.48.3.lib b/crates/targets/x86_64_msvc/lib/windows.0.48.4.lib similarity index 100% rename from crates/targets/x86_64_msvc/lib/windows.0.48.3.lib rename to crates/targets/x86_64_msvc/lib/windows.0.48.4.lib diff --git a/crates/tests/targets/tests/files.rs b/crates/tests/targets/tests/files.rs index 75d89cce87..0848166e87 100644 --- a/crates/tests/targets/tests/files.rs +++ b/crates/tests/targets/tests/files.rs @@ -3,11 +3,11 @@ #[test] fn test() { - std::include_bytes!("../../../targets/aarch64_gnullvm/lib/libwindows.0.48.3.a"); - std::include_bytes!("../../../targets/aarch64_msvc/lib/windows.0.48.3.lib"); - std::include_bytes!("../../../targets/i686_gnu/lib/libwindows.0.48.3.a"); - std::include_bytes!("../../../targets/i686_msvc/lib/windows.0.48.3.lib"); - std::include_bytes!("../../../targets/x86_64_gnu/lib/libwindows.0.48.3.a"); - std::include_bytes!("../../../targets/x86_64_gnullvm/lib/libwindows.0.48.3.a"); - std::include_bytes!("../../../targets/x86_64_msvc/lib/windows.0.48.3.lib"); + std::include_bytes!("../../../targets/aarch64_gnullvm/lib/libwindows.0.48.4.a"); + std::include_bytes!("../../../targets/aarch64_msvc/lib/windows.0.48.4.lib"); + std::include_bytes!("../../../targets/i686_gnu/lib/libwindows.0.48.4.a"); + std::include_bytes!("../../../targets/i686_msvc/lib/windows.0.48.4.lib"); + std::include_bytes!("../../../targets/x86_64_gnu/lib/libwindows.0.48.4.a"); + std::include_bytes!("../../../targets/x86_64_gnullvm/lib/libwindows.0.48.4.a"); + std::include_bytes!("../../../targets/x86_64_msvc/lib/windows.0.48.4.lib"); } diff --git a/crates/tools/gnu/Cargo.toml b/crates/tools/gnu/Cargo.toml index 71f0c8c5d1..b3771e6ed0 100644 --- a/crates/tools/gnu/Cargo.toml +++ b/crates/tools/gnu/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tool_gnu" -version = "0.48.3" +version = "0.48.4" edition = "2021" publish = false diff --git a/crates/tools/msvc/Cargo.toml b/crates/tools/msvc/Cargo.toml index 5bf32aae57..a4be40b73e 100644 --- a/crates/tools/msvc/Cargo.toml +++ b/crates/tools/msvc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tool_msvc" -version = "0.48.3" +version = "0.48.4" edition = "2021" publish = false