Merge shared changesd

Author: millerds

.azure-devops/cleanup.yml

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

.azure-devops/edgewebview.yml

@@ -1,19 +1,19 @@
 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"
- 
+      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

@@ -3,13 +3,52 @@
 # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
 
 jobs:
-  - job: WindowsServer2019
+  - job: Windows_10_Latest
     pool:
-      name: OETest-OfficeClientApps
+      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"
+
+  # Need to fix tests (use of find-process module) to be able to support IE 11 webview
+  # - 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

.azure-devops/test.yml

@@ -1,9 +1,18 @@
+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

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "plugins": [
     "office-addins"
-  ], 
+  ],
   "extends": [
     "plugin:office-addins/recommended"
   ]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,7 +23,7 @@ Please describe the behavior you were expecting
 
 # Current behavior
 
-Please provide information about the failure. What is the current behavior? If it is not a bug, please add it to [UserVoice](https://officespdev.uservoice.com/forums/224641-feature-requests-and-feedback/category/164751-office-developer-tools), so that it gets added to our feature roadmap.
+Please provide information about the failure. What is the current behavior? If it is not a bug, please submit your idea to the [Microsoft Tech Community Ideas forum](https://techcommunity.microsoft.com/t5/microsoft-365-developer-platform/idb-p/Microsoft365DeveloperPlatform), so that it gets added to our feature roadmap.
 
 
 ## Steps to Reproduce

.vscode/launch.json

@@ -7,18 +7,18 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Debug Tests",
+      "name": "Debug UI Tests",
       "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "-u",
         "bdd",
         "--timeout",
         "999999",
         "--colors",
-        "${workspaceFolder}/test",
+        "${workspaceFolder}/test/end-to-end",
         "-r",
         "ts-node/register",
-        "${workspaceFolder}/test/*.ts"
+        "${workspaceFolder}/test/end-to-end/*.ts"
       ],
       "internalConsoleOptions": "openOnSessionStart",
       "runtimeArgs": [

CONTRIBUTING.md

@@ -11,7 +11,7 @@ There are several ways you can contribute to this sample: providing better code
 Code comments make code samples even better by helping developers learn to use the code correctly in their own applications. If you spot a class, method, or section of code that you think could use better descriptions, then create a pull request with your code comments.
 
 
-In general we want our code comments to follow these guidelines: 
+In general, we want our code comments to follow these guidelines: 
 
 - Any code that has associated documentation displayed in an IDE (such as IntelliSense, or JavaDocs) has code comments.
 - Classes, methods, parameters, and return values have clear descriptions.
@@ -26,24 +26,24 @@ Sometimes we get a lot of issues, and it can be hard to keep up. If you have a s
 
 ### Add a new feature 
 
-New features are great! Be sure to check with the repository admin first to be sure the feature will fit the intent of the sample. Start by opening an issue in the repository that proposes and describes the feature. The repository admin will respond and may ask for more information. If the admin agrees to the new feature, create the feature and submit a pull request. 
+New features are great! Be sure to check with the repository admin first to be sure the feature fits the intent of the sample. Start by opening an issue in the repository that proposes and describes the feature. The repository admin will respond and may ask for more information. If the admin agrees to the new feature, create the feature and submit a pull request. 
 
 ## Contribution guidelines 
 
 We have some guidelines to help maintain a healthy repo and code for everyone. 
 
 ### The Contribution License Agreement 
 
-For most contributions, you'll be asked to sign a Contribution License Agreement (CLA). This will happen when you submit a pull request. Microsoft will send a link to the CLA to sign via email. Once you sign the CLA, your pull request can proceed. Read the CLA carefully, because you may need to have your employer sign it. 
+For most contributions, we ask you to sign a Contribution License Agreement (CLA). This will happen when you submit a pull request. Microsoft will send a link to the CLA to sign via email. Once you sign the CLA, your pull request can proceed. Read the CLA carefully, because you may need to have your employer sign it. 
 
 ### Code contribution checklist 
 
 Be sure to satisfy all of the requirements in the following list before submitting a pull request: 
 
 - Follow the code style that is appropriate for the platform and language in this repo. For example, Android code follows the style conventions found in the [Code Style for Contributors guide](https://source.android.com/source/code-style.html).
 - Test your code.
-- Test the UI thoroughly to be sure nothing has been broken by your change.
-- Keep the size of your code change reasonable. if the repository owner cannot review your code change in 4 hours or less, your pull request may not be reviewed and approved quickly.
+- Test the UI thoroughly to be sure your change hasn't broken anything.
+- Keep the size of your code change reasonable. If the repository owner cannot review your code change in 4 hours or less, your pull request may not be reviewed and approved quickly.
 - Avoid unnecessary changes. The reviewer will check differences between your code and the original code. Whitespace changes are called out along with your code. Be sure your changes will help improve the content. 
 
 ### Submit a pull request to the master branch 
@@ -61,13 +61,13 @@ Congratulations, you have successfully contributed to the sample!
 
 ### Where do I get a Contributor's License Agreement? 
 
-You will automatically be sent a notice that you need to sign the Contributor's License Agreement (CLA) if your pull request requires one. 
+If your pull request requires one, you'll automatically be sent a notice that you need to sign the Contributor's License Agreement (CLA). 
 
 As a community member, you must sign the CLA before you can contribute large submissions to this project. You only need complete and submit the CLA document once. Carefully review the document. You may be required to have your employer sign the document. 
 
 ### What happens with my contributions? 
 
-When you submit your changes, via a pull request, our team will be notified and will review your pull request. You will receive notifications about your pull request from GitHub; you may also be notified by someone from our team if we need more information. We reserve the right to edit your submission for legal, style, clarity, or other issues. 
+When you submit your changes via a pull request, our team will be notified and will review your pull request. You'll receive notifications about your pull request from GitHub; you may also be notified by someone from our team if we need more information. We reserve the right to edit your submission for legal, style, clarity, or other issues. 
 
 ### Who approves pull requests? 
 
@@ -80,4 +80,4 @@ We typically review pull requests and respond to issues within 10 business days.
 ## More resources 
 
 - To learn more about Markdown, see [Daring Fireball](http://daringfireball.net/).
-- To learn more about using Git and GitHub, check out the [GitHub Help section](http://help.github.com/). 
+- To learn more about using Git and GitHub, check out the [GitHub Help section](http://help.github.com/). 

README.md

@@ -12,7 +12,7 @@ This template supports debugging custom functions from [Visual Studio Code](http
 
 We'd love to get your feedback about this sample. You can send your feedback to us in the *Issues* section of this repository.
 
-Questions about Microsoft Office 365 development in general should be posted to [Stack Overflow](http://stackoverflow.com/questions/tagged/office-js+API).  If your question is about the Office JavaScript APIs, make sure it's tagged with  [office-js].
+Questions about Office Add-ins development in general should be posted to [Microsoft Q&A](https://docs.microsoft.com/answers/questions/185087/questions-about-office-add-ins.html). If your question is about the Office JavaScript APIs, make sure it's tagged with [office-js-dev].
 
 ## Join the Microsoft 365 Developer Program
 Get a free sandbox, tools, and other resources you need to build solutions for the Microsoft 365 platform.

convertToSingleHost.js

@@ -8,6 +8,7 @@ const testPackages = [
   "@types/node",
   "current-processes",
   "mocha",
+  "office-addin-mock",
   "office-addin-test-helpers",
   "office-addin-test-server",
   "ts-node",
@@ -22,6 +23,9 @@ async function removeTestInfraStructure() {
     // delete the .github folder
     deleteFolder(path.resolve(`./.github`));
 
+    // delete CI/CD pipeline files
+    deleteFolder(path.resolve(`./.azure-devops`));
+
     await updatePackageJsonFile();
     await updateLaunchJsonFile();
     // delete this script