Fix the branch

CloudReadySoftware · Nov 16, 2017 · fec64d4 · fec64d4
1 parent a15c4ed
commit fec64d4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,7 +3,7 @@
     "command": "npm",
     "isShellCommand": true,
     "showOutput": "silent",
-    "args": ["run", "build", "--loglevel", "silent"],
+    "args": ["run", "build"],
     "isBackground": true,
     "problemMatcher": "$tsc-watch"
 }
diff --git a/src/newversion.ts b/src/newversion.ts
@@ -52,7 +52,7 @@ function validateVersionNumber(versiontext: string, solutionname: string) {
 }
 
 export function inputNewVersionNumber(settings: Object, cb?: Function) {
-    let solutionName = settings[Settings.SOLUTIONNAME];
+    let solutionName = settings[Settings.DATABASENAME];
     let lastversionNumber = settings[Settings.SOLUTIONVERSION];
     let versionNumber = incrementVersionNumber(solutionName, lastversionNumber);
     let options: InputBoxOptions = {

diff --git a/src/powershell.ts b/src/powershell.ts
@@ -37,6 +37,18 @@ export class Powershell {
         }
     }
 
+
+    private addQuotes(parameter: string) {
+        if (typeof parameter === 'number')
+            return parameter;
+        if (typeof parameter === 'boolean')
+            return `$${parameter}`
+        if (parameter.startsWith("'")) {
+            return parameter;
+        }
+        return `'${parameter}'`;
+    }
+
     private parseSetting(parameter: any) {
         if(Array.isArray(parameter))
             return "'" + parameter.join("','") + "'";