Merge pull request #7 from clFaster/feature/make-pri-support

Feature/make pri support

Author: Choochmeque

README.md

@@ -17,7 +17,8 @@ A Rust library and CLI tool for building and signing Windows MSIX packages and M
 
 - **Multi-architecture support**: Build separate MSIX packages for x64 and ARM64 architectures
 - **Automatic bundle creation**: Combine per-architecture packages into a single `.msixbundle`
-- **SDK auto-discovery**: Automatically locate Windows SDK tools (`MakeAppx.exe`, `signtool.exe`, `appcert.exe`) via registry
+- **SDK auto-discovery**: Automatically locate Windows SDK tools (`MakeAppx.exe`, `makepri.exe`, `signtool.exe`, `appcert.exe`) via registry
+- **Resource indexing**: Optionally generate `resources.pri` with `makepri.exe` for qualified assets
 - **Code signing**: Sign packages and bundles with PFX certificates
 - **Timestamping**: Support for both RFC3161 and Authenticode timestamp protocols
 - **Validation**: Validate packages using Windows App Certification Kit (WACK) and verify signatures
@@ -26,7 +27,7 @@ A Rust library and CLI tool for building and signing Windows MSIX packages and M
 ## Requirements
 
 - **Windows OS**: This tool requires Windows and the Windows SDK
-- **Windows SDK 10**: MakeAppx.exe and signtool.exe must be installed
+- **Windows SDK 10**: MakeAppx.exe, MakePri.exe and signtool.exe must be installed
   - Install via [Visual Studio](https://visualstudio.microsoft.com/) or [standalone SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
 - **Windows App Certification Kit (WACK)**: Required for validation (appcert.exe)
   - Installed automatically with the Windows SDK
@@ -84,11 +85,12 @@ msixbundle-rs/
 ## How It Works
 
 1. **Manifest Parsing**: Reads `AppxManifest.xml` from each architecture directory to extract version and identity information
-2. **Package Creation**: Uses `MakeAppx.exe` to create `.msix` files for each architecture
-3. **Bundle Mapping**: Generates a `bundlemap.txt` file listing all architecture packages
-4. **Bundle Creation**: Uses `MakeAppx.exe` to combine packages into a `.msixbundle`
-5. **Signing**: Uses `signtool.exe` to apply digital signatures with optional timestamping
-6. **Validation**: Optionally validates packages with WACK and verifies signature validity
+2. **Resource Indexing (optional)**: Uses `makepri.exe` to generate `resources.pri`
+3. **Package Creation**: Uses `MakeAppx.exe` to create `.msix` files for each architecture
+4. **Bundle Mapping**: Generates a `bundlemap.txt` file listing all architecture packages
+5. **Bundle Creation**: Uses `MakeAppx.exe` to combine packages into a `.msixbundle`
+6. **Signing**: Uses `signtool.exe` to apply digital signatures with optional timestamping
+7. **Validation**: Optionally validates packages with WACK and verifies signature validity
 
 ## Contributing
 

msixbundle-cli/README.md

@@ -72,6 +72,19 @@ msixbundle-cli \
   --pfx-password "secret"
 ```
 
+### Generate resources.pri with MakePri
+
+Generate `resources.pri` before packing (useful for scale-qualified assets such as `SquareLogo.scale-200.png`):
+
+```bash
+msixbundle-cli \
+  --out-dir ./output \
+  --dir-x64 ./build/x64/AppxContent \
+  --makepri \
+  --makepri-default-language en-us \
+  --makepri-target-os-version 10.0.0
+```
+
 ### With Validation and Verification
 
 ```bash
@@ -102,6 +115,11 @@ msixbundle-cli \
 | `--sip-dll` | Path to Appx SIP DLL (e.g., `C:\Windows\System32\AppxSip.dll`) |
 | `--timestamp-url` | Timestamp server URL (default: `http://timestamp.digicert.com`) |
 | `--timestamp-mode` | Timestamping protocol: `rfc3161` or `authenticode` (default: `rfc3161`) |
+| `--makepri` | Generate `resources.pri` with MakePri before packing |
+| `--makepri-path` | Override path to `makepri.exe` |
+| `--makepri-default-language` | Default language qualifier for MakePri (example: `en-us`) |
+| `--makepri-target-os-version` | MakePri `/pv` target OS version (example: `10.0.0`) |
+| `--makepri-keep-config` | Keep generated `priconfig.xml` files |
 | `--validate` | Validate packages using WACK (Windows App Certification Kit) |
 | `--verify` | Verify signatures with SignTool after signing |
 | `--verbose` | Enable verbose logging (sets `RUST_LOG=info`) |
@@ -157,6 +175,7 @@ openssl pkcs12 -export -out test-certificate.pfx -inkey private.key -in certific
 
 - Windows OS with Windows SDK 10 installed
 - MakeAppx.exe and signtool.exe
+- makepri.exe (optional, required only with `--makepri`)
 - WACK (appcert.exe) for `--validate` option
 
 ## License

msixbundle-cli/src/main.rs

@@ -61,6 +61,26 @@ struct Args {
     #[arg(long, value_parser = ["rfc3161","authenticode"], default_value = "rfc3161")]
     timestamp_mode: String,
 
+    /// Generate resources.pri with MakePri before packing
+    #[arg(long)]
+    makepri: bool,
+
+    /// Override makepri.exe path
+    #[arg(long, requires = "makepri")]
+    makepri_path: Option<PathBuf>,
+
+    /// Default resource language for MakePri (for example: en-us)
+    #[arg(long, default_value = "en-us", requires = "makepri")]
+    makepri_default_language: String,
+
+    /// Target OS version for MakePri /pv (for example: 10.0.0)
+    #[arg(long, default_value = "10.0.0", requires = "makepri")]
+    makepri_target_os_version: String,
+
+    /// Keep generated priconfig.xml after MakePri
+    #[arg(long, requires = "makepri")]
+    makepri_keep_config: bool,
+
     /// Validate packages with MakeAppx after build
     #[arg(long)]
     validate: bool,
@@ -106,6 +126,9 @@ fn main() -> Result<()> {
     if let Some(p) = &a.signtool_path {
         tools.signtool = Some(p.clone());
     }
+    if let Some(p) = &a.makepri_path {
+        tools.makepri = Some(p.clone());
+    }
 
     // Pack per-arch
     let mut built: Vec<(String, PathBuf)> = Vec::new();
@@ -114,6 +137,20 @@ fn main() -> Result<()> {
     if let Some(dir) = &a.dir_x64 {
         let dir = resolve_path(dir)?;
         let m = read_manifest_info(&dir)?;
+        if a.makepri {
+            let pri = compile_resources_pri(
+                &tools,
+                &PriOptions {
+                    appx_content_dir: &dir,
+                    default_language: a.makepri_default_language.as_str(),
+                    target_os_version: a.makepri_target_os_version.as_str(),
+                    keep_priconfig: a.makepri_keep_config,
+                    overwrite: a.force,
+                    makepri_override: None,
+                },
+            )?;
+            info!("x64 PRI: {}", pri.display());
+        }
         info = Some(m.clone());
         info!("x64: {}", dir.display());
         let msix = pack_arch(&tools, &dir, &out_dir, &m, "x64", a.force)?;
@@ -134,6 +171,20 @@ fn main() -> Result<()> {
         } else {
             info = Some(m.clone());
         }
+        if a.makepri {
+            let pri = compile_resources_pri(
+                &tools,
+                &PriOptions {
+                    appx_content_dir: &dir,
+                    default_language: a.makepri_default_language.as_str(),
+                    target_os_version: a.makepri_target_os_version.as_str(),
+                    keep_priconfig: a.makepri_keep_config,
+                    overwrite: a.force,
+                    makepri_override: None,
+                },
+            )?;
+            info!("arm64 PRI: {}", pri.display());
+        }
         info!("arm64: {}", dir.display());
         let msix = pack_arch(&tools, &dir, &out_dir, &m, "arm64", a.force)?;
         built.push(("arm64".into(), msix));

msixbundle/README.md

@@ -14,6 +14,7 @@ msixbundle = "1.0"
 - **SDK auto-discovery**: Automatically locate Windows SDK tools via registry
 - **Manifest parsing**: Extract version and display name from `AppxManifest.xml`
 - **Package creation**: Create `.msix` files for each architecture
+- **Resource indexing**: Generate `resources.pri` with MakePri.exe
 - **Bundle creation**: Combine multiple `.msix` files into a `.msixbundle`
 - **Code signing**: Sign packages and bundles with PFX certificates or certificate store thumbprints
 - **Timestamping**: Support for RFC3161 and Authenticode protocols
@@ -25,6 +26,7 @@ msixbundle = "1.0"
 |----------|-------------|
 | `locate_sdk_tools()` | Find Windows SDK tools on the system |
 | `read_manifest_info()` | Parse AppxManifest.xml for version and identity |
+| `compile_resources_pri()` | Generate `resources.pri` for qualified asset resolution |
 | `pack_arch()` | Create a per-architecture .msix package |
 | `build_bundle()` | Combine multiple .msix files into a .msixbundle |
 | `sign_artifact()` | Sign packages/bundles with a PFX or certificate thumbprint |
@@ -46,6 +48,16 @@ fn main() -> anyhow::Result<()> {
     let manifest = read_manifest_info(x64_dir)?;
     println!("Building {} v{}", manifest.display_name, manifest.version);
 
+    // Optional: generate resources.pri for scale-qualified assets
+    compile_resources_pri(&tools, &PriOptions {
+        appx_content_dir: x64_dir,
+        default_language: "en-us",
+        target_os_version: "10.0.0",
+        keep_priconfig: false,
+        overwrite: true,
+        makepri_override: None,
+    })?;
+
     // Pack architectures (last param: overwrite existing files)
     let out_dir = Path::new("./output");
     let x64_msix = pack_arch(&tools, x64_dir, out_dir, &manifest, "x64", true)?;
@@ -127,7 +139,9 @@ The library uses `anyhow::Result` for error handling and provides custom error t
 ## Requirements
 
 - Windows OS with Windows SDK 10 installed
-- MakeAppx.exe, signtool.exe, and appcert.exe (for validation)
+- MakeAppx.exe and signtool.exe
+- makepri.exe (optional, required for `compile_resources_pri()`)
+- appcert.exe (optional, required for validation)
 
 ## License