Update Windows SDK version to 10.0.2004 and install additional featur…

…es for building on Windows
Thavarshan · Aug 31, 2024 · 7ea589a · 7ea589a
1 parent 928ab4b
commit 7ea589a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -37,7 +37,7 @@ jobs:
 
     - name: Convert to AppX
       run: |
-        electron-windows-store --input-directory ./out/make --output-directory ./out/appx --package-version $(node -e "console.log(require('./package.json').version + '.1');") --package-name JeromeThayananthajothy.Comet --package-display-name "Comet" --package-description "A simple video converter" --publisher CN=E0D72A6F-3D67-49D6-9EA4-99FAFB4620E5 --dev-cert tools/certs/dev-cert.pfx --cert-pass ${{ secrets.CERT_PASS }} --windows-kit ${{ secrets.WINDOWS_KIT_PATH }} --package-icon ./path/to/icon.ico
+        electron-windows-store --input-directory ./out/make --output-directory ./out/appx --package-version $(node -e "console.log(require('./package.json').version + '.1');") --package-name JeromeThayananthajothy.Comet --package-display-name "Comet" --package-description "A simple video converter" --publisher CN=E0D72A6F-3D67-49D6-9EA4-99FAFB4620E5 --dev-cert tools/certs/dev-cert.pfx --cert-pass ${{ secrets.CERT_PASS }} --windows-kit ${{ secrets.WINDOWS_KIT_PATH }}
       shell: pwsh
 
     - name: Extract version from package.json

diff --git a/forge.config.ts b/forge.config.ts
@@ -29,33 +29,33 @@ const config: ForgeConfig = {
   },
   rebuildConfig: {},
   makers: [
-    // {
-    //   name: '@electron-forge/maker-squirrel',
-    //   platforms: ['win32'],
-    //   config: (arch: string) => ({
-    //     name: 'Comet',
-    //     authors: 'Jerome Thayananthajothy',
-    //     exe: 'Comet.exe',
-    //     noMsi: true,
-    //     setupExe: `comet-${version}-win32-${arch}-setup.exe`,
-    //     setupIcon: path.resolve(iconDir, 'setup-icon.ico'),
-    //   }),
-    // },
     {
-      name: '@electron-forge/maker-appx',
+      name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
-      config: {
-        packageName: 'JeromeThayananthajothy.Comet',
-        packageDisplayName: 'Comet',
-        packageDescription: 'A simple video converter',
-        packageVersion: `${version}.1`,
-        publisher: 'CN=E0D72A6F-3D67-49D6-9EA4-99FAFB4620E5',
-        devCert: 'tools/certs/dev-cert.pfx',
-        certPass: process.env.CERT_PASS,
-        windowsKit: process.env.WINDOWS_KIT_PATH,
-        icon: path.resolve(iconDir, 'icon.ico'),
-      },
+      config: (arch: string) => ({
+        name: 'Comet',
+        authors: 'Jerome Thayananthajothy',
+        exe: 'Comet.exe',
+        noMsi: true,
+        setupExe: `comet-${version}-win32-${arch}-setup.exe`,
+        setupIcon: path.resolve(iconDir, 'setup-icon.ico'),
+      }),
     },
+    // {
+    //   name: '@electron-forge/maker-appx',
+    //   platforms: ['win32'],
+    //   config: {
+    //     packageName: 'JeromeThayananthajothy.Comet',
+    //     packageDisplayName: 'Comet',
+    //     packageDescription: 'A simple video converter',
+    //     packageVersion: `${version}.1`,
+    //     publisher: 'CN=E0D72A6F-3D67-49D6-9EA4-99FAFB4620E5',
+    //     devCert: 'tools/certs/dev-cert.pfx',
+    //     certPass: process.env.CERT_PASS,
+    //     windowsKit: process.env.WINDOWS_KIT_PATH,
+    //     icon: path.resolve(iconDir, 'icon.ico'),
+    //   },
+    // },
     {
       name: '@electron-forge/maker-zip',
       platforms: ['darwin'],