Update

Author: ivanduplenskikh

ci/build-common-packages.yml

@@ -18,25 +18,21 @@ jobs:
   - script: npm i -g [email protected] --force
     displayName: Use npm version 8.19.4
 
-  - script: |
-      npm install
+  - script: npm install
     displayName: Npm install
 
-  - script: |
-      npm run build
+  - script: node ./ci/check-versions.js
+    displayName: Verify tasks' versions
+    condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
+
+  - script: npm run build
     displayName: Build Common Npm packages
 
-  - script: |
-      node ./ci/verify-source-changes.js
+  - script: node ./ci/verify-source-changes.js
     displayName: Verify task source changes
     condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
 
-  - script: node ./ci/check-versions.js
-    displayName: Verify tasks' versions
-    condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/main'))
-
-  - script: |
-      npm run test
+  - script: npm run test
     displayName: Test Common Npm packages
 
   - task: PublishTestResults@2
@@ -52,8 +48,7 @@ jobs:
       summaryFileLocation: $(System.DefaultWorkingDirectory)/test-results/*coverage.xml
 
   # For CI runs on master, automatically publish packages
-  - bash: |
-      npm run publish
+  - bash: npm run publish
     condition: and(succeeded(), in(variables['build.reason'], 'IndividualCI', 'BatchedCI', 'Manual'), eq(variables['Agent.OS'], 'Windows_NT'))
     env:
       NPM_TOKEN: $(npm-automation.token)

ci/check-versions.js

@@ -21,7 +21,7 @@ const packages = [
     'webdeployment-common',
 ];
 
-const gitDiffResult = execSync('git diff --name-only main', { encoding: 'utf8' }).split('\n');
+const gitDiffResult = execSync('git --no-pager diff --name-only origin/master', { encoding: 'utf8' }).split('\n');
 const changedFolders = new Set();
 
 for (const filePath of gitDiffResult) {

common-npm-packages/azurermdeploycommon/webdeployment-common/webconfigutil.ts

@@ -19,6 +19,7 @@ function replaceMultiple(text: string, substitutions: any): string {
     return text;
 }
 
+
 function addMissingParametersValue(appType: string, webConfigParameters) {
     var paramDefaultValue = {
         'node': {
@@ -95,14 +96,14 @@ export function addWebConfigFile(folderPath: any, webConfigParameters, rootDirec
                 }
             } else if(appType == 'Go') {
                 if (util.isNullOrUndefined(webConfigParameters['GoExeFileName'])
-                        || util.isNullOrUndefined(webConfigParameters['GoExeFileName'].value) 
+                        || util.isNullOrUndefined(webConfigParameters['GoExeFileName'].value)
                         || webConfigParameters['GoExeFileName'].value.length <=0) {
                     throw Error(tl.loc('GoExeNameNotPresent'));
                 }
                 selectedAppTypeParams['GoExeFilePath'] = rootDirectoryPath + "\\" + webConfigParameters['GoExeFileName'].value;
             } else if(appType == 'java_springboot') {
                 if (util.isNullOrUndefined(webConfigParameters['JAR_PATH'])
-                || util.isNullOrUndefined(webConfigParameters['JAR_PATH'].value) 
+                || util.isNullOrUndefined(webConfigParameters['JAR_PATH'].value)
                 || webConfigParameters['JAR_PATH'].value.length <= 0) {
                     throw Error(tl.loc('JarPathNotPresent'));
                 }