You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by da...@apache.org on 2017/01/18 11:04:56 UTC
cordova-windows git commit: CB-12298 [Windows] bundle.appxupload not
generated for Windows 10 target
Repository: cordova-windows
Updated Branches:
refs/heads/master ae433f675 -> a925ed5b0
CB-12298 [Windows] bundle.appxupload not generated for Windows 10 target
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/a925ed5b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/a925ed5b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/a925ed5b
Branch: refs/heads/master
Commit: a925ed5b012618cfc21249739dcd636fd6f772fd
Parents: ae433f6
Author: daserge <v-...@microsoft.com>
Authored: Wed Jan 11 18:06:52 2017 +0300
Committer: daserge <v-...@microsoft.com>
Committed: Wed Jan 11 18:06:52 2017 +0300
----------------------------------------------------------------------
spec/e2e/endtoend.spec.js | 12 ++++++++++++
template/cordova/lib/build.js | 5 +++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/a925ed5b/spec/e2e/endtoend.spec.js
----------------------------------------------------------------------
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index 209ff39..aa08bed 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -102,4 +102,16 @@ describe('Cordova create and build', function(){
done();
});
});
+
+ it('spec.6 should build Windows 8.1 project bundle appxupload', function(){
+ shell.exec(buildScriptPath + ' --release --win --bundle --archs=\"x64 x86 arm\"', {silent : true});
+ var packages = shell.ls(appPackagesFolder);
+ expect(packages.filter(function(file) { return file.match(/.*bundle\.appxupload$/); }).length > 0).toBeTruthy();
+ });
+
+ it('spec.7 should build Windows 10 project bundle appxupload', function(){
+ shell.exec(buildScriptPath + ' --release --win --appx=uap --bundle --archs=\"x64 x86 arm\"', {silent : true});
+ var packages = shell.ls(appPackagesFolder);
+ expect(packages.filter(function(file) { return file.match(/.*bundle\.appxupload$/); }).length > 0).toBeTruthy();
+ });
});
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/a925ed5b/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index b50d05a..8159c8b 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -342,6 +342,11 @@ function buildTargets(allMsBuildVersions, config) {
// Only add the CordovaBundlePlatforms argument when on the last build step
var bundleArchs = (index === configsArray.length - 1) ? bundleTerms : build.arch;
otherProperties.push('/p:CordovaBundlePlatforms=' + bundleArchs);
+
+ // https://issues.apache.org/jira/browse/CB-12298
+ if (config.targetProject === 'windows10') {
+ otherProperties.push('/p:UapAppxPackageBuildMode=StoreUpload');
+ }
}
return msbuild.buildProject(path.join(ROOT, build.target), config.buildType, build.arch, otherProperties);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org