From bfaa4fa5456f270e9eea985f6da36cb9715a4739 Mon Sep 17 00:00:00 2001
From: Kyle Sabo <kysabo@microsoft.com>
Date: Fri, 16 May 2025 15:21:53 -0700
Subject: [PATCH] Fix linker issues with Rust 1.87

---
 etw/rust/tracelogging/Cargo.toml               | 2 +-
 etw/rust/tracelogging/src/changelog.rs         | 4 ++++
 etw/rust/tracelogging/src/native.rs            | 2 ++
 etw/rust/tracelogging_dynamic/Cargo.toml       | 4 ++--
 etw/rust/tracelogging_dynamic/src/changelog.rs | 4 ++++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/etw/rust/tracelogging/Cargo.toml b/etw/rust/tracelogging/Cargo.toml
index 0b31b51..df0e1a2 100644
--- a/etw/rust/tracelogging/Cargo.toml
+++ b/etw/rust/tracelogging/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tracelogging"
-version = "1.2.3"
+version = "1.2.4"
 edition = "2021"
 authors = ["Microsoft"]
 license = "MIT"
diff --git a/etw/rust/tracelogging/src/changelog.rs b/etw/rust/tracelogging/src/changelog.rs
index 2ed6e6a..5f66801 100644
--- a/etw/rust/tracelogging/src/changelog.rs
+++ b/etw/rust/tracelogging/src/changelog.rs
@@ -3,6 +3,10 @@
 #[allow(unused_imports)]
 use crate::*; // For docs
 
+/// # v1.2.4 (2025-05-16)
+/// - Fix linker issues when building with rustc 1.87
+pub mod v1_2_4 {}
+
 /// # v1.2.3 (2025-03-02)
 /// - Fix newer warnings about unsafe code
 /// - Update `tracelongging-macros` dependency to 1.2.1
diff --git a/etw/rust/tracelogging/src/native.rs b/etw/rust/tracelogging/src/native.rs
index b2434db..be588d1 100644
--- a/etw/rust/tracelogging/src/native.rs
+++ b/etw/rust/tracelogging/src/native.rs
@@ -436,6 +436,7 @@ impl ProviderContextInner {
 }
 
 #[cfg(all(windows, feature = "etw", not(feature = "kernel_mode")))]
+#[link(name="OneCore_apiset")]
 extern "system" {
     fn EventUnregister(reg_handle: u64) -> u32;
     fn EventRegister(
@@ -444,6 +445,7 @@ extern "system" {
         outer_context: usize,
         reg_handle: &mut u64,
     ) -> u32;
+
     fn EventSetInformation(
         reg_handle: u64,
         information_class: u32,
diff --git a/etw/rust/tracelogging_dynamic/Cargo.toml b/etw/rust/tracelogging_dynamic/Cargo.toml
index 0b975c1..c5ba7de 100644
--- a/etw/rust/tracelogging_dynamic/Cargo.toml
+++ b/etw/rust/tracelogging_dynamic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tracelogging_dynamic"
-version = "1.2.3"
+version = "1.2.4"
 edition = "2021"
 authors = ["Microsoft"]
 license = "MIT"
@@ -28,4 +28,4 @@ default = ["etw"]
 etw = ["tracelogging/etw"] # Logging is enabled if windows && etw.
 
 [dependencies]
-tracelogging = { default-features = false, version = "= 1.2.3", path = "../tracelogging" }
+tracelogging = { default-features = false, version = "= 1.2.4", path = "../tracelogging" }
diff --git a/etw/rust/tracelogging_dynamic/src/changelog.rs b/etw/rust/tracelogging_dynamic/src/changelog.rs
index 4143787..a6037de 100644
--- a/etw/rust/tracelogging_dynamic/src/changelog.rs
+++ b/etw/rust/tracelogging_dynamic/src/changelog.rs
@@ -3,6 +3,10 @@
 #[allow(unused_imports)]
 use crate::*; // For docs
 
+/// # v1.2.4 (2025-05-16)
+/// - Fix linker issues when building with rustc 1.87
+pub mod v1_2_4 {}
+
 /// # v1.2.3 (2025-03-02)
 /// - Fix newer warnings about unsafe code
 /// - Update `tracelongging` dependency to 1.2.3