You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2019/12/23 04:45:53 UTC

[cordova-windows] branch brodybits-uwp-only-test-wip0601 updated (0755d53 -> 053fa4c)

This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a change to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git.


    from 0755d53  remove template/CordovaApp.vs2013.sln
     new dd3ec58  Update README with Windows 10 requirement
     new b265821  do not build Windows [Phone] 8.1 projects
     new 3688c21  remove handling of Windows Phone [8.1] jsproj file
     new 3858323  add FUTURE TBD comments to build.js
     new 98d225e  remove handling of Windows 8.1 jsproj file
     new 9b19fa5  fix a default case in template/cordova/lib/build.js
     new 053fa4c  add NOTE & FUTURE TBD comments

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                            |  8 ++++++--
 bin/lib/check_reqs.js                |  5 +++++
 spec/e2e/endtoend.spec.js            | 20 ++++++++++----------
 spec/unit/build.spec.js              |  8 ++++----
 template/cordova/lib/MSBuildTools.js | 11 ++++++-----
 template/cordova/lib/build.js        | 34 +++++++++-------------------------
 template/cordova/run                 |  7 +++----
 7 files changed, 43 insertions(+), 50 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 03/07: remove handling of Windows Phone [8.1] jsproj file

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 3688c21a7b96638d52f27dba266c0b8eae70f777
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:23 2019 -0500

    remove handling of Windows Phone [8.1] jsproj file
---
 template/cordova/lib/MSBuildTools.js | 5 ++---
 template/cordova/lib/build.js        | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index d450aba..4b6858f 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -255,7 +255,6 @@ module.exports.getLatestMSBuild = function () {
 };
 
 var projFiles = {
-    phone: 'CordovaApp.Phone.jsproj',
     win: 'CordovaApp.Windows.jsproj',
     win10: 'CordovaApp.Windows10.jsproj'
 };
@@ -265,11 +264,11 @@ var projFiles = {
 // - v15.x: TBD
 // - v14: Windows 8.1, Windows 10
 function msBuild14TargetsFilter (target) {
-    return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
+    return target === projFiles.win || target === projFiles.win10;
 }
 
 function msBuild15TargetsFilter (target) {
-    return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
+    return target === projFiles.win || target === projFiles.win10;
 }
 
 function msBuild155TargetsFilter (target) {
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 68b4797..d0efc1a 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -33,12 +33,10 @@ var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;
 
 var projFiles = {
-    phone: 'CordovaApp.Phone.jsproj',
     win: 'CordovaApp.Windows.jsproj',
     win10: 'CordovaApp.Windows10.jsproj'
 };
 var projFilesToManifests = {
-    'CordovaApp.Phone.jsproj': 'package.phone.appxmanifest',
     'CordovaApp.Windows.jsproj': 'package.windows.appxmanifest',
     'CordovaApp.Windows10.jsproj': 'package.windows10.appxmanifest'
 };
@@ -150,9 +148,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
         // as part of build configuration.  This will be used for determining the binary to 'run' after build is done.
         if (targets.length > 0) {
             switch (targets[0]) {
-            case projFiles.phone:
-                buildConfig.targetProject = 'phone';
-                break;
             case projFiles.win10:
                 buildConfig.targetProject = 'windows10';
                 break;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 07/07: add NOTE & FUTURE TBD comments

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 053fa4c06ab43575e1d2f6fab1a3b11083dc8e95
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:56 2019 -0500

    add NOTE & FUTURE TBD comments
---
 template/cordova/lib/MSBuildTools.js | 3 +++
 template/cordova/lib/build.js        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index ba7de80..90501b8 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -254,6 +254,9 @@ module.exports.getLatestMSBuild = function () {
         });
 };
 
+// NOTE that this used to be a larger mapping objects to
+// support Windows 8.1, Windows Phone 8.1, & Windows 10.
+// FUTURE TBD consider possible refactoring.
 var projFiles = {
     win10: 'CordovaApp.Windows10.jsproj'
 };
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 73ad0b8..f52c4b6 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -32,6 +32,9 @@ var fs = require('fs');
 var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;
 
+// NOTE that these used to be larger mapping objects to
+// support Windows 8.1, Windows Phone 8.1, & Windows 10.
+// FUTURE TBD consider refactoring these.
 var projFiles = {
     win10: 'CordovaApp.Windows10.jsproj'
 };


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 06/07: fix a default case in template/cordova/lib/build.js

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 9b19fa55d39274d7cb92d37b254e18613f4c2901
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:49 2019 -0500

    fix a default case in template/cordova/lib/build.js
---
 template/cordova/lib/build.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 9581170..73ad0b8 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -148,10 +148,8 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
         if (targets.length > 0) {
             switch (targets[0]) {
             case projFiles.win10:
-                buildConfig.targetProject = 'windows10';
-                break;
             default:
-                buildConfig.targetProject = 'windows';
+                buildConfig.targetProject = 'windows10';
                 break;
             }
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 02/07: do not build Windows [Phone] 8.1 projects

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit b265821538cce0e90fec0fc1ae85edceffd5adf4
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:16 2019 -0500

    do not build Windows [Phone] 8.1 projects
    
    skip affected unit & e2e tests (for now, at least)
    
    update some related help text
    
    Co-authored-by: Jan Piotrowski <pi...@gmail.com>
    Co-authored-by: Christopher J. Brody <ch...@brody.consulting>
---
 bin/lib/check_reqs.js         |  5 +++++
 spec/e2e/endtoend.spec.js     | 20 ++++++++++----------
 spec/unit/build.spec.js       |  8 ++++----
 template/cordova/lib/build.js | 15 ++-------------
 template/cordova/run          |  7 +++----
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 086d109..bb0bc05 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -68,6 +68,11 @@ function getMinimalRequiredVersionFor (requirement, windowsTargetVersion, window
     if (windowsPhoneTargetVersion === '8' || windowsPhoneTargetVersion === '8.0') {
         throw new CordovaError('8.0 is not a valid version for windows-phone-target-version (use the wp8 Cordova platform instead)');
     }
+
+    if (windowsTargetVersion === '8.1' || windowsPhoneTargetVersion === '8.1') {
+        throw new CordovaError('Windows (Phone) 8.1 projects are deprecated. To use you may downgrade to cordova-windows@7.');
+    }
+
     var windowsReqVersion = Version.tryParse(REQUIRED_VERSIONS[windowsTargetVersion][requirement]);
     var phoneReqVersion = Version.tryParse(REQUIRED_VERSIONS[windowsPhoneTargetVersion][requirement]);
 
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index b33e013..7ef12cd 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -173,17 +173,17 @@ describe('Cordova create and build', function () {
             }
         });
 
-        it('spec.2d should build 8.1 win project', function () {
+        xit('spec.2d should build 8.1 win project', function () {
             shell.exec(buildScriptPath + ' --appx=8.1-win', { silent: silent });
             _expectExist(/.*Windows.*\.appxupload/);
         });
 
-        it('spec.2e should build 8.1 phone project', function () {
+        xit('spec.2e should build 8.1 phone project', function () {
             shell.exec(buildScriptPath + ' --appx=8.1-phone', { silent: silent });
             _expectExist(/.*Phone.*\.appxupload/);
         });
 
-        it('spec.2f should build 8.1 win + phone project', function () {
+        xit('spec.2f should build 8.1 win + phone project', function () {
             shell.exec(buildScriptPath + ' --appx=8.1', { silent: silent });
             _expectExist(/.*Windows.*\.appxupload/);
             _expectExist(/.*Phone.*\.appxupload/);
@@ -191,23 +191,23 @@ describe('Cordova create and build', function () {
 
         // --archs
 
-        it('spec.3b should build project (8.1) for particular CPU', function () {
+        xit('spec.3b should build project (8.1) for particular CPU', function () {
             shell.exec(buildScriptPath + ' --appx=8.1 --archs=\"x64\"', { silent: silent }); /* eslint no-useless-escape : 0 */
             _expectExist(/.*Phone.*x64.*\.appxupload/);
             _expectExist(/.*Windows.*x64.*\.appxupload/);
         });
 
-        it('spec.3c should build project (8.1-win) for particular CPU', function () {
+        xit('spec.3c should build project (8.1-win) for particular CPU', function () {
             shell.exec(buildScriptPath + ' --appx=8.1-win --archs=\"x64\"', { silent: silent }); /* eslint no-useless-escape : 0 */
             _expectExist(/.*Windows.*x64.*\.appxupload/);
         });
 
-        it('spec.3d should build project (8.1-phone) for particular CPU', function () {
+        xit('spec.3d should build project (8.1-phone) for particular CPU', function () {
             shell.exec(buildScriptPath + ' --appx=8.1-phone --archs=\"x64\"', { silent: silent }); /* eslint no-useless-escape : 0 */
             _expectExist(/.*Phone.*x64.*\.appxupload/);
         });
 
-        it('spec.4b should build project (8.1) for CPUs separated by whitespaces', function () {
+        xit('spec.4b should build project (8.1) for CPUs separated by whitespaces', function () {
             shell.exec(buildScriptPath + ' --appx=8.1 --archs=\"x64 x86 arm anycpu\"', { silent: silent }); /* eslint no-useless-escape : 0 */
             _expectExist(/.*Phone.*x86.*\.appxupload/);
             _expectExist(/.*Phone.*x64.*\.appxupload/);
@@ -221,7 +221,7 @@ describe('Cordova create and build', function () {
 
         // "InProcessServer extension"
 
-        it('spec.5b should build project (8.1) containing plugin with InProcessServer extension', function () {
+        xit('spec.5b should build project (8.1) containing plugin with InProcessServer extension', function () {
             var extensionsPluginInfo, api;
 
             extensionsPluginInfo = new PluginInfo(extensionsPlugin);
@@ -240,7 +240,7 @@ describe('Cordova create and build', function () {
 
         // --release --bundle
 
-        it('spec.6b should generate appxupload and appxbundle for Windows Phone 8.1 project bundle release build', function () {
+        xit('spec.6b should generate appxupload and appxbundle for Windows Phone 8.1 project bundle release build', function () {
             shell.exec(buildScriptPath + ' --release --appx=8.1-phone --bundle --archs=\"x64 x86 arm\"', { silent: silent });
             _expectExist(/.*bundle\.appxupload$/, 3);
             _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_Test', 'CordovaApp.Phone_1.0.0.0_x64_x86_arm.appxbundle');
@@ -248,7 +248,7 @@ describe('Cordova create and build', function () {
 
         // --release (non-bundle)
 
-        it('spec.8 for a non-bundle case for Windows Phone 8.1 it should build appx in separate dirs for each architecture', function () {
+        xit('spec.8 for a non-bundle case for Windows Phone 8.1 it should build appx in separate dirs for each architecture', function () {
             shell.exec(buildScriptPath + ' --release --appx=8.1-phone --phone --archs=\"x86 arm\"', { silent: silent });
             _expectExist(/.*\.appxupload$/, 2);
             _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_arm_Test', 'CordovaApp.Phone_1.0.0.0_arm.appx');
diff --git a/spec/unit/build.spec.js b/spec/unit/build.spec.js
index 4023ea1..c4ae315 100644
--- a/spec/unit/build.spec.js
+++ b/spec/unit/build.spec.js
@@ -257,7 +257,7 @@ describe('run method', function () {
         );
     });
 
-    it('spec.9 should call buildProject of MSBuildTools if built for windows 8.1', function () {
+    xit('spec.9 should call buildProject of MSBuildTools if built for windows 8.1', function () {
         var buildSpy = jasmine.createSpy();
 
         createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
@@ -284,7 +284,7 @@ describe('run method', function () {
         );
     });
 
-    it('spec.11 should call buildProject of MSBuildTools if built for windows phone 8.1', function () {
+    xit('spec.11 should call buildProject of MSBuildTools if built for windows phone 8.1', function () {
         var buildSpy = jasmine.createSpy();
 
         createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
@@ -311,7 +311,7 @@ describe('run method', function () {
         );
     });
 
-    it('spec.13a should be able to override target via --appx parameter', function () {
+    xit('spec.13a should be able to override target via --appx parameter', function () {
         var buildSpy = jasmine.createSpy().and.callFake(function (solutionFile, buildType, buildArch) {
             // check that we build Windows 10 and not Windows 8.1
             expect(solutionFile.toLowerCase()).toMatch('cordovaapp.windows10.jsproj');
@@ -327,7 +327,7 @@ describe('run method', function () {
             });
     });
 
-    it('spec.13b should be able to override target via --appx parameter', function () {
+    xit('spec.13b should be able to override target via --appx parameter', function () {
         var buildSpy = jasmine.createSpy().and.callFake(function (solutionFile, buildType, buildArch) {
             // check that we build Windows 10 and not Windows 8.1
             expect(solutionFile.toLowerCase()).toMatch('cordovaapp.windows10.jsproj');
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index ebedaa9..68b4797 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -100,8 +100,7 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
         case '8.0':
             throw new CordovaError('windows8 platform is deprecated. To use windows-target-version=8.0 you must downgrade to cordova-windows@4.');
         case '8.1':
-            targets.push(projFiles.win);
-            break;
+            throw new CordovaError('windows8.1 platform is deprecated. To use windows-target-version=8.1 you must downgrade to cordova-windows@7.');
         case '10.0':
         case 'uap':
         case 'uwp':
@@ -117,8 +116,7 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
         var windowsPhoneTargetVersion = configXML.getWindowsPhoneTargetVersion();
         switch (windowsPhoneTargetVersion.toLowerCase()) {
         case '8.1':
-            targets.push(projFiles.phone);
-            break;
+            throw new CordovaError('windows-phone 8.1 platform is deprecated - to use, downgrade to cordova-windows@7.');
         case '10.0':
         case 'uap':
         case 'uwp':
@@ -137,15 +135,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
     // apply build target override if one was specified
     if (projOverride) {
         switch (projOverride.toLowerCase()) {
-        case '8.1':
-            targets = [projFiles.win, projFiles.phone];
-            break;
-        case '8.1-phone':
-            targets = [projFiles.phone];
-            break;
-        case '8.1-win':
-            targets = [projFiles.win];
-            break;
         case 'uap':
         case 'uwp':
             targets = [projFiles.win10];
diff --git a/template/cordova/run b/template/cordova/run
index 704b37f..ed4da01 100644
--- a/template/cordova/run
+++ b/template/cordova/run
@@ -41,9 +41,8 @@ if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) > -1) {
     console.log('                    architectures are used.');
     console.log('    --phone, --win');
     console.log('                  : Specifies project type to deploy');
-    console.log('    --appx=<8.1-win|8.1-phone|uap|uwp>');
-    console.log('                  : Overrides windows-target-version to build Windows 8.1, ');
-    console.log('                              Windows Phone 8.1, or Windows 10.');
+    console.log('    --appx=<uap|uwp>');
+    console.log('                  : Overrides windows-target-version');
     console.log('    --win10tools  : Uses Windows 10 deployment tools (used for a Windows 8.1 app when');
     console.log('                         being deployed to a Windows 10 device)');
     console.log('Examples:');
@@ -54,7 +53,7 @@ if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) > -1) {
     console.log('    run --device --release');
     console.log('    run --emulator --debug');
     console.log('    run --archs="x64 x86 arm" --no-bundle');
-    console.log('    run --device --appx=phone-8.1');
+    console.log('    run --device --appx=uwp');
     console.log('    run --device --archs="x64 x86 arm"');
     console.log('');
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 04/07: add FUTURE TBD comments to build.js

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 3858323436dcee3e5712aceea328ec2c9cfe4e29
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:33 2019 -0500

    add FUTURE TBD comments to build.js
---
 template/cordova/lib/build.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index d0efc1a..98b61ad 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -109,6 +109,7 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
         }
     }
 
+    // FUTURE TBD consider deprecating `phone` option for future removal
     // Windows Phone
     if (isPhoneSwitch || noSwitches) { // if --phone or no arg
         var windowsPhoneTargetVersion = configXML.getWindowsPhoneTargetVersion();
@@ -178,6 +179,7 @@ function parseAndValidateArgs (options) {
     var args = nopt({
         'archs': [String],
         'appx': String,
+        // FUTURE TBD consider deprecating `phone` option for future removal
         'phone': Boolean,
         'win': Boolean,
         'bundle': Boolean,
@@ -206,6 +208,7 @@ function parseAndValidateArgs (options) {
     var archs = options.archs || args.archs;
     config.buildArchs = archs ? archs.toLowerCase().split(' ') : ['anycpu'];
 
+    // FUTURE TBD consider deprecating `phone` option for future removal
     config.phone = !!args.phone;
     config.win = !!args.win;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 05/07: remove handling of Windows 8.1 jsproj file

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 98d225eb318ca3a6db703782e028e19e93d755f6
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:44 2019 -0500

    remove handling of Windows 8.1 jsproj file
---
 template/cordova/lib/MSBuildTools.js | 7 +++----
 template/cordova/lib/build.js        | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 4b6858f..ba7de80 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -255,20 +255,19 @@ module.exports.getLatestMSBuild = function () {
 };
 
 var projFiles = {
-    win: 'CordovaApp.Windows.jsproj',
     win10: 'CordovaApp.Windows10.jsproj'
 };
 
 // TODO: Fix this so that it outlines supported versions based on version criteria:
 // - v15.5: Windows 10 only
 // - v15.x: TBD
-// - v14: Windows 8.1, Windows 10
+// - v14: Windows 8.1 (no longer supported), Windows 10
 function msBuild14TargetsFilter (target) {
-    return target === projFiles.win || target === projFiles.win10;
+    return target === projFiles.win10;
 }
 
 function msBuild15TargetsFilter (target) {
-    return target === projFiles.win || target === projFiles.win10;
+    return target === projFiles.win10;
 }
 
 function msBuild155TargetsFilter (target) {
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 98b61ad..9581170 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -33,11 +33,9 @@ var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;
 
 var projFiles = {
-    win: 'CordovaApp.Windows.jsproj',
     win10: 'CordovaApp.Windows10.jsproj'
 };
 var projFilesToManifests = {
-    'CordovaApp.Windows.jsproj': 'package.windows.appxmanifest',
     'CordovaApp.Windows10.jsproj': 'package.windows10.appxmanifest'
 };
 
@@ -152,8 +150,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
             case projFiles.win10:
                 buildConfig.targetProject = 'windows10';
                 break;
-            case projFiles.win:
-                /* falls through */
             default:
                 buildConfig.targetProject = 'windows';
                 break;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-windows] 01/07: Update README with Windows 10 requirement

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brodybits pushed a commit to branch brodybits-uwp-only-test-wip0601
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit dd3ec581bd0e48d651732e35c8c9ae595c3c398c
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 23:44:03 2019 -0500

    Update README with Windows 10 requirement
    
    Co-authored-by: Jan Piotrowski <pi...@gmail.com>
    Co-authored-by: Christopher J. Brody <ch...@brody.consulting>
---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6297821..6b686b8 100644
--- a/README.md
+++ b/README.md
@@ -25,14 +25,18 @@
 [![Build Status](https://travis-ci.org/apache/cordova-windows.svg?branch=master)](https://travis-ci.org/apache/cordova-windows)
 [![codecov.io](https://codecov.io/github/apache/cordova-windows/coverage.svg?branch=master)](https://codecov.io/github/apache/cordova-windows?branch=master)
 
-This repo contains the code for an [Apache Cordova](http://cordova.apache.org) platform that allows you to build applications that target Windows 10, and Windows 8.1, as well as Windows Phone 8.1. An Apache Cordova based applications is written in HTML, CSS and JavaScript.
+This repo contains the code for an [Apache Cordova](http://cordova.apache.org) platform that allows you to build applications that target Windows 10. An Apache Cordova based applications is written in HTML, CSS and JavaScript.
 
-(Warning: Windows 8 has been deprecated, please update your applications to target Windows 8.1 or above)
+(Warning: Windows 8 and Windows 8.1 has been deprecated, please update your applications to target Windows 10 or above)
 
 [Apache Cordova](http://cordova.apache.org) is a project of [The Apache Software Foundation (ASF)](http://apache.org)
 
 # Requirements
 
+Host OS: Windows 10
+
+Install the tools: [Visual Studio](http://www.visualstudio.com/downloads)
+
 See https://cordova.apache.org/docs/en/dev/guide/platforms/windows/index.html#requirements-and-support
 
 Note that Visual Studio 2019 is not supported, as discussed in [cordova-windows issue #327](https://github.com/apache/cordova-windows/issues/327).


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org