fix(appx): add check application id test and fix detect null application

electron-userland · May 8, 2024 · db876e0 · db876e0
1 parent 8a67540
commit db876e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/packages/app-builder-lib/src/targets/AppxTarget.ts b/packages/app-builder-lib/src/targets/AppxTarget.ts
@@ -235,7 +235,7 @@ export default class AppXTarget extends Target {
           } else if (restrictedApplicationIdValues.includes(result.toUpperCase())) {
             const message = `AppX Application.Id cannot be some values`
             throw new InvalidConfigurationError(message)
-          } else if (options.applicationId == null) {
+          } else if (result == null || options.applicationId == null) {
             const message = `Please set appx.applicationId (or correct appx.identityName or name)`
             throw new InvalidConfigurationError(message)
           }

diff --git a/test/src/windows/appxTest.ts b/test/src/windows/appxTest.ts
@@ -15,11 +15,6 @@ it.ifDevOrWinCi(
   app(
     {
       targets: Platform.WINDOWS.createTarget(["appx"], Arch.x64),
-	  config: {
-        appx: {
-          applicationId: "01234Test.ApplicationDataSample",
-		  },
-		},
     },
     {
       projectDirCreated: async projectDir => {
@@ -39,7 +34,6 @@ it.ifDevOrWinCi(
       targets: Platform.WINDOWS.createTarget(["appx"], Arch.x64),
       config: {
         appx: {
-          applicationId: "01234Test.ApplicationDataSample",
           addAutoLaunchExtension: true,
         },
       },
@@ -48,6 +42,21 @@ it.ifDevOrWinCi(
   )
 )
 
+it.ifDevOrWinCi(
+  "application id",
+  app(
+    {
+      targets: Platform.WINDOWS.createTarget(["appx"], Arch.x64),
+      config: {
+        appx: {
+          applicationId: "01234Test.ApplicationDataSample",
+        },
+      },
+    },
+    {}
+  )
+)
+
 const it2 = isEnvTrue(process.env.DO_APPX_CERT_STORE_AWARE_TEST) ? test : test.skip
 it2.ifNotCi(
   "certificateSubjectName",
@@ -70,7 +79,6 @@ it(
       cscLink: protectedCscLink,
       cscKeyPassword: "test",
       appx: {
-        applicationId: "01234Test.ApplicationDataSample",
         languages: ["de-DE", "ru-RU"],
         minVersion: "10.0.16299.0",
         maxVersionTested: "10.0.16299.0",