fix: Fixed MSI build version inconsistency (#684)

* fix: Fixed MSI build version inconsistency * chore: Added the change to the list * chore: Added WixAppVersion type * chore: run builder * chore: format error fixed
tauri-apps · Jan 20, 2024 · 0ae6017 · 0ae6017
1 parent d2b1e11
commit 0ae6017
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/.changes/fix-version-inconsistency.md b/.changes/fix-version-inconsistency.md
@@ -0,0 +1,5 @@
+---
+action: 'patch'
+---
+
+The action now correctly handles the wix version after the build of the app in case the version includes a `+` or `-` character.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/build.ts b/src/build.ts
@@ -59,6 +59,7 @@ export async function buildProject(
     name: info.name,
     version: info.version,
     wixLanguage: info.wixLanguage,
+    wixAppVersion: info.wixAppVersion,
     rpmRelease: info.rpmRelease,
   };
 
@@ -128,19 +129,19 @@ export async function buildProject(
       winArtifacts.push(
         join(
           artifactsPath,
-          `bundle/msi/${fileAppName}_${app.version}_${arch}_${lang}.msi`,
+          `bundle/msi/${fileAppName}_${app.wixAppVersion}_${arch}_${lang}.msi`,
         ),
       );
       winArtifacts.push(
         join(
           artifactsPath,
-          `bundle/msi/${fileAppName}_${app.version}_${arch}_${lang}.msi.zip`,
+          `bundle/msi/${fileAppName}_${app.wixAppVersion}_${arch}_${lang}.msi.zip`,
         ),
       );
       winArtifacts.push(
         join(
           artifactsPath,
-          `bundle/msi/${fileAppName}_${app.version}_${arch}_${lang}.msi.zip.sig`,
+          `bundle/msi/${fileAppName}_${app.wixAppVersion}_${arch}_${lang}.msi.zip.sig`,
         ),
       );
     });

diff --git a/src/types.d.ts b/src/types.d.ts
@@ -41,6 +41,7 @@ export interface Info {
   name: string;
   version: string;
   wixLanguage: string | string[] | { [language: string]: unknown };
+  wixAppVersion: string;
   rpmRelease: string;
 }
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -267,6 +267,7 @@ export function getInfo(
     let version;
     let wixLanguage: string | string[] | { [language: string]: unknown } =
       'en-US';
+    let wixAppVersion;
     let rpmRelease = '1';
 
     const config = getConfig(tauriDir);
@@ -300,6 +301,10 @@ export function getInfo(
       process.exit(1);
     }
 
+    if (version) {
+      wixAppVersion = version.replace(/[-+]/g, '.');
+    }
+
     if (config.tauri?.bundle?.rpm?.release) {
       rpmRelease = config.tauri?.bundle?.rpm?.release;
     }
@@ -309,6 +314,7 @@ export function getInfo(
       name,
       version,
       wixLanguage,
+      wixAppVersion,
       rpmRelease,
     };
   } else {