Issue 6383 - introduce switchable app_id

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 81 matching lines @@
     w['min'], w['max'] = metadata.get('compat', 'windows').split('/')
     params['version'] = get_appx_version(metadata, build_num)
 
     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
-    params['app_id'] = metadata.get('general', app_id)
+    params['app_id'] = packager.get_app_id(release_build, metadata)
 
     translation = load_translation(files, defaultLocale)
     name_key = 'name' if release_build else 'name_devbuild'
     params['display_name'] = translation[name_key]['message']
     params['description'] = translation['description']['message']
 
     for size in ['44', '50', '150']:
         path = '{}/logo_{}.png'.format(ASSETS_DIR, size)
         if path not in files:
             raise KeyError(path + ' is not found in files')
@@ skipping 84 matching lines @@
         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,
                                            buildNum, releaseBuild)
     files[BLOCKMAP] = create_appx_blockmap(files)
     files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
 
     files.zip(outfile, compression=zipfile.ZIP_STORED)