Merge x64 and x86 WinMerge.WinMerge v2.16.10 (#12806)

* Merge x64 and x86 WinMerge.WinMerge v2.16.10

* Added WinMerge.WinMerge v2.16.12.0

* Revert "Added WinMerge.WinMerge v2.16.12.0"

This reverts commit 42c1d7e80e8270350a179b7f73653bb20b8b81d5.

manifests/w/WinMerge/WinMerge/2.16.10/WinMerge.WinMerge.installer.yaml

@@ -0,0 +1,25 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: WinMerge.WinMerge
+PackageVersion: 2.16.10
+MinimumOSVersion: 10.0.0.0
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+Installers:
+  - Architecture: x64
+    InstallerType: inno
+    InstallerUrl: https://github.com/WinMerge/winmerge/releases/download/v2.16.10/WinMerge-2.16.10-x64-Setup.exe
+    InstallerSha256: 6E9CD0D92EB721BD40974DE4CC1CFB0B69E497DCFFFBBC50638CF931603247CB
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+  - Architecture: x86
+    InstallerType: inno
+    InstallerUrl: https://github.com/WinMerge/winmerge/releases/download/v2.16.10/WinMerge-2.16.10-Setup.exe
+    InstallerSha256: 3536520E823D841ECCA04A1F8624B1DED8C865846211546A5B0C8668426AC5A7
+    Scope: machine
+    InstallerLocale: en-US
+    UpgradeBehavior: install
+ManifestType: installer
+ManifestVersion: 1.0.0

manifests/w/WinMerge/WinMerge/2.16.10/WinMerge.WinMerge.locale.en-US.yaml

@@ -0,0 +1,27 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: WinMerge.WinMerge
+PackageVersion: 2.16.10
+PackageLocale: en-US
+Publisher: Thingamahoochie Softwarre
+PublisherUrl: https://github.com/WinMerge/winmerge
+PublisherSupportUrl: https://github.com/WinMerge/winmerge/issues
+#PrivacyUrl: 
+Author: WinMerge
+PackageName: WinMerge
+PackageUrl: https://winmerge.org
+License: GNU General Public License v2.0
+LicenseUrl: https://github.com/WinMerge/winmerge/blob/master/LICENSE.md
+Copyright: Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+CopyrightUrl: https://github.com/WinMerge/winmerge/blob/master/LICENSE.md
+ShortDescription: WinMerge is an Open Source data comparison and merging tool for text-like files.
+#Description: 
+Moniker: winmerge
+Tags:
+  - diff
+  - merge
+  - folders
+  - files
+  - foss
+  - open source
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0

manifests/w/WinMerge/WinMerge/2.16.10/WinMerge.WinMerge.yaml

@@ -1,22 +1,6 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: WinMerge.WinMerge
 PackageVersion: 2.16.10
-PackageName: WinMerge
+DefaultLocale: en-US
-Moniker: WinMerge
+ManifestType: version
-Publisher: WinMerge
-License: GNU General Public License v2.0
-LicenseUrl: https://github.com/WinMerge/winmerge/blob/master/LICENSE.md
-Tags:
-- diff
-- merge
-- folders
-- files
-ShortDescription: WinMerge is an Open Source data comparison and merging tool for text-like files.
-PackageUrl: https://winmerge.org/
-Installers:
-- Architecture: x64
-  InstallerUrl: https://sourceforge.net/projects/winmerge/files/stable/2.16.10/WinMerge-2.16.10-x64-Setup.exe/download
-  InstallerSha256: 6e9cd0d92eb721bd40974de4cc1cfb0b69e497dcfffbbc50638cf931603247cb
-  InstallerType: inno
-PackageLocale: en-US
-ManifestType: singleton
 ManifestVersion: 1.0.0