Issue 5668 - Replace 3rd component of version in AppxManifest.xml with build number

tests/test_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 ConfigParser
 import json
 import os
 import shutil
 import xml.etree.ElementTree as ET
 import zipfile
@@ skipping 134 matching lines @@
 
     def attr(attr):
         def wrapper(elem):
             return elem.attrib[attr]
         return wrapper
 
     base = [
         ('.//*', [len], 21.0),
         ('./ns:Identity', [first, attr('Publisher')],
             'CN=4F066043-8AFE-41C9-B762-6C15E77E3F88'),
-        ('./ns:Identity', [first, attr('Version')], '1.2.3.0'),
         ('./ns:Properties/ns:PublisherDisplayName', [first, text],
             'Eyeo GmbH'),
         ('./ns:Properties/ns:Logo', [first, text], 'Assets\\logo_50.png'),
         ('./ns:Dependencies/ns:TargetDeviceFamily',
             [first, attr('MinVersion')],
             '10.0.14332.0'),
         ('./ns:Dependencies/ns:TargetDeviceFamily',
             [first, attr('MaxVersionTested')],
             '12.0.0.0'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('Square150x150Logo')],
             'Assets\\logo_150.png'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('Square44x44Logo')],
             'Assets\\logo_44.png'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('Description')],
             'Adblock Plus is the most popular ad blocker ever, and also '
             'supports websites by not blocking unobstrusive ads by '
             'default (configurable).'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('BackgroundColor')],
             'red'),
     ]
 
     devbuild = base + [
         ('./ns:Identity', [first, attr('Name')],
             'EyeoGmbH.AdblockPlusdevelopmentbuild'),
+        ('./ns:Identity', [first, attr('Version')], '1.2.1000.0'),
         ('./ns:Properties/ns:DisplayName', [first, text], 'devbuild-marker'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('DisplayName')],
             'devbuild-marker'),
         ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
             'uap3:AppExtension',
             [first, attr('Id')],
             'EdgeExtension'),
         ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
             'uap3:AppExtension',
             [first, attr('DisplayName')],
             'devbuild-marker'),
     ]
 
     release = base + [
         ('./ns:Identity', [first, attr('Name')], 'EyeoGmbH.AdblockPlus'),
+        ('./ns:Identity', [first, attr('Version')], '1.2.3.0'),
         ('./ns:Properties/ns:DisplayName', [first, text], 'Adblock Plus'),
         ('./ns:Applications/ns:Application/uap:VisualElements',
             [first, attr('DisplayName')],
             'Adblock Plus'),
         ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
             'uap3:AppExtension',
             [first, attr('Id')],
             '1.0'),
         ('./ns:Applications/ns:Application/ns:Extensions/uap3:Extension/'
             'uap3:AppExtension',
             [first, attr('DisplayName')],
             'Adblock Plus'),
     ]
 
-    for release_build, pairs in [(False, devbuild), (True, release)]:
+    for args, pairs in [(('1000', False), devbuild), ((None, True), release)]:
         manifest = ET.fromstring(packagerEdge.create_appx_manifest(
-            {'metadata': metadata, 'version': '1.2.3.4'},
-            files,
-            release_build=release_build))
+            {'metadata': metadata}, files, *args
+        ))
         for expression, modifiers, value in pairs:
             res = reduce(
                 lambda val, func: func(val),
                 modifiers,
                 manifest.findall(expression, namespaces=namespaces))
             assert res == value
 
 
 def test_move_files_to_extension():
     files = packager.Files(set(), set())
@@ skipping 21 matching lines @@
     assert 'devbuild-marker' not in appx.read('AppxManifest.xml')
     assert appx.read('Assets/logo_44.png') == '44'
     assert appx.read('Extension/icons/abp-44.png') == '44'
 
 
 def test_create_devbuild(tmpdir, srcdir):
     out_file = str(tmpdir.join('abp.appx'))
     packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=False)
     appx = zipfile.ZipFile(out_file)
     assert 'devbuild-marker' in appx.read('AppxManifest.xml')