From 1c31cec830bb7b68e488442f1a240844ebac32a8 Mon Sep 17 00:00:00 2001
From: Esco <OfficialEsco@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:13:15 +0200
Subject: [PATCH] Merge Thunderbird v78.0 (#10885)

* Merge Thunderbird v78.0

* Fixed PrivacyUrl
---
 .../78.0/Mozilla.Thunderbird.installer.yaml   | 32 +++++++++++++++++++
 .../Mozilla.Thunderbird.locale.en-US.yaml     | 26 +++++++++++++++
 .../Thunderbird/78.0/Mozilla.Thunderbird.yaml | 21 ++----------
 3 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.installer.yaml
 create mode 100644 manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.locale.en-US.yaml

diff --git a/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.installer.yaml b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.installer.yaml
new file mode 100644
index 000000000..3d82dad79
--- /dev/null
+++ b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.installer.yaml
@@ -0,0 +1,32 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Mozilla.Thunderbird
+PackageVersion: 78.0
+MinimumOSVersion: 10.0.0.0
+FileExtensions:
+  - csv
+  - eml
+  - ldif
+  - xpi
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: msi
+    InstallerUrl: https://archive.mozilla.org/pub/thunderbird/releases/78.0/win64/en-US/Thunderbird%20Setup%2078.0.msi
+    InstallerSha256: FF3CAE374DF7ECB266C609F70931AF2267E74CF1CB2C52EC1BBB0272919F06E0
+    #ProductCode: 
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x64
+    InstallerType: msi
+    InstallerUrl: https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/78.0/win64/cs/Thunderbird%20Setup%2078.0.msi
+    InstallerSha256: 6778E294D3145E32D992FA484D8600215AF93BB2380180C8015C395DC98FF79D
+    #ProductCode: 
+    Scope: machine
+    InstallerLocale: cs-CZ
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0
diff --git a/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.locale.en-US.yaml b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.locale.en-US.yaml
new file mode 100644
index 000000000..0d058ad0a
--- /dev/null
+++ b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.locale.en-US.yaml
@@ -0,0 +1,26 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Mozilla.Thunderbird
+PackageVersion: 78.0
+PackageLocale: en-US
+Publisher: Mozilla Foundation
+PublisherUrl: https://www.mozilla.org
+PublisherSupportUrl: https://support.mozilla.org
+PrivacyUrl: https://www.mozilla.org/en-US/privacy/thunderbird/
+Author: Mozilla Foundation
+PackageName: Thunderbird
+PackageUrl: https://www.thunderbird.net
+License: Mozilla Public License Version 2.0
+LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
+#Copyright: 
+CopyrightUrl: https://www.mozilla.org/en-US/foundation/trademarks/policy/
+ShortDescription: Thunderbird is a free email application thats easy to set up and customize!
+#Description: 
+Moniker: thunderbird
+Tags:
+  - thunderbird
+  - email
+  - eMail
+  - e-Mail
+  - email client
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
diff --git a/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.yaml b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.yaml
index 7389ad16c..5c6d14bbd 100644
--- a/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.yaml
+++ b/manifests/m/Mozilla/Thunderbird/78.0/Mozilla.Thunderbird.yaml
@@ -1,21 +1,6 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Mozilla.Thunderbird
 PackageVersion: 78.0
-PackageName: Thunderbird
-Publisher: Mozilla
-License: Mozilla Public License Version 2.0
-LicenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
-Moniker: thunderbird
-Tags:
-- thunderbird
-- email
-- E-mail
-ShortDescription: Thunderbird is a free email application that’s easy to set up and customize!
-PackageUrl: https://www.thunderbird.net
-Installers:
-- Architecture: x64
-  InstallerUrl: https://archive.mozilla.org/pub/thunderbird/releases/78.0/win64/en-US/Thunderbird%20Setup%2078.0.msi
-  InstallerSha256: FF3CAE374DF7ECB266C609F70931AF2267E74CF1CB2C52EC1BBB0272919F06E0
-  InstallerType: msi
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0