Merge branch 'master' into yo-office

.azure-devops/build.yml

@@ -3,4 +3,4 @@ steps:
   displayName: 'Build'
   inputs:
     command: custom
-    customCommand: 'run build'
+    customCommand: 'run build'

.azure-devops/cleanup.yml

@@ -1,3 +1,3 @@
 steps:
-  - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
-    displayName: "Cleanup"
+- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
+  displayName: "Cleanup"

.azure-devops/devcerts.yml

@@ -1,6 +1,5 @@
 steps:
-  - script: |
-     echo Install Office-AddinDev-Certs at machine level
-     call npx office-addin-dev-certs install --machine
-  
-    displayName: 'Install add-in dev cert'
+- script: |
+    echo Install Office-AddinDev-Certs at machine level
+    call npx office-addin-dev-certs install --machine
+  displayName: 'Install add-in dev cert'

.azure-devops/edgewebview.yml

@@ -1,19 +1,13 @@
 steps:
-  - script: |
-      echo Enable EdgeWebView Loopback
-      call npx office-addin-dev-settings appcontainer EdgeWebView --loopback --yes
-      
-      echo Set Edge WebView Registry Settings
-
-      set PATH1="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646"
-
-      reg add %PATH1% /f /v DisplayName /t REG_SZ /d "@{Microsoft.Win32WebViewHost_10.0.19041.423_neutral_neutral_cw5n1h2txyewy?ms-resource://Windows.Win32WebViewHost/resources/DisplayName}"
-      reg add %PATH1% /f /v Moniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
-
-      set PATH2="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646\Children\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646-3829197285-1050560373-949424154-522343454"
-
-      reg add %PATH2% /f /v DisplayName /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy/123"
-      reg add %PATH2% /f /v Moniker /t REG_SZ /d "123"
-      reg add %PATH2% /f /v ParentMoniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
-      
-    displayName: 'Enable Edge WebView'
+- script: |
+    echo Enable EdgeWebView Loopback
+    call npx office-addin-dev-settings appcontainer EdgeWebView --loopback --yes
+    echo Set Edge WebView Registry Settings
+    set PATH1="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646"
+    reg add %PATH1% /f /v DisplayName /t REG_SZ /d "@{Microsoft.Win32WebViewHost_10.0.19041.423_neutral_neutral_cw5n1h2txyewy?ms-resource://Windows.Win32WebViewHost/resources/DisplayName}"
+    reg add %PATH1% /f /v Moniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
+    set PATH2="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646\Children\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646-3829197285-1050560373-949424154-522343454"
+    reg add %PATH2% /f /v DisplayName /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy/123"
+    reg add %PATH2% /f /v Moniker /t REG_SZ /d "123"
+    reg add %PATH2% /f /v ParentMoniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
+  displayName: 'Enable Edge WebView'

.azure-devops/full-pipeline.yml

@@ -1,53 +1,49 @@
-# Build a general Node.js project with npm.
-# Add steps that analyze code, save build artifacts, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
-
-jobs:
-  - job: Windows_10_Latest
+resources:
+  repositories:
+  - repository: CustomPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/OfficePipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: /v1/Office.Unofficial.PipelineTemplate.yml@CustomPipelineTemplates
+  parameters:
     pool:
       name: OE-OfficeClientApps
-    steps:
-      - template: ./install.yml
-      - template: ./lint.yml
-      - template: ./build.yml
-      - template: ./devcerts.yml
-      - template: ./edgewebview.yml
-      - template: ./test.yml
-        parameters:
-          webView: "edge-chromium"
-
-  - job: WebView_EdgeLegacy
-    pool:
-      name: OE-OfficeClientApps
-    steps:
-      - template: ./install.yml
-      - template: ./lint.yml
-      - template: ./build.yml
-      - template: ./devcerts.yml
-      - template: ./edgewebview.yml
-      - template: ./test.yml
-        parameters:
-          webView: "edge-legacy"
-
-  - job: WebView_IE
-    pool:
-      name: OE-OfficeClientApps
-    steps:
-      - template: ./install.yml
-      - template: ./lint.yml
-      - template: ./build.yml
-      - template: ./devcerts.yml
-      - template: ./edgewebview.yml
-      - template: ./test.yml
-        parameters:
-          webView: "ie"
-
-  - job: Mac
-    pool:
-      name: OPX Mac Dogfood Pool
-    steps:
-      - template: ./install.yml
-      - template: ./lint.yml
-      - template: ./build.yml
-      - template: ./test.yml
-      - template: ./cleanup.yml
+    sdl:
+      eslint:
+        configuration: required
+        parser: '@typescript-eslint/parser'
+        parserOptions: sourceType:module
+    stages:
+    - stage: stage
+      jobs:
+      - job: Windows_10_Latest
+        steps:
+        - template: /.azure-devops/install.yml@self
+        - template: /.azure-devops/lint.yml@self
+        - template: /.azure-devops/build.yml@self
+        - template: /.azure-devops/devcerts.yml@self
+        - template: /.azure-devops/edgewebview.yml@self
+        - template: /.azure-devops/test.yml@self
+          parameters:
+            webView: "edge-chromium"
+      - job: WebView_EdgeLegacy
+        steps:
+        - template: /.azure-devops/install.yml@self
+        - template: /.azure-devops/lint.yml@self
+        - template: /.azure-devops/build.yml@self
+        - template: /.azure-devops/devcerts.yml@self
+        - template: /.azure-devops/edgewebview.yml@self
+        - template: /.azure-devops/test.yml@self
+          parameters:
+            webView: "edge-legacy"
+      - job: WebView_IE
+        steps:
+        - template: /.azure-devops/install.yml@self
+        - template: /.azure-devops/lint.yml@self
+        - template: /.azure-devops/build.yml@self
+        - template: /.azure-devops/devcerts.yml@self
+        - template: /.azure-devops/edgewebview.yml@self
+        - template: /.azure-devops/test.yml@self
+          parameters:
+            webView: "ie"

.azure-devops/install.yml

@@ -1,3 +1,3 @@
 steps:
 - task: Npm@1
-  displayName: 'Install'
+  displayName: 'Install'

.azure-devops/lint.yml

@@ -3,4 +3,4 @@ steps:
   displayName: 'Lint'
   inputs:
     command: custom
-    customCommand: 'run lint'
+    customCommand: 'run lint'

.azure-devops/test.yml

@@ -2,17 +2,14 @@ parameters:
 - name: webView
   type: string
   default: "edge-chromium"
-
 steps:
-  - task: CmdLine@2
-    inputs:
-      script: |
-        echo Setting WebView Type: ${{ parameters.webView }}
-        call npx office-addin-dev-settings webview manifest.xml ${{ parameters.webView }}
-        call npx office-addin-dev-settings webview test/end-to-end/test-manifest.xml ${{ parameters.webView }}
-        
-        echo Running Tests
-        npm run test
-            
-        echo Done running tests
-    displayName: 'Run Tests'
+- task: CmdLine@2
+  inputs:
+    script: |
+      echo Setting WebView Type: ${{ parameters.webView }}
+      call npx office-addin-dev-settings webview manifest.xml ${{ parameters.webView }}
+      call npx office-addin-dev-settings webview test/end-to-end/test-manifest.xml ${{ parameters.webView }}
+      echo Running Tests
+      npm run test
+      echo Done running tests
+  displayName: 'Run Tests'