Remove Build Files.

Updated required runtime libraries for x86/ARM.

.gitignore

@@ -249,4 +249,9 @@ ModelManifest.xml
 
 # Arm Build Files
 package.zip
-ArmPackage.zip
+ArmPackage.zip
+ArmBuild.ps1
+arm_build.bat
+ARM_PIE.pfx
+
+UpgradeLog.htm

ArmBuild.ps1

@@ -1,62 +0,0 @@
-# ArmBuild.ps1
-$ErrorActionPreference = "Stop"
-
-$root    = Split-Path -Parent $MyInvocation.MyCommand.Path
-$staging = Join-Path $root "_staging"
-$outZip  = Join-Path $root "ArmPackage.zip"
-$packageFolderName = "Desktop App Installer"
-$destRoot = Join-Path $staging $packageFolderName
-
-function Copy-Binaries-ToDest($src, $dest)
-{
-    if (!(Test-Path $src)) { return }
-
-    Get-ChildItem $src -File | Where-Object {
-        $_.Extension -in ".exe", ".dll"
-    } | ForEach-Object {
-        Copy-Item -Path $_.FullName -Destination $dest -Force
-    }
-}
-
-Write-Host "Preparing staging..."
-# 清理旧的 staging
-if (Test-Path $staging) { Remove-Item $staging -Recurse -Force }
-New-Item $destRoot -ItemType Directory | Out-Null
-
-# ① 先放 Release
-Copy-Binaries-ToDest (Join-Path $root "Release") $destRoot
-
-# ② 再放 ARM\Release（覆盖同名）
-Copy-Binaries-ToDest (Join-Path $root "ARM\Release") $destRoot
-
-# ③ shared 全部铺到 Desktop App Installer 里
-$shared = Join-Path $root "shared"
-if (Test-Path $shared) {
-    Get-ChildItem $shared -Recurse | ForEach-Object {
-        $relativePath = $_.FullName.Substring($shared.Length).TrimStart('\')
-        $destinationPath = Join-Path $destRoot $relativePath
-
-        if ($_.PSIsContainer) {
-            if (!(Test-Path $destinationPath)) {
-                New-Item -Path $destinationPath -ItemType Directory | Out-Null
-            }
-        } else {
-            $parentDir = Split-Path $destinationPath -Parent
-            if (!(Test-Path $parentDir)) {
-                New-Item -Path $parentDir -ItemType Directory | Out-Null
-            }
-            Copy-Item -Path $_.FullName -Destination $destinationPath -Force
-        }
-    }
-}
-
-Write-Host "Creating ZIP..."
-if (Test-Path $outZip) { Remove-Item $outZip -Force }
-
-# 压缩 _staging 下的 Desktop App Installer 文件夹
-Compress-Archive -Path $destRoot -DestinationPath $outZip -CompressionLevel Optimal
-
-# 清理 staging
-Remove-Item $staging -Recurse -Force
-
-Write-Host "Done: $outZip"

README.md

@@ -4,9 +4,9 @@
 <h2>Required runtime libraries</h2>
 <ul>
   <li>Microsoft .NET Framework 4.5 (may be pre-installed on Windows 8.x and later)</li>
-  <li>Microsoft .NET Framework 4.6</li>
-  <li>Microsoft Visual C++ 2013 Redistributable (x86)</li>
-  <li>Microsoft Visual C++ 2015 Redistributable (x86)</li>
+  <li>Microsoft .NET Framework 4.6 (x86/ARM)</li>
+  <li>Microsoft Visual C++ 2013 Redistributable (x86/ARM)</li>
+  <li>Microsoft Visual C++ 2015 Redistributable (x86/ARM)</li>
 </ul>
 <h2>Download</h2>
 <p>Download the latest release from the Releases section.</p>

arm_build.bat

@@ -1,5 +0,0 @@
-@echo off
-cd /d "%~dp0"
-set SCRIPT_DIR=%~dp0
-powershell -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%ArmBuild.ps1"
-pause

pkgread/priformatcli.h

@@ -1 +0,0 @@
-E:/Profiles/Bruce/Documents/visual studio 2015/Projects/priformatcli/priformatcli/priformatcli.h

pkgread/priformatcli.h

@@ -0,0 +1 @@
+E:/Profiles/Bruce/Documents/visual studio 2015/Projects/priformatcli/priformatcli/priformatcli.h

settings/main.cpp

@@ -418,6 +418,15 @@ public ref class _I_System
 			return (error == ERROR_OLD_WIN_VERSION) ? FALSE : FALSE;
 		}
 	}
+	property int ProcessorArchitecture
+	{
+		int get ()
+		{
+			SYSTEM_INFO si;
+			GetNativeSystemInfo (&si);
+			return si.wProcessorArchitecture;
+		}
+	}
 };
 public ref class _I_System2: public _I_System
 {
@@ -1208,6 +1217,14 @@ public ref class MainHtmlWnd: public System::Windows::Forms::Form, public IScrip
 				th->Start ();
 			}
 			bool Kill (String ^filename, bool allproc, bool onlyname) { return KillProcessByFilePath (MPStringToStdW (filename), allproc, onlyname); }
+			bool Start (String ^filename, String ^args) 
+			{
+				LPCWSTR lpArgs = (args && args->Length) ? MPStringToPtrW (args) : nullptr;
+				HINSTANCE result = ShellExecuteW (nullptr, L"open", MPStringToStdW (filename).c_str (), lpArgs, nullptr, SW_SHOWNORMAL);
+				if (reinterpret_cast <intptr_t> (result) <= 32) return false;
+				return true;
+			}
+			bool Open (String ^url) { return Start (url, nullptr); }
 		};
 		[ComVisible (true)]
 		ref class _I_ResourcePri

shared/html/settings/update.html

@@ -372,12 +372,11 @@
                         try {
                             WinJS.xhr({
                                 url: "https://api.github.com/repos/modernw/App-Installer-For-Windows-8.x-Reset/releases/latest"
-                            }).done(function(resp) {
+                            }).then(function(resp) {
                                 // console.log("success", resp);
                                 var json = JSON.parse(resp.responseText);
                                 window.fetchedJson = json;
                                 // console.log(json);
-                                self.disabled = false;
                                 newVersionVersion.textContent = json.name;
                                 newVersionVersion.setAttribute("data-version", json.tag_name);
                                 window.newver = json.tag_name;
@@ -396,7 +395,6 @@
                                         break;
                                     }
                                 }
-                                window.parent.setDisabledForOperation(false);
                                 if (compareVersion(window.currver, window.newver) >= 0) {
                                     checkUpdateText.textContent = getPublicRes(114);
                                     checkUpdateBtn.textContent = getPublicRes(115);
@@ -419,8 +417,10 @@
                                 progress.style.display = "none";
                                 docLink.style.display = "";
                                 docLink.href = json.documentation_url;
-                                self.disabled = false;
+                                WinJS.Promise.wrap();
+                            }).done(function() {
                                 window.parent.setDisabledForOperation(false);
+                                self.disabled = false;
                             });
                         } catch (error) {
                             //  console.log("error", error);
@@ -432,6 +432,13 @@
                             window.parent.setDisabledForOperation(false);
                         }
                     } else if (checkUpdateBtn.getAttribute("data-action") == "download") {
+                        switch (external.System.processorArchitecture) {
+                            case 5:
+                                external.Process.open(newVersionUrl.href);
+                                self.disabled = false;
+                                window.parent.setDisabledForOperation(false);
+                                return;
+                        }
                         var storage = Bridge.External.Storage;
                         var path = storage.path;
                         stopProcess = true;