@microsoft/windows-admin-center-sdk 2.186.0 → 2.296.0

package/tools/gulp-ps-resjson/index.js

@@ -50,10 +50,6 @@ function gulpPsResjson(options) {
                 }
                 var path = Path.parse(file.path);
                 var segments = path.dir.split('\\');
-                segments.length = segments.length - options.localeOffset;
-                var fullDir = segments.join('\\');
-                segments.length = segments.length - 1;
-                var baseDir = segments.join('\\');
                 if (masterEnglish) {
                     // collect master data, no output from the first file.
                     if (nestedObject) {
@@ -79,98 +75,107 @@ function gulpPsResjson(options) {
                         }
                     }
                     masterEnglish = false;
+                    segments.push('en-US');
+                }
+                var fullDir = segments.join('\\');
+                segments.length--;
+                var baseDir = segments.join('\\');
+                var copyData = tslib_1.__assign({}, masterData);
+                if (fullDir.endsWith('en-US')) {
+                    // override en-US string by current strings.resjson
+                    var names = Object.keys(masterData);
+                    try {
+                        for (var names_1 = tslib_1.__values(names), names_1_1 = names_1.next(); !names_1_1.done; names_1_1 = names_1.next()) {
+                            var name_2 = names_1_1.value;
+                            lines.push(name_2 + '=' + masterData[name_2]);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (names_1_1 && !names_1_1.done && (_b = names_1.return)) _b.call(names_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
                 }
                 else {
-                    var copyData = tslib_1.__assign({}, masterData);
-                    if (fullDir.endsWith('en-US')) {
-                        // override en-US string by current strings.resjson
-                        var names = Object.keys(masterData);
+                    if (nestedObject) {
+                        var names2 = Object.keys(nestedObject);
                         try {
-                            for (var names_1 = tslib_1.__values(names), names_1_1 = names_1.next(); !names_1_1.done; names_1_1 = names_1.next()) {
-                                var name_2 = names_1_1.value;
-                                lines.push(name_2 + '=' + masterData[name_2]);
+                            for (var names2_1 = tslib_1.__values(names2), names2_1_1 = names2_1.next(); !names2_1_1.done; names2_1_1 = names2_1.next()) {
+                                var name_3 = names2_1_1.value;
+                                lines.push(name_3 + '=' + nestedObject[name_3]);
+                                if (copyData[name_3]) {
+                                    delete copyData[name_3];
+                                }
                             }
                         }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
-                                if (names_1_1 && !names_1_1.done && (_b = names_1.return)) _b.call(names_1);
+                                if (names2_1_1 && !names2_1_1.done && (_c = names2_1.return)) _c.call(names2_1);
                             }
-                            finally { if (e_2) throw e_2.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                     }
                     else {
-                        if (nestedObject) {
-                            var names2 = Object.keys(nestedObject);
-                            try {
-                                for (var names2_1 = tslib_1.__values(names2), names2_1_1 = names2_1.next(); !names2_1_1.done; names2_1_1 = names2_1.next()) {
-                                    var name_3 = names2_1_1.value;
-                                    lines.push(name_3 + '=' + nestedObject[name_3]);
-                                    if (copyData[name_3]) {
-                                        delete copyData[name_3];
+                        var keys = Object.keys(dataObject);
+                        try {
+                            for (var keys_2 = tslib_1.__values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
+                                var key = keys_2_1.value;
+                                if (key.startsWith(prefix)) {
+                                    var name_4 = key.substring(prefix.length);
+                                    lines.push(name_4 + '=' + dataObject[key]);
+                                    if (copyData[name_4]) {
+                                        delete copyData[name_4];
                                     }
                                 }
                             }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                            finally {
-                                try {
-                                    if (names2_1_1 && !names2_1_1.done && (_c = names2_1.return)) _c.call(names2_1);
-                                }
-                                finally { if (e_3) throw e_3.error; }
-                            }
                         }
-                        else {
-                            var keys = Object.keys(dataObject);
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
                             try {
-                                for (var keys_2 = tslib_1.__values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
-                                    var key = keys_2_1.value;
-                                    if (key.startsWith(prefix)) {
-                                        var name_4 = key.substring(prefix.length);
-                                        lines.push(name_4 + '=' + dataObject[key]);
-                                        if (copyData[name_4]) {
-                                            delete copyData[name_4];
-                                        }
-                                    }
-                                }
-                            }
-                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                            finally {
-                                try {
-                                    if (keys_2_1 && !keys_2_1.done && (_d = keys_2.return)) _d.call(keys_2);
-                                }
-                                finally { if (e_4) throw e_4.error; }
+                                if (keys_2_1 && !keys_2_1.done && (_d = keys_2.return)) _d.call(keys_2);
                             }
+                            finally { if (e_4) throw e_4.error; }
                         }
-                        // if there is any missing data, add into the lines.
-                        // when changed a string but not changed the key, it needs to wait for localization
-                        // build to update locale language strings.
-                        var names = Object.keys(copyData);
-                        try {
-                            for (var names_2 = tslib_1.__values(names), names_2_1 = names_2.next(); !names_2_1.done; names_2_1 = names_2.next()) {
-                                var name_5 = names_2_1.value;
-                                lines.push(name_5 + '=' + copyData[name_5]);
-                            }
+                    }
+                    // if there is any missing data, add into the lines.
+                    // when changed a string but not changed the key, it needs to wait for localization
+                    // build to update locale language strings.
+                    var names = Object.keys(copyData);
+                    try {
+                        for (var names_2 = tslib_1.__values(names), names_2_1 = names_2.next(); !names_2_1.done; names_2_1 = names_2.next()) {
+                            var name_5 = names_2_1.value;
+                            lines.push(name_5 + '=' + copyData[name_5]);
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                        finally {
-                            try {
-                                if (names_2_1 && !names_2_1.done && (_e = names_2.return)) _e.call(names_2);
-                            }
-                            finally { if (e_5) throw e_5.error; }
+                    }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    finally {
+                        try {
+                            if (names_2_1 && !names_2_1.done && (_e = names_2.return)) _e.call(names_2);
                         }
+                        finally { if (e_5) throw e_5.error; }
                     }
-                    if (lines.length > 0) {
-                        // if there is no data, don't create locale file.
-                        content = 'ConvertFrom-StringData @\'\r\n' + lines.join('\r\n') + '\r\n\'@\r\n';
-                        var jsonFile = new Vinyl({
-                            cwd: '/',
-                            base: baseDir,
-                            path: fullDir + '\\' + path.name + '.psd1',
-                            contents: buffer_1.Buffer.from(content, 'utf8')
-                        });
-                        // tslint:disable-next-line:no-invalid-this
-                        this.push(jsonFile);
+                }
+                if (lines.length > 0) {
+                    // if there is no data, don't create locale file.
+                    // validate the folder name once again. It could happen when different folder structure is used in future.
+                    var checkSegments = fullDir.split('\\');
+                    var locale = checkSegments[checkSegments.length - 1];
+                    var localeList = ['en-US', 'cs-CZ', 'de-DE', 'es-ES', 'fr-FR', 'hu-HU', 'it-IT', 'ja-JP', 'ko-KR', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW'];
+                    if (localeList.indexOf(locale) < 0 || fullDir !== baseDir + "\\" + locale) {
+                        throw new Error("Output folder includes a wrong locale name. " + locale);
                     }
+                    content = 'ConvertFrom-StringData @\'\r\n' + lines.join('\r\n') + '\r\n\'@\r\n';
+                    var jsonFile = new Vinyl({
+                        cwd: '/',
+                        base: baseDir,
+                        path: fullDir + '\\' + path.name + '.psd1',
+                        contents: buffer_1.Buffer.from(content, 'utf8')
+                    });
+                    // tslint:disable-next-line:no-invalid-this
+                    this.push(jsonFile);
                 }
             }
         }

package/tools/gulp-ps-resjson/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../packages/tools/gulp-ps-resjson/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["'use strict';\r\n\r\nimport { Buffer } from 'buffer';\r\nimport Path = require('path');\r\nimport pluginError = require('plugin-error');\r\nimport through2 = require('through2');\r\nimport Vinyl = require('vinyl');\r\nimport util = require('../utilities');\r\n\r\nconst PLUGIN_NAME = 'gulp-ps-resjson';\r\n\r\ninterface Options {\r\n    /**\r\n     * specify the resource name.\r\n     */\r\n    resourceName: string;\r\n\r\n    /**\r\n     * specify the conversion is Localized file with folder offset.\r\n     */\r\n    localeOffset?: number;\r\n}\r\n\r\nfunction gulpPsResjson(options: Options) {\r\n    // first file is not loc file but original strings.resjson\r\n    // if there is any missing property, add the property to output psd1 file.\r\n    let masterEnglish = true;\r\n    let masterData = {};\r\n\r\n    // override options settings if not specified.\r\n    options = options || <Options>{};\r\n    if (typeof options.localeOffset !== 'number') {\r\n        options.localeOffset = 1;\r\n    }\r\n\r\n    return through2.obj(\r\n        /**\r\n         * Transform\r\n         */\r\n        function (file, encoding, callback) {\r\n            let error = null;\r\n            try {\r\n                if (file.isNull()) {\r\n                    // nothing to do\r\n                    return callback(null, file);\r\n                }\r\n\r\n                if (file.isStream()) {\r\n                    // file.contents is a Stream - https://nodejs.org/api/stream.html\r\n                    // tslint:disable-next-line:no-invalid-this\r\n                    this.emit('error', new pluginError(PLUGIN_NAME, 'Streams not supported!'));\r\n                    return callback(null, file);\r\n                } else if (file.isBuffer()) {\r\n                    let nestedObject = null;\r\n                    const lines = [];\r\n                    const prefix = options.resourceName + '_PowerShell_';\r\n                    let content = file.contents.toString('utf8');\r\n                    // Remove comments, /* multiline comment */ and // one line comment and \"//\": \"JSON element comment\"\r\n                    content = content.replace(/(\\/\\*([^*]|[\\n]|(\\*+([^*/]|[\\n])))*\\*\\/+)|( +\\/\\/.*)|(  +\\\"\\/\\/\\\".*)/g, '');\r\n                    const dataObject = JSON.parse(content);\r\n                    if (dataObject[options.resourceName] && dataObject[options.resourceName]['PowerShell']) {\r\n                        // if nested format, use nestedObject.\r\n                        nestedObject = dataObject[options.resourceName]['PowerShell'];\r\n                    }\r\n\r\n                    const path = Path.parse(file.path);\r\n                    const segments = path.dir.split('\\\\');\r\n                    segments.length = segments.length - options.localeOffset;\r\n                    const fullDir = segments.join('\\\\');\r\n                    segments.length = segments.length - 1;\r\n                    const baseDir = segments.join('\\\\');\r\n\r\n                    if (masterEnglish) {\r\n                        // collect master data, no output from the first file.\r\n                        if (nestedObject) {\r\n                            masterData = nestedObject;\r\n                        } else {\r\n                            const keys = Object.keys(dataObject);\r\n                            for (const key of keys) {\r\n                                if (key.startsWith(prefix)) {\r\n                                    const name = key.substring(prefix.length);\r\n                                    masterData[name] = dataObject[key];\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        masterEnglish = false;\r\n                    } else {\r\n                        const copyData = { ...{}, ...masterData };\r\n                        if (fullDir.endsWith('en-US')) {\r\n                            // override en-US string by current strings.resjson\r\n                            const names = Object.keys(masterData);\r\n                            for (const name of names) {\r\n                                lines.push(name + '=' + masterData[name]);\r\n                            }\r\n                        } else {\r\n                            if (nestedObject) {\r\n                                const names2 = Object.keys(nestedObject);\r\n                                for (const name of names2) {\r\n                                    lines.push(name + '=' + nestedObject[name]);\r\n                                    if (copyData[name]) {\r\n                                        delete copyData[name];\r\n                                    }\r\n                                }\r\n                            } else {\r\n                                const keys = Object.keys(dataObject);\r\n                                for (const key of keys) {\r\n                                    if (key.startsWith(prefix)) {\r\n                                        const name = key.substring(prefix.length);\r\n                                        lines.push(name + '=' + dataObject[key]);\r\n                                        if (copyData[name]) {\r\n                                            delete copyData[name];\r\n                                        }\r\n                                    }\r\n                                }\r\n                            }\r\n\r\n                            // if there is any missing data, add into the lines.\r\n                            // when changed a string but not changed the key, it needs to wait for localization\r\n                            // build to update locale language strings.\r\n                            const names = Object.keys(copyData);\r\n                            for (const name of names) {\r\n                                lines.push(name + '=' + copyData[name]);\r\n                            }\r\n                        }\r\n\r\n                        if (lines.length > 0) {\r\n                            // if there is no data, don't create locale file.\r\n                            content = 'ConvertFrom-StringData @\\'\\r\\n' + lines.join('\\r\\n') + '\\r\\n\\'@\\r\\n';\r\n                            const jsonFile = new Vinyl({\r\n                                cwd: '/',\r\n                                base: baseDir,\r\n                                path: fullDir + '\\\\' + path.name + '.psd1',\r\n                                contents: Buffer.from(content, 'utf8')\r\n                            });\r\n                            // tslint:disable-next-line:no-invalid-this\r\n                            this.push(jsonFile);\r\n                        }\r\n                    }\r\n                }\r\n            } catch (e) {\r\n                error = (!e.plugin || (e.plugin !== PLUGIN_NAME)) ?\r\n                    util.extendError(new pluginError({ plugin: PLUGIN_NAME, message: e.message }), e) : e;\r\n            }\r\n\r\n            callback(error);\r\n        });\r\n}\r\n\r\nmodule.exports = gulpPsResjson;\r\n"]}
+{"version":3,"sources":["../../../packages/tools/gulp-ps-resjson/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["'use strict';\r\n\r\nimport { Buffer } from 'buffer';\r\nimport Path = require('path');\r\nimport pluginError = require('plugin-error');\r\nimport through2 = require('through2');\r\nimport Vinyl = require('vinyl');\r\nimport util = require('../utilities');\r\n\r\nconst PLUGIN_NAME = 'gulp-ps-resjson';\r\n\r\ninterface Options {\r\n    /**\r\n     * specify the resource name.\r\n     */\r\n    resourceName: string;\r\n\r\n    /**\r\n     * specify the conversion is Localized file with folder offset.\r\n     */\r\n    localeOffset?: number;\r\n}\r\n\r\nfunction gulpPsResjson(options: Options) {\r\n    // first file is not loc file but original strings.resjson\r\n    // if there is any missing property, add the property to output psd1 file.\r\n    let masterEnglish = true;\r\n    let masterData = {};\r\n\r\n    // override options settings if not specified.\r\n    options = options || <Options>{};\r\n    if (typeof options.localeOffset !== 'number') {\r\n        options.localeOffset = 1;\r\n    }\r\n\r\n    return through2.obj(\r\n        /**\r\n         * Transform\r\n         */\r\n        function (file, encoding, callback) {\r\n            let error = null;\r\n            try {\r\n                if (file.isNull()) {\r\n                    // nothing to do\r\n                    return callback(null, file);\r\n                }\r\n\r\n                if (file.isStream()) {\r\n                    // file.contents is a Stream - https://nodejs.org/api/stream.html\r\n                    // tslint:disable-next-line:no-invalid-this\r\n                    this.emit('error', new pluginError(PLUGIN_NAME, 'Streams not supported!'));\r\n                    return callback(null, file);\r\n                } else if (file.isBuffer()) {\r\n                    let nestedObject = null;\r\n                    const lines = [];\r\n                    const prefix = options.resourceName + '_PowerShell_';\r\n                    let content = file.contents.toString('utf8');\r\n                    // Remove comments, /* multiline comment */ and // one line comment and \"//\": \"JSON element comment\"\r\n                    content = content.replace(/(\\/\\*([^*]|[\\n]|(\\*+([^*/]|[\\n])))*\\*\\/+)|( +\\/\\/.*)|(  +\\\"\\/\\/\\\".*)/g, '');\r\n                    const dataObject = JSON.parse(content);\r\n                    if (dataObject[options.resourceName] && dataObject[options.resourceName]['PowerShell']) {\r\n                        // if nested format, use nestedObject.\r\n                        nestedObject = dataObject[options.resourceName]['PowerShell'];\r\n                    }\r\n\r\n                    const path = Path.parse(file.path);\r\n                    const segments = path.dir.split('\\\\');\r\n                    if (masterEnglish) {\r\n                        // collect master data, no output from the first file.\r\n                        if (nestedObject) {\r\n                            masterData = nestedObject;\r\n                        } else {\r\n                            const keys = Object.keys(dataObject);\r\n                            for (const key of keys) {\r\n                                if (key.startsWith(prefix)) {\r\n                                    const name = key.substring(prefix.length);\r\n                                    masterData[name] = dataObject[key];\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        masterEnglish = false;\r\n                        segments.push('en-US');\r\n                    }\r\n\r\n                    const fullDir = segments.join('\\\\');\r\n                    segments.length--;\r\n                    const baseDir = segments.join('\\\\');\r\n\r\n                    const copyData = { ...{}, ...masterData };\r\n                    if (fullDir.endsWith('en-US')) {\r\n                        // override en-US string by current strings.resjson\r\n                        const names = Object.keys(masterData);\r\n                        for (const name of names) {\r\n                            lines.push(name + '=' + masterData[name]);\r\n                        }\r\n                    } else {\r\n                        if (nestedObject) {\r\n                            const names2 = Object.keys(nestedObject);\r\n                            for (const name of names2) {\r\n                                lines.push(name + '=' + nestedObject[name]);\r\n                                if (copyData[name]) {\r\n                                    delete copyData[name];\r\n                                }\r\n                            }\r\n                        } else {\r\n                            const keys = Object.keys(dataObject);\r\n                            for (const key of keys) {\r\n                                if (key.startsWith(prefix)) {\r\n                                    const name = key.substring(prefix.length);\r\n                                    lines.push(name + '=' + dataObject[key]);\r\n                                    if (copyData[name]) {\r\n                                        delete copyData[name];\r\n                                    }\r\n                                }\r\n                            }\r\n                        }\r\n\r\n                        // if there is any missing data, add into the lines.\r\n                        // when changed a string but not changed the key, it needs to wait for localization\r\n                        // build to update locale language strings.\r\n                        const names = Object.keys(copyData);\r\n                        for (const name of names) {\r\n                            lines.push(name + '=' + copyData[name]);\r\n                        }\r\n                    }\r\n\r\n                    if (lines.length > 0) {\r\n                        // if there is no data, don't create locale file.\r\n\r\n                        // validate the folder name once again. It could happen when different folder structure is used in future.\r\n                        const checkSegments = fullDir.split('\\\\');\r\n                        const locale = checkSegments[checkSegments.length - 1];\r\n                        const localeList = ['en-US', 'cs-CZ', 'de-DE', 'es-ES', 'fr-FR', 'hu-HU', 'it-IT', 'ja-JP', 'ko-KR', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW'];\r\n                        if (localeList.indexOf(locale) < 0 || fullDir !== `${baseDir}\\\\${locale}`) {\r\n                            throw new Error(`Output folder includes a wrong locale name. ${locale}`);\r\n                        }\r\n\r\n                        content = 'ConvertFrom-StringData @\\'\\r\\n' + lines.join('\\r\\n') + '\\r\\n\\'@\\r\\n';\r\n                        const jsonFile = new Vinyl({\r\n                            cwd: '/',\r\n                            base: baseDir,\r\n                            path: fullDir + '\\\\' + path.name + '.psd1',\r\n                            contents: Buffer.from(content, 'utf8')\r\n                        });\r\n                        // tslint:disable-next-line:no-invalid-this\r\n                        this.push(jsonFile);\r\n                    }\r\n                }\r\n            } catch (e) {\r\n                error = (!e.plugin || (e.plugin !== PLUGIN_NAME)) ?\r\n                    util.extendError(new pluginError({ plugin: PLUGIN_NAME, message: e.message }), e) : e;\r\n            }\r\n\r\n            callback(error);\r\n        });\r\n}\r\n\r\nmodule.exports = gulpPsResjson;\r\n"]}

package/tools/module-template/build/pipelines/codeinspector.yml

@@ -0,0 +1,27 @@
+schedules:
+- cron: "0 0 30 * *"
+  displayName: Monthly midnight build
+  branches:
+    include:
+    - main
+
+jobs:
+- job: Phase_1
+  displayName: Phase 1
+  cancelTimeoutInMinutes: 1
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - checkout: self
+    clean: true
+    persistCredentials: true
+  - task: CodeInspector@2
+    inputs:
+      ProductId: '88079879-ba3a-4bf7-8f43-5bc912c8cd04'
+  - task: PublishSecurityAnalysisLogs@3
+    inputs:
+      ArtifactName: 'CodeAnalysisLogs'
+      ArtifactType: 'Container'
+      AllTools: true
+      ToolLogsNotFoundAction: 'Standard'
+...

package/tools/module-template/gulpfile.ts/common/lint.ts

@@ -8,11 +8,11 @@ export module LintModule {
             .pipe(tslint.report({ 'emitError': true, 'reportLimit': 0, 'summarizeFailureOutput': true }));
     }
 
-    export function lintE2e() {
-        return src(['e2e/**/*.ts'])
+    export function lintUiTestAutomation() {
+        return src(['ui-test-automation/**/*.ts', '!ui-test-automation/node_modules/**/*.*'])
             .pipe(tslint())
             .pipe(tslint.report({ 'emitError': true, 'reportLimit': 0, 'summarizeFailureOutput': true }));
     }
 
-    export const lint = series(lintApp, lintE2e);
+    export const lint = series(lintApp, lintUiTestAutomation);
 }

package/tools/module-template/gulpfile.ts/common/pack.ts

@@ -2,13 +2,13 @@ import packNugetModule from '@microsoft/windows-admin-center-sdk/tools/pack-nuge
 import { Utilities } from './utilities';
 
 interface PackOptions {
-    version: boolean;
-    icon: boolean;
-    license: boolean;
-    company: boolean;
-    copyright: boolean;
-    iconUrl: boolean;
-    targetPath: boolean;
+    version: string;
+    icon: string;
+    license: string;
+    company: string;
+    copyright: string;
+    iconUrl: string;
+    targetPath: string;
 }
 
 export module PackModule {
@@ -19,31 +19,31 @@ export module PackModule {
     export function pack(cb) {
         const options = <PackOptions>{};
         if (argv['version']) {
-            options.version = argv['version'];
+            options.version = argv['version'] as string;
         }
 
         if (argv['icon']) {
-            options.icon = argv['icon'];
+            options.icon = argv['icon'] as string;
         }
 
         if (argv['license']) {
-            options.license = argv['license'];
+            options.license = argv['license'] as string;
         }
 
         if (argv['company']) {
-            options.company = argv['company'];
+            options.company = argv['company'] as string;
         }
 
         if (argv['copyright']) {
-            options.copyright = argv['copyright'];
+            options.copyright = argv['copyright'] as string;
         }
 
         if (argv['iconUrl']) {
-            options.iconUrl = argv['iconUrl'];
+            options.iconUrl = argv['iconUrl'] as string;
         }
 
         if (argv['targetPath']) {
-            options.targetPath = argv['targetPath'];
+            options.targetPath = argv['targetPath'] as string;
         }
 
         packNuget(options, cb);

package/tools/module-template/gulpfile.ts/common/ui-test-automation.ts

@@ -0,0 +1,40 @@
+import * as fs from 'fs';
+import { dest, series, src } from 'gulp';
+import ts from 'gulp-typescript';
+import { LintModule } from './lint';
+
+export module UITestAutomationModule {
+
+    export function buildUiTestAutomation() {
+        const tsProject = ts.createProject('./tsconfig.json');
+        return src(['ui-test-automation/**/*.ts', '!ui-test-automation/node_modules/**/*.*'])
+            .pipe(tsProject());
+    }
+
+    export function saveUiTestAutomation() {
+        const urlSegments = '/SME/_git/';
+        const lines = fs.readFileSync('.git/config', 'utf8').toString().split('\n');
+        let remoteSection = false;
+        let moduleName = null;
+        for (const line of lines) {
+            if (remoteSection && line.indexOf(urlSegments) >= 0) {
+                const matchIndex = line.indexOf(urlSegments);
+                moduleName = line.substring(matchIndex + urlSegments.length);
+                break;
+            }
+
+            // look for [remote "origin"] section.
+            if (line.indexOf('[remote \"origin\"]') >= 0) {
+                remoteSection = true;
+            }
+        }
+
+        return src(
+            [
+                'ui-test-automation/**/*.*'
+            ])
+            .pipe(dest('../msft-sme-ui-test-automation/src/tools/' + moduleName + '/ui-test-automation', { overwrite: true} ));
+    }
+
+    export const uiTestAutomation = series(LintModule.lintUiTestAutomation, buildUiTestAutomation);
+}

package/tools/module-template/gulpfile.ts/common/utilities.ts

@@ -8,27 +8,27 @@ export module Utilities {
         return defaultValue ? value !== false : !!value;
     }
 
-    export function gulpArgv(): { [index: string]: boolean } {
+    export function gulpArgv(): { [index: string]: boolean | string } {
         return {
             prod: toBoolean(values['prod']),
             verbose: toBoolean(values['verbose']),
             junit: toBoolean(values['junit']),
             expandCss: toBoolean(values['expandcss']),
-            target: values['target'],
-            debug: values['debug'],
+            target: values['target'] as string,
+            debug: toBoolean(values['debug']),
             styles: toBoolean(values['styles']),
             resources: toBoolean(values['resources']),
             core: toBoolean(values['core']),
             angular: toBoolean(values['angular']),
             app: toBoolean(values['app']),
             devGuide: toBoolean(values['devguide']),
-            version: values['V'],
-            icon: values['icon'],
-            license: values['license'],
-            company: values['company'],
-            copyright: values['copyright'],
-            iconUrl: values['iconUrl'],
-            targetPath: values['targetPath']
+            version: values['V'] as string,
+            icon: values['icon'] as string,
+            license: values['license'] as string,
+            company: values['company'] as string,
+            copyright: values['copyright'] as string,
+            iconUrl: values['iconUrl'] as string,
+            targetPath: values['targetPath'] as string
         };
     }
 

package/tools/module-template/gulpfile.ts/common/validate.ts

@@ -1,14 +1,24 @@
 import manifestValidatorModule from '@microsoft/windows-admin-center-sdk/tools/gulp-manifest-validator';
-import { parallel, src } from 'gulp';
+import { src } from 'gulp';
 
 export module ValidateModule {
     const manifestValidator = manifestValidatorModule as any;
 
-    // special gulp task to test the manifest validation gulp tool.
-    function testValidateManifests() {
+    /**
+     * validate the manifest.json.
+     * @returns output void.
+     */
+    export function validateManifest() {
         return src('src/manifest.json')
             .pipe(manifestValidator());
     }
 
-    export const validate = parallel(testValidateManifests);
+    /**
+     * validate the powershell-cim-config.json.
+     * @returns output void.
+     */
+    export function validatePsCimConfig() {
+        return src('src/powershell-cim-config.json')
+            .pipe(manifestValidator());
+    }
 }

package/tools/module-template/gulpfile.ts/index.ts

@@ -3,23 +3,25 @@ import { CleanModule } from './common/clean';
 import { CompileModule } from './common/compile';
 import { Config } from './common/config';
 import { CopyModule } from './common/copy';
-import { E2eModule } from './common/e2e';
 import { LintModule } from './common/lint';
 import { PackModule } from './common/pack';
 import { PowerShellModule } from './common/powershell';
 import { ResjsonModule } from './common/resjson';
 import { TestModule } from './common/test';
+import { UITestAutomationModule } from './common/ui-test-automation';
 import { ValidateModule } from './common/validate';
 import { gulpConfig } from './config-data';
 
 module IndexModule {
     const config: Config = gulpConfig();
-    
+
     // Export tasks
     export const clean = CleanModule.clean;
     export const lint = LintModule.lint;
     export const lintApp = LintModule.lintApp;
-    export const validate = ValidateModule.validate;
+    export const validateManifest = ValidateModule.validateManifest;
+    export const validatePsCimConfig = ValidateModule.validatePsCimConfig;
+    export const validate = config.powershell.skipResjson ? validateManifest : series(validateManifest, validatePsCimConfig);
     export const resjson = ResjsonModule.resjson;
     export const powershell = config.powershell.skip ? function powershellSkip(cb) { cb(); } : PowerShellModule.powershell;
     export const copy = CopyModule.copy;
@@ -29,16 +31,14 @@ module IndexModule {
     export const ut = TestModule.unitTestApp;
     export const pester = TestModule.pester;
     export const test = TestModule.test;
-    export const e2eLint = LintModule.lintE2e;
-    export const e2eBuild = E2eModule.e2eBuild;
-    export const e2eRun = E2eModule.e2eRun;
-    export const e2e = E2eModule.e2e;
+    export const uiTestAutomation = UITestAutomationModule.uiTestAutomation;
+    export const saveUiTestAutomation = UITestAutomationModule.saveUiTestAutomation;
     export const pack = PackModule.pack;
 
     // Build Tasks
     export const generate = parallel(resjson, powershell);
     export const app = series(lintApp, bundleApp);
-    export const build = series(clean, generate, validate, lint, compileLib, copy, test, bundleApp);
+    export const build = series(clean, generate, validate, lint, uiTestAutomation, compileLib, copy, test, bundleApp);
     export const quick = series(clean, generate, compileLib, copy, bundleApp);
 
     // Serve Tasks
@@ -48,6 +48,18 @@ module IndexModule {
     }
 
     export const serve = series(watchResource, serveApp);
+    export const watchUTA = series(uiTestAutomation, saveUiTestAutomation);
+    export function watchUiTestAutomation(cb) {
+        watch(
+            ['ui-test-automation/**/*.*'],
+            { ignoreInitial: false, delay: 1000 },
+            watchUTA);
+        cb();
+    }
 }
 
+// ui-test-automation aliases
+IndexModule['uta-build'] = IndexModule.uiTestAutomation;
+IndexModule['uta-save'] = IndexModule.saveUiTestAutomation;
+IndexModule['uta-watch'] = IndexModule.watchUiTestAutomation;
 export = IndexModule;

package/tools/wac-cli/src/upgrade/file-updater.d.ts

@@ -3,4 +3,5 @@ export declare class FileUpdater {
     private updateGulpConfigFile;
     private updateLocalizationPipeline;
     private updateMainFile;
+    private updateVersionJson;
 }

package/tools/wac-cli/src/upgrade/file-updater.js

@@ -33,12 +33,12 @@ var FileUpdater = /** @class */ (function () {
         fs_extra_1.default.copyFileSync(upgradedTemplatePath + '\\src\\test.ts', '.\\src\\test.ts');
         this.updateGulpConfigFile('.\\gulpfile.ts\\config-data.ts', library);
         if (internal || internalOverride) {
-            fs_extra_1.default.copyFileSync(internalPath + '\\version.json', '.\\version.json');
             fs_extra_1.default.copyFileSync(internalPath + '\\version.ts', '.\\src\\version.ts');
             fs_extra_1.default.copySync(internalPath + '\\azuredevops', '.\\.azuredevops');
             fs_extra_1.default.copySync(common_1.Common.moduleTemplatePath + '\\build', '.\\build');
             this.updateLocalizationPipeline('.\\loc\\locConfig.xml', '.\\build\\pipelines\\localization.yml', updateSource);
             this.updateMainFile(internalPath + '\\main.ts', '.\\src\\main.ts');
+            this.updateVersionJson(internalPath + '\\version.json', '.\\version.json');
         }
         if (library) {
             fs_extra_1.default.copyFileSync(libraryPath + '\\tsconfig.lib.json', '.\\src\\tsconfig.lib.json');
@@ -112,6 +112,12 @@ var FileUpdater = /** @class */ (function () {
         fileData = fileData.replace("{!company-name}.{!product-name}", name);
         fs_extra_1.default.writeFileSync(targetFilePath, fileData);
     };
+    FileUpdater.prototype.updateVersionJson = function (internalFilePath, targetFilePath) {
+        var newVersion = common_1.Common.readFileJSON(internalFilePath).version;
+        var versionData = common_1.Common.readFileJSON(targetFilePath);
+        versionData.version = newVersion;
+        fs_extra_1.default.writeJSONSync(targetFilePath, versionData, { spaces: 2 });
+    };
     return FileUpdater;
 }());
 exports.FileUpdater = FileUpdater;