Merge branch 'vnext' into dmdimitrov/query-builder-sql-sample

Author: gedinakova

angular.json

@@ -39,12 +39,7 @@
                 "node_modules"
               ]
             },
-            "browser": "src/main.ts",
-            "server": "src/main.server.ts",
-            "outputMode": "static",
-            "ssr": {
-              "entry": "src/server.ts"
-            }
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -164,12 +159,7 @@
               ]
             },
             "preserveSymlinks": true,
-            "browser": "projects/app-lob/src/main.ts",
-            "server": "projects/app-lob/src/main.server.ts",
-            "outputMode": "static",
-            "ssr": {
-              "entry": "projects/app-lob/src/server.ts"
-            }
+            "browser": "projects/app-lob/src/main.ts"
           },
           "configurations": {
             "production": {
@@ -294,12 +284,7 @@
                 "node_modules"
               ]
             },
-            "browser": "projects/app-crm/src/main.ts",
-            "server": "projects/app-crm/src/main.server.ts",
-            "outputMode": "static",
-            "ssr": {
-              "entry": "projects/app-crm/src/server.ts"
-            }
+            "browser": "projects/app-crm/src/main.ts"
           },
           "configurations": {
             "production": {

azure-devops/templates/cd-template.yml

@@ -126,10 +126,10 @@ steps:
     displayName: 'Update web.config file'
     workingDirectory: ${{ parameters.workingDir }}
 
-  - script: |
-      mv "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.csr.html" "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.html"
-      echo "File renamed successfully."
-    displayName: Rename index.csr.html to index.html
+#  - script: |
+#      mv "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.csr.html" "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.html"
+#      echo "File renamed successfully."
+#    displayName: Rename index.csr.html to index.html
 
   - script: |
       sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
@@ -176,7 +176,7 @@ steps:
     inputs:
       script: |
         # Check for changes
-        changeCount=$(git status --porcelain | wc -l)
+        changeCount=$(git status --porcelain "../${{ parameters.submoduleDir }}" | wc -l)
         if [ "$changeCount" -eq 0 ]; then
           echo "##vso[task.logissue type=warning]No changes to commit."
           exit 0