Merge branch 'main' into bump-to-v18

Azure · Jan 8, 2025 · 03e3737 · 03e3737
2 parents d464150 + 991886c
commit 03e3737
Show file tree

Hide file tree

Showing 36 changed files with 40,312 additions and 38,056 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,11 @@ add_custom_target(run_rust_sample_client
 
 # clean generated code
 add_custom_target(force_clean
-    COMMAND ${CMAKE_COMMAND} -E rm -rf crates/libs/com/src/Microsoft
+    # temporary code to remove only generated code. Will be cleaned up when new bindgen is used.
+    COMMAND ${CMAKE_COMMAND} -E rm -rf crates/libs/com/src/Microsoft/ServiceFabric/FabricClient
+    COMMAND ${CMAKE_COMMAND} -E rm -rf crates/libs/com/src/Microsoft/ServiceFabric/FabricCommon
+    COMMAND ${CMAKE_COMMAND} -E rm -rf crates/libs/com/src/Microsoft/ServiceFabric/FabricRuntime
+    COMMAND ${CMAKE_COMMAND} -E rm -rf crates/libs/com/src/Microsoft/ServiceFabric/FabricTypes
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,9 @@ tracing-subscriber = { version = "0.3",  default-features = false, features = ["
 tokio-util = "0.7"
 ctrlc = { version = "3.0", features = ["termination"] }
 tokio = { version = "1", features = ["full"] }
-windows = {version = "0.58", features = ["implement"]}
-windows-core = "0.58"
+windows = {version = "0.59", features = ["implement"]}
+windows-core = "0.59"
+windows-bindgen = "0.59"
 trait-variant = "0.1"
 serde = "*"
 serde_derive = "*"

diff --git a/crates/libs/com/Cargo.toml b/crates/libs/com/Cargo.toml
@@ -25,4 +25,11 @@ version = "0.0.18"
 
 [features]
 default = ["bundled_libs"]
-bundled_libs = []
+bundled_libs = []
+Foundation = []
+# generated features
+ServiceFabric = ["Foundation"]
+ServiceFabric_FabricClient = ["ServiceFabric"]
+ServiceFabric_FabricCommon = ["ServiceFabric"]
+ServiceFabric_FabricRuntime = ["ServiceFabric"]
+ServiceFabric_FabricTypes = ["ServiceFabric"]