Issue 5668 - Reintroduce buildnumber shifting for edge

packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import shutil
 from StringIO import StringIO
 import subprocess
 import tempfile
 from xml.etree import ElementTree
@@ skipping 19 matching lines @@
             fp, events=['start-ns'])])
     for prefix, uri in ns.items():
         ElementTree.register_namespace(prefix, uri)
 
     # Make the default namespace available in an xpath expression
     ns['_d'] = ns['']
 
     return ns
 
 
+def get_appx_version(metadata, build_num):
+    """Get the version number for usage in AppxManifest.xml.
+
+    As required by the Windows Store, the returned version string has four
+    components, where the 3rd component is replaced with the build number
+    if available, and the 4th component is always zero (e.g. 1.2.1000.0).
+    """
+    components = metadata.get('general', 'version').split('.')[:3]
+    components.extend(['0'] * (4 - len(components)))
+    if build_num:
+        components[2] = build_num
+    return '.'.join(components)
+
+
 def update_appx_manifest(manifest_path, base_dir, files, metadata,
-                         release_build):
+                         release_build, build_num):
     namespaces = register_xml_namespaces(manifest_path)
 
     v_min, v_max = metadata.get('compat', 'windows').split('/')
 
     filenames = []
 
     for name, path in metadata.items('appx_assets'):
         path = os.path.join(base_dir, path)
         icon_path = '{}/{}'.format(ASSETS_DIR, name)
 
         files.read(path, icon_path)
         filenames.append(icon_path)
 
     assets = packagerChrome.makeIcons(files, filenames)
 
     author = metadata.get('general', 'author')
 
     overrides = [
         ('_d:Identity', None, [
             ('Name', packager.get_app_id(release_build, metadata)),
             ('Publisher', metadata.get('general', 'publisher_id')),
+            ('Version', get_appx_version(metadata, build_num)),
         ]),
         ('_d:Properties/_d:PublisherDisplayName', author, []),
         ('_d:Properties/_d:Logo', assets[50], []),
         ('_d:Dependencies/_d:TargetDeviceFamily', None, [
             ('MaxVersionTested', v_max),
             ('MinVersion', v_min),
         ]),
         ('_d:Applications/_d:Application/uap:VisualElements', None, [
             ('Square150x150Logo', assets[150]),
             ('Square44x44Logo', assets[44]),
@@ skipping 90 matching lines @@
         manifest_folder = os.path.join(manifold_folder, 'manifest')
         asset_folder = os.path.join(manifest_folder, ASSETS_DIR)
 
         # prepare the extension with manifoldjs
         cmd = ['npm', 'run', '--silent', 'build-edge']
         subprocess.check_call(cmd, env=cmd_env, cwd=os.path.dirname(__file__))
 
         # update incomplete appxmanifest
         intermediate_manifest = os.path.join(manifest_folder, MANIFEST)
         update_appx_manifest(intermediate_manifest, baseDir, files, metadata,
-                             releaseBuild)
+                             releaseBuild, buildNum)
 
         # cleanup placeholders, copy actual images
         shutil.rmtree(asset_folder)
         os.mkdir(asset_folder)
         if metadata.has_section('appx_assets'):
             for name, path in metadata.items('appx_assets'):
                 path = os.path.join(baseDir, path)
                 target = os.path.join(asset_folder, name)
                 shutil.copyfile(path, target)
 
         # package app with manifoldjs
         cmd = ['npm', 'run', '--silent', 'package-edge']
 
         subprocess.check_call(cmd, env=cmd_env, cwd=os.path.dirname(__file__))
 
         package = os.path.join(manifold_folder, 'package',
                                'edgeExtension.appx')
 
         shutil.copyfile(package, outfile)
     finally:
         shutil.rmtree(tmp_dir, ignore_errors=True)