Unified Diff: tests/expecteddata/AppxManifest_edge_development_build.xml
Issue 29825555:
Issue 6291 - add ManifoldJS packaging for Edge (Closed)
Base URL: https://hg.adblockplus.org/buildtools/file/9a56d76cd951
Patch Set:
Created Aug. 8, 2018, 9:35 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« packagerEdge.py ('K')
|
« tests/abp-50.png ('k')
|
tests/expecteddata/AppxManifest_edge_devenv.xml » ('j')
|
tests/test_packagerWebExt.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: tests/expecteddata/AppxManifest_edge_development_build.xml |
| diff --git a/tests/expecteddata/AppxManifest_edge_development_build.xml b/tests/expecteddata/AppxManifest_edge_development_build.xml |
| index eb299d6fbb32f34676ed9c475c25dab1570c3bf7..f6abdd95437acc929f74c8f11778364d2991356b 100644 |
| --- a/tests/expecteddata/AppxManifest_edge_development_build.xml |
| +++ b/tests/expecteddata/AppxManifest_edge_development_build.xml |
| @@ -1,61 +1,40 @@ |
| -<?xml version="1.0" encoding="utf-8"?> |
| +<?xml version='1.0' encoding='utf-8'?> |
| +<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap3"> |
| + <Identity Name="EyeoGmbH.AdblockPlusdevelopmentbuild" Publisher="CN=4F066043-8AFE-41C9-B762-6C15E77E3F88" Version="1.2.3.1337" /> |
| -<Package |
| - xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" |
| - xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" |
| - xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" |
| - IgnorableNamespaces="uap3"> |
| + <Properties> |
| + <DisplayName>ms-resource:DisplayName</DisplayName> |
| + <PublisherDisplayName>eyeo GmbH</PublisherDisplayName> |
| + <Logo>Assets/logo_50.png</Logo> |
| + </Properties> |
| - <Identity |
| - Name="EyeoGmbH.AdblockPlusdevelopmentbuild" |
| - Publisher="CN=4F066043-8AFE-41C9-B762-6C15E77E3F88" |
| - Version="1.2.1337.0" /> |
| + <Dependencies> |
| + <TargetDeviceFamily MaxVersionTested="12.0.0.0" MinVersion="10.0.14332.0" Name="Windows.Desktop" /> |
| + </Dependencies> |
| - <Properties> |
| - <DisplayName>devbuild-marker</DisplayName> |
| - <PublisherDisplayName>eyeo GmbH</PublisherDisplayName> |
| - <Logo>Assets\logo_50.png</Logo> |
| - </Properties> |
| + <Resources> |
| + <Resource Language="en-us" /> |
| + <Resource Language="de" /> |
| + <Resource Language="it" /> |
| + <Resource uap:Scale="200" /> |
| + </Resources> |
| - <Dependencies> |
| - <TargetDeviceFamily |
| - Name="Windows.Desktop" |
| - MinVersion="10.0.14332.0" |
| - MaxVersionTested="12.0.0.0" /> |
| - </Dependencies> |
| - |
| - <Resources> |
| - <Resource Language="en-us"/> |
| - </Resources> |
| - |
| - <Applications> |
| - <Application Id="App"> |
| - <uap:VisualElements |
| - AppListEntry="none" |
| - DisplayName="devbuild-marker" |
| - Square150x150Logo="Assets\logo_150.png" |
| - Square44x44Logo="Assets\logo_44.png" |
| - Description="Adblock Plus is the most popular ad blocker ever, and also supports websites by not blocking unobstrusive ads by default (configurable)." |
| - BackgroundColor="red"> |
| - </uap:VisualElements> |
| - <Extensions> |
| - <uap3:Extension Category="windows.appExtension"> |
| - <uap3:AppExtension Name="com.microsoft.edge.extension" |
| - Id="EdgeExtension" |
| - PublicFolder="Extension" |
| - DisplayName="devbuild-marker"> |
| - <uap3:Properties> |
| - <Capabilities> |
| - <Capability Name="websiteContent"/> |
| - <Capability Name="browserStorage"/> |
| - <Capability Name="websiteInfo"/> |
| - <Capability Name="browserWebRequest"/> |
| - </Capabilities> |
| - </uap3:Properties> |
| - </uap3:AppExtension> |
| - </uap3:Extension> |
| - </Extensions> |
| - </Application> |
| - </Applications> |
| - |
| -</Package> |
| + <Applications> |
| + <Application Id="App"> |
| + <uap:VisualElements AppListEntry="none" BackgroundColor="transparent" Description="ms-resource:Description" DisplayName="ms-resource:DisplayName" Square150x150Logo="Assets/logo_150.png" Square44x44Logo="Assets/logo_44.png"> |
| + </uap:VisualElements> |
| + <Extensions> |
| + <uap3:Extension Category="windows.appExtension"> |
| + <uap3:AppExtension DisplayName="ms-resource:DisplayName" Id="EdgeExtension" Name="com.microsoft.edge.extension" PublicFolder="Extension"> |
| + <uap3:Properties> |
| + <Capabilities> |
| + <Capability Name="websiteInfo" /> |
| + <Capability Name="websiteContent" /> |
| + </Capabilities> |
| + </uap3:Properties> |
| + </uap3:AppExtension> |
| + </uap3:Extension> |
| + </Extensions> |
| + </Application> |
| + </Applications> |
| +</Package> |
« packagerEdge.py ('K')
|
« tests/abp-50.png ('k')
|
tests/expecteddata/AppxManifest_edge_devenv.xml » ('j')
|
tests/test_packagerWebExt.py » ('J')
