Issue 5649 - Include full version number in AppxManifest.xml

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 base64
 import hashlib
 import json
 import mimetypes
 import os
 import zipfile
@@ skipping 51 matching lines @@
     template = _get_template_for(BLOCKMAP)
     files = [_make_blockmap_entry(n, d) for n, d in files.items()]
     return template.render(files=files).encode('utf-8')
 
 
 def load_translation(files, locale):
     """Load translation strings for locale from files."""
     path = '{}/_locales/{}/messages.json'.format(EXTENSION_DIR, locale)
     return json.loads(files[path])
 
-

[Vasily Kuznetsov, 2017/09/11 09:49:54]

Removing these empty lines seems unrelated and it's also in violation of PEP8
(see https://www.python.org/dev/peps/pep-0008/#blank-lines).

[Sebastian Noack, 2017/09/11 15:43:10]

Sorry, this change was not intended. I added those blank lines again.

 def pad_version(version):
     """Make sure version number has 4 groups of digits."""
     groups = (version.split('.') + ['0', '0', '0'])[:4]
     return '.'.join(groups)
 
-
 def create_appx_manifest(params, files, release_build=False):
     """Create AppxManifest.xml."""
     params = dict(params)
     metadata = params['metadata']
     w = params['windows_version'] = {}
     w['min'], w['max'] = metadata.get('compat', 'windows').split('/')
-    params.update(metadata.items('general'))
     params['version'] = pad_version(params['version'])
 
     metadata_suffix = 'release' if release_build else 'devbuild'
     app_extension_id = 'extension_id_' + metadata_suffix
     if metadata.has_option('general', app_extension_id):
         params['app_extension_id'] = metadata.get('general', app_extension_id)
     else:
         params['app_extension_id'] = 'EdgeExtension'
 
     app_id = 'app_id_' + metadata_suffix
@@ skipping 90 matching lines @@
     if metadata.has_section('appx_assets'):
         for name, path in metadata.items('appx_assets'):
             path = os.path.join(baseDir, path)
             files.read(path, '{}/{}'.format(ASSETS_DIR, name))
 
     files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
     files[BLOCKMAP] = create_appx_blockmap(files)
     files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
 
     files.zip(outfile, compression=zipfile.ZIP_STORED)