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/22 19:54:17 UTC
[cordova-windows] branch brodybits-uwp-only-test-wip0201 updated
(beafe26 -> fca282c)
This is an automated email from the ASF dual-hosted git repository.
brodybits pushed a change to branch brodybits-uwp-only-test-wip0201
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git.
from beafe26 Remove support for super-old VS13
new 766e4f4 update unit tests for build tools version 15.0
new 07ad7a4 AppVeyor drop build tools v14.0 & Visual Studio 2015
new fca282c Remove support for VS 14 (Visual Studio 2015)
The 3 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:
appveyor.yml | 7 -------
spec/unit/build.spec.js | 18 +++++++++---------
template/cordova/lib/MSBuildTools.js | 12 +++---------
3 files changed, 12 insertions(+), 25 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 01/03: update unit tests for build tools version
15.0
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-wip0201
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 766e4f42c2a2193f3e2ce89dc8e34eced1392042
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 14:50:02 2019 -0500
update unit tests for build tools version 15.0
---
spec/unit/build.spec.js | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/spec/unit/build.spec.js b/spec/unit/build.spec.js
index e18c951..e814a52 100644
--- a/spec/unit/build.spec.js
+++ b/spec/unit/build.spec.js
@@ -113,7 +113,7 @@ describe('run method', function () {
// utils.isCordovaProject is a spy, so we can call andReturn directly on it
utils.isCordovaProject.and.returnValue(false);
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
+ createFindAllAvailableVersionsMock([{ version: '15.0', buildProject: buildSpy, path: testPath }]);
return build.run([ 'node', buildPath, '--release', '--debug' ]).then(
() => fail('Expected promise to be rejected'),
@@ -143,7 +143,7 @@ describe('run method', function () {
it('should respect build configuration from \'buildConfig\' option', function () {
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: jasmine.createSpy(), path: testPath }]);
+ createFindAllAvailableVersionsMock([{ version: '15.0', buildProject: jasmine.createSpy(), path: testPath }]);
var buildConfigPath = path.resolve(__dirname, 'fixtures/fakeBuildConfig.json');
return build.run({ buildConfig: buildConfigPath })
@@ -167,7 +167,7 @@ describe('run method', function () {
expect(buildType).toBe('release');
});
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
+ createFindAllAvailableVersionsMock([{ version: '15.0', buildProject: buildSpy, path: testPath }]);
return build.run({ release: true })
.finally(function () {
@@ -180,7 +180,7 @@ describe('run method', function () {
expect(buildType).toBe('debug');
});
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
+ createFindAllAvailableVersionsMock([{ version: '15.0', buildProject: buildSpy, path: testPath }]);
return build.run([ 'node', buildPath ])
.finally(function () {
@@ -193,7 +193,7 @@ describe('run method', function () {
expect(buildArch).toBe('arm');
});
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
+ createFindAllAvailableVersionsMock([{ version: '15.0', buildProject: buildSpy, path: testPath }]);
return build.run({ archs: 'arm' })
.finally(function () {
@@ -209,7 +209,7 @@ describe('run method', function () {
createFindAllAvailableVersionsMock([
{
- version: '14.0',
+ version: '15.0',
path: testPath,
buildProject: function (solutionFile, buildType, buildArch) {
expect(buildArch).toMatch(/^arm$|^any\s?cpu$|^x86$|^x64$/);
@@ -339,7 +339,7 @@ describe('run method', function () {
});
it('spec.15a should choose latest version if there are multiple versions available with minor version difference', function () {
- var buildTools14 = { version: '14.0', buildProject: jasmine.createSpy('buildTools14'), path: testPath };
+ var buildTools14 = { version: '15.0', buildProject: jasmine.createSpy('buildTools14'), path: testPath };
var buildTools15 = { version: '15.0', buildProject: jasmine.createSpy('buildTools15'), path: testPath };
var buildTools151 = { version: '15.1', buildProject: jasmine.createSpy('buildTools151'), path: testPath };
@@ -352,7 +352,7 @@ describe('run method', function () {
});
it('spec.15b should choose latest version if there are multiple versions available with minor version difference', function () {
- var buildTools14 = { version: '14.0', buildProject: jasmine.createSpy('buildTools14'), path: testPath };
+ var buildTools14 = { version: '15.0', buildProject: jasmine.createSpy('buildTools14'), path: testPath };
var buildTools15 = { version: '15.0', buildProject: jasmine.createSpy('buildTools15'), path: testPath };
var buildTools151 = { version: '15.1', buildProject: jasmine.createSpy('buildTools151'), path: testPath };
@@ -405,7 +405,7 @@ describe('buildFlags', function () {
});
it('should pass buildFlags directly to MSBuild', function () {
- var buildTools = { version: '14.0', buildProject: jasmine.createSpy('buildProject').and.returnValue(Q()), path: testPath };
+ var buildTools = { version: '15.0', buildProject: jasmine.createSpy('buildProject').and.returnValue(Q()), path: testPath };
var buildOptions = {
argv: ['--buildFlag', 'foo=bar']
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 02/03: AppVeyor drop build tools v14.0 & Visual
Studio 2015
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-wip0201
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 07ad7a48391e90ce6a8cefad2cfb1a8cba92a04d
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 14:51:53 2019 -0500
AppVeyor drop build tools v14.0 & Visual Studio 2015
---
appveyor.yml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index b241f46..37777c3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,13 +28,6 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
MSBUILDDIR: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\"
- - nodejs_version: "6"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- MSBUILDDIR: "C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\"
-
- - nodejs_version: "6"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
install:
- ps: Install-Product node $env:nodejs_version
- npm install
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 03/03: Remove support for VS 14 (Visual Studio
2015)
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-wip0201
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit fca282cf6f732d4dd63a253da66be5254c8be2e4
Author: Christopher J. Brody <ch...@brody.consulting>
AuthorDate: Sun Dec 22 14:53:15 2019 -0500
Remove support for VS 14 (Visual Studio 2015)
with an updated error message
and update a comment regarding the Visual Studio build tooling
Co-authored-by: Jan Piotrowski <pi...@gmail.com>
Co-authored-by: Christopher J. Brody <ch...@brody.consulting>
---
template/cordova/lib/MSBuildTools.js | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 68ea01d..4c09563 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -260,12 +260,8 @@ var projFiles = {
win10: 'CordovaApp.Windows10.jsproj'
};
-// TODO: Fix this so that it outlines supported versions based on version criteria:
-// - v14: Windows 8.1, Windows 10
-// - v12: Windows 8.1
-function msBuild14TargetsFilter (target) {
- return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
-}
+// NOTE: build tools starting with v15 target Windows 10
+// (UWP for Windows 10 desktop and mobile) only.
function msBuild15TargetsFilter (target) {
return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
@@ -283,7 +279,6 @@ function filterSupportedTargets (targets, msbuild) {
}
var targetFilters = {
- '14.0': msBuild14TargetsFilter,
'15.x': msBuild15TargetsFilter,
'15.5': msBuild155TargetsFilter,
get: function (version) {
@@ -303,8 +298,7 @@ function filterSupportedTargets (targets, msbuild) {
// unsupported targets have been detected
if (supportedTargets.length !== targets.length) {
events.emit('warn', 'Not all desired build targets are compatible with the current build environment. ' +
- 'Please install Visual Studio 2015 for Windows 8.1 and Windows 10, ' +
- 'or Visual Studio 2013 Update 2 for Windows 8.1.');
+ 'Please install Visual Studio 2017.');
}
return supportedTargets;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org