From 264b1ab7f763c48592d6593eccedfc06fbaee629 Mon Sep 17 00:00:00 2001
From: Easton Pillay <easton@planeteaston.com>
Date: Fri, 2 Apr 2021 16:31:05 -0500
Subject: [PATCH] Added x86 and arm64 architectures for Firefox version 85.0.
 (#9671)

---
 .../85.0/Mozilla.Firefox.installer.yaml       | 38 +++++++++++++++++++
 .../85.0/Mozilla.Firefox.locale.en-US.yaml    | 19 ++++++++++
 .../Mozilla/Firefox/85.0/Mozilla.Firefox.yaml | 37 +++---------------
 3 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.installer.yaml
 create mode 100644 manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.locale.en-US.yaml

diff --git a/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.installer.yaml b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.installer.yaml
new file mode 100644
index 000000000..c485e3828
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.installer.yaml
@@ -0,0 +1,38 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Mozilla.Firefox
+PackageVersion: "85.0"
+FileExtensions:
+- html
+- htm
+- url
+Protocols:
+- http
+- https
+Commands:
+- firefox
+MinimumOSVersion: 10.0.0.0
+Installers:
+- Architecture: x64
+  InstallerType: msi
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/85.0/win64/en-US/Firefox%20Setup%2085.0.msi
+  InstallerSha256: A8A3B134C5A8E34E834FC8E47DEFF3371E02157FDB7CF746EC927C02FBDE7C29
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: x86
+  InstallerType: msi
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/85.0/win32/en-US/Firefox%20Setup%2085.0.msi
+  InstallerSha256: 939227A9530D34426943FB2E2F73F87946BE7A4CA70ED4D0F73054FED7B8B2F5
+  Scope: machine
+  InstallerLocale: en-US
+- Architecture: arm64
+  InstallerType: exe
+  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/85.0/win64-aarch64/en-US/Firefox%20Setup%2085.0.exe
+  InstallerSha256: 5A19C1761AF75E0226BA98B69461426AA6B08F85638DDE7DBA6AF96E87A5EC0C
+  Scope: machine
+  InstallerLocale: en-US
+  InstallerSwitches:
+    Silent: /S
+    SilentWithProgress: /S
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.locale.en-US.yaml b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.locale.en-US.yaml
new file mode 100644
index 000000000..e3cdd8ee4
--- /dev/null
+++ b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.locale.en-US.yaml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Mozilla.Firefox
+PackageVersion: "85.0"
+PackageLocale: en-US
+Author: Mozilla
+Moniker: firefox
+Tags:
+- Browser
+- Mozilla
+- Firefox
+PackageUrl: https://www.mozilla.org/en-US/firefox/new/
+LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
+Publisher: Mozilla
+PackageName: Firefox
+License: Mozilla Public License Version 2.0
+ShortDescription: Mozilla Firefox is free and open source software, built by a community of thousands from all over the world.
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.yaml b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.yaml
index 8c7b45af9..fde285cfb 100644
--- a/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.yaml
+++ b/manifests/m/Mozilla/Firefox/85.0/Mozilla.Firefox.yaml
@@ -1,34 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Mozilla.Firefox
-Publisher: Mozilla
-PackageName: Firefox
-Author: Mozilla
-ShortDescription: Mozilla Firefox is free and open source software, built by a community of thousands from all over the world.
-Moniker: firefox
-Tags:
-- Browser
-- Mozilla
-- Firefox
-FileExtensions:
-- html
-- htm
-- url
-Protocols:
-- http
-- https
-Commands:
-- firefox
-PackageUrl: https://www.mozilla.org/en-US/firefox/new/
-License: Mozilla Public License Version 2.0
-LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
-MinimumOSVersion: 10.0.0.0
-PackageVersion: 85.0
-InstallerType: msi
-Installers:
-- Architecture: x64
-  InstallerUrl: https://download-installer.cdn.mozilla.net/pub/firefox/releases/85.0/win64/en-US/Firefox%20Setup%2085.0.msi
-  InstallerSha256: A8A3B134C5A8E34E834FC8E47DEFF3371E02157FDB7CF746EC927C02FBDE7C29
-  Scope: machine
-  InstallerLocale: en-US
-PackageLocale: en-US
-ManifestType: singleton
+PackageVersion: "85.0"
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+