Add xtask_version information to the json

Author: mveril

wslpluginapi-sys/build.rs

@@ -14,7 +14,7 @@ use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
 pub struct Metadata {
-    pub version: String,
+    pub header_version: String,
     pub output_file_path: String,
 }
 
@@ -78,10 +78,10 @@ fn main() -> anyhow::Result<()> {
         let json: Metadata = serde_json::from_reader(file).unwrap();
         json
     };
-    if json_metadata.version != expected_nuget_version {
+    if json_metadata.header_version != expected_nuget_version {
         panic!(
             "Version mismatch: metadata.json version '{}' does not match package metadata '{}'",
-            &json_metadata.version, expected_nuget_version
+            &json_metadata.header_version, expected_nuget_version
         );
     }
     let output_full_path = build.join(json_metadata.output_file_path);

wslpluginapi-sys/build/checksum.sha256

@@ -1,2 +1,2 @@
-c87c896e76f7467ba7ada0849096a07782aa791dca622c8068b16d257297acf9  metadata.json
+896ecb0b3b7e6467e6f4cda3b00201473ed7b7face1a31081671bc32b9e679d3  metadata.json
 b8f7209005250c821184da6a11eefc40a84bfc9d44a34cb9bbd1fc302d62e4b4  WslPluginApi.rs

wslpluginapi-sys/build/metadata.json

@@ -1,6 +1,7 @@
 {
   "id": "Microsoft.WSL.PluginApi",
-  "version": "2.4.4",
+  "xtask_version": "0.1.0-rc.1+2.4.4",
+  "header_version": "2.4.4",
   "header_file_path": "build\\native\\include\\WslPluginApi.h",
   "output_file_path": "WslPluginApi.rs",
   "bindgen": {

xtask/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
+version.workspace = true
 name = "xtask"
-version = "0.1.0"
 edition = "2024"
 publish = false
 

xtask/src/metadata.rs

@@ -4,31 +4,33 @@ use std::io::Write;
 #[derive(Serialize, Debug)]
 pub struct Metadata {
     pub id: String,
-    pub version: String,
+    pub xtask_version: String,
+    pub header_version: String,
     pub header_file_path: String,
     pub output_file_path: String,
     pub bindgen: BindgenMetadata,
 }
 
 impl Metadata {
-    pub fn new<Id, Ver, Header, Output, Target>(
+    pub fn new<Id, HVer, Header, Output, Target>(
         id: Id,
-        version: Ver,
+        header_version: HVer,
         header_file_path: Header,
         output_file_path: Output,
         custom_llvm_target: Option<Target>,
     ) -> Self
     where
         Id: Into<String>,
-        Ver: Into<String>,
+        HVer: Into<String>,
         Header: Into<String>,
         Output: Into<String>,
         Target: Into<String>,
     {
         let custom_llvm_target = custom_llvm_target.map(|t| t.into());
         Self {
             id: id.into(),
-            version: version.into(),
+            xtask_version: env!("CARGO_PKG_VERSION").into(),
+            header_version: header_version.into(),
             header_file_path: header_file_path.into(),
             output_file_path: output_file_path.into(),
             bindgen: BindgenMetadata::new(custom_llvm_target),