Merge branch 'OfficeDev:main' into ericl-outlook-spam-reporting-sample

README.md

@@ -79,6 +79,7 @@ All of the following samples show how to access and work with a user's Microsoft
 | Name           | Description  |
 | -------------- | ------------ |
 | [Get, edit, and set OOXML content in a Word document with a Word add-in](Samples/word-add-in-get-set-edit-openxml)| Shows how to get, edit, and set OOXML content in a Word document.|
+| [Import a Word document template with a Word add-in](Samples/word-import-template)| Shows how to import templates in a Word document.|
 | [Load and write Open XML in your Word add-in](Samples/word-add-in-load-and-write-open-xml) | Shows how to add a variety of rich content types to a Word document using the **setSelectedDataAsync** method with **ooxml** coercion type.|
 | [Manage citations with your Word add-in](Samples/word-citation-management)| Shows how to manage citations in a Word document.|
 
@@ -111,12 +112,9 @@ To learn more about Office Add-ins, see the [Office Add-ins documentation](https
 
 ## Join the Microsoft 365 Developer Program
 
-Get a free sandbox, tools, and other resources you need to build solutions for the Microsoft 365 platform.
+Join the [Microsoft 365 Developer Program](https://aka.ms/m365devprogram) to get resources and information to help you build solutions for the Microsoft 365 platform, including recommendations tailored to your areas of interest.
 
-* [Free developer sandbox](https://developer.microsoft.com/microsoft-365/dev-program#Subscription) Get a free, renewable 90-day Microsoft 365 E5 developer subscription.
-* [Sample data packs](https://developer.microsoft.com/microsoft-365/dev-program#Sample) Automatically configure your sandbox by installing user data and content to help you build your solutions.
-* [Access to experts](https://developer.microsoft.com/microsoft-365/dev-program#Experts) Access community events to learn from Microsoft 365 experts.
-* [Personalized recommendations](https://developer.microsoft.com/microsoft-365/dev-program#Recommendations) Find developer resources quickly from your personalized dashboard.
+You might also qualify for a free developer subscription that's renewable for 90 days and comes configured with sample data; for details, see the [FAQ](https://learn.microsoft.com/office/developer-program/microsoft-365-developer-program-faq#who-qualifies-for-a-microsoft-365-e5-developer-subscription-).
 
 ## Community
 

Samples/Excel.JsonToOfficeTable/Excel.JsonToOfficeTableWeb/App/App.js

@@ -48,10 +48,10 @@ Office.initialize = function (reason) {
             $('#hdnActiveTab').val(this.id.substring(3));
         });
 
-        //hide the message
-        $('#message').click(function () { $('#message').hide(); });
+        // Hide the message.
+        $('#message').on("click", function () { $('#message').hide(); });
 
-        //wire up client-side processing
+        // Wire up client-side processing.
         $('#btnSubmit1').click(function () {
             $.ajax({
                 url: '../Services/Stocks.svc/GetHistory?stock=' + $('#txtSymbol1').val() + '&fromyear=' + $('#cboFromYear1').val(),

Samples/Excel.OfflineStorageAddin/src/taskpane/taskpane.js

@@ -9,8 +9,8 @@
         // The document is ready
         $(document).ready(function () {
 
-            // Assign HTML buttons to functions
-            $('#create-table').click(loadTable);
+            // Assign HTML buttons to functions.
+            $('#create-table').on("click", loadTable);
         });
     });
 

Samples/Excel.TableBindingFormatting/Excel.TableBindingFormattingWeb/App/Home/Home.js

@@ -13,12 +13,12 @@
         $(document).ready(function () {
             app.initialize();
             CheckButtons();
-            $('#AddBindings').click(CreateTable);
-            $('#AddData').click(AddRowsToTable);
-            $('#ClearFormat').click(ClearFormat);
-            $('#ClearData').click(ClearData);
-            $('#CellFormatting').click(DoCellFormatting);
-            $('#TableOptions').click(DoTableOptions);
+            $('#AddBindings').on("click", CreateTable);
+            $('#AddData').on("click", AddRowsToTable);
+            $('#ClearFormat').on("click", ClearFormat);
+            $('#ClearData').on("click", ClearData);
+            $('#CellFormatting').on("click", DoCellFormatting);
+            $('#TableOptions').on("click", DoTableOptions);
 
             var sel = $("#TableStyle");
             $.each(tableStyles, function (i, style) {

Samples/Office.TypeScriptAddin/Office.TypeScriptAddinWeb/AddIn/Home/Home.ts

@@ -10,7 +10,7 @@
         $(document).ready(function () {
             app.initialize();
 
-            $('#get-data-from-selection').click(getDataFromSelection);
+            $('#get-data-from-selection').on("click", getDataFromSelection);
         });
     };
 

Samples/VSTO-shared-code-migration/README.md

@@ -32,20 +32,20 @@ The sample starts with an Excel VSTO add-in that provides functionality for the
 
 ## Applies to
 
--  Excel, Outlook, Word, and PowerPoint, on Windows, Mac, and in a browser.
+- Excel, Outlook, Word, and PowerPoint, on Windows, Mac, and in a browser.
 
 ## Prerequisites
 
 To set up your development environment:
 
 1. Install [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/).
-2. Install the following workloads:
+1. Install the following workloads:
     - ASP.NET and web development
     - .NET Core cross-platform development. **Note:** You need at least .NET Core version 2.2 or later to run the completed sample.
     - Office/SharePoint development
     - Visual Studio Tools for Office (VSTO). **Note:** This is an **Individual** component.
 
-You will also need an Office 365 account. You can join the [Office 365 Developer Program](https://aka.ms/devprogramsignup) that includes a free 1 year subscription to Office 365.
+You'll also need a Microsoft 365 account. You might qualify for a Microsoft 365 E5 developer subscription through the [Microsoft 365 Developer Program](https://aka.ms/m365devprogram); for details, see the [FAQ](https://learn.microsoft.com/office/developer-program/microsoft-365-developer-program-faq#who-qualifies-for-a-microsoft-365-e5-developer-subscription-). Alternatively, you can [sign up for a 1-month free trial](https://www.microsoft.com/microsoft-365/try) or [purchase a Microsoft 365 plan](https://www.microsoft.com/microsoft-365/business/compare-all-microsoft-365-business-products-g).
 
 ## Solution
 

Samples/auth/Office-Add-in-ASPNET-SSO/Begin/Office-Add-in-ASPNETCore-WebAPI/wwwroot/js/HomeES6.js

@@ -12,7 +12,7 @@ if (!window.Promise) {
 
 Office.onReady(() => {
     $(document).ready(function () {
-        $('#getUserFileNames').click(getUserFileNames);
+        $('#getUserFileNames').on("click", getUserFileNames);
     });
 });
 

Samples/auth/Office-Add-in-ASPNET-SSO/Complete/Office-Add-in-ASPNETCore-WebAPI/wwwroot/js/HomeES6.js

@@ -12,7 +12,7 @@ if (!window.Promise) {
 
 Office.onReady(() => {
     $(document).ready(function () {
-        $('#getUserFileNames').click(getUserFileNames);
+        $('#getUserFileNames').on("click", getUserFileNames);
     });
 });
 

Samples/auth/Office-Add-in-ASPNET-SSO/README.md

@@ -83,17 +83,14 @@ The sample sends a hardcoded query parameter on the URL for the Microsoft Graph
 
 ## Join the Microsoft 365 Developer Program
 
-Get a free sandbox, tools, and other resources you need to build solutions for the Microsoft 365 platform.
+Join the [Microsoft 365 Developer Program](https://aka.ms/m365devprogram) to get resources and information to help you build solutions for the Microsoft 365 platform, including recommendations tailored to your areas of interest.
 
-- [Free developer sandbox](https://developer.microsoft.com/microsoft-365/dev-program#Subscription) Get a free, renewable 90-day Microsoft 365 E5 developer subscription.
-- [Sample data packs](https://developer.microsoft.com/microsoft-365/dev-program#Sample) Automatically configure your sandbox by installing user data and content to help you build your solutions.
-- [Access to experts](https://developer.microsoft.com/microsoft-365/dev-program#Experts) Access community events to learn from Microsoft 365 experts.
-- [Personalized recommendations](https://developer.microsoft.com/microsoft-365/dev-program#Recommendations) Find developer resources quickly from your personalized dashboard.
+You might also qualify for a free developer subscription that's renewable for 90 days and comes configured with sample data; for details, see the [FAQ](https://learn.microsoft.com/office/developer-program/microsoft-365-developer-program-faq#who-qualifies-for-a-microsoft-365-e5-developer-subscription-).
 
 ## Additional resources
 
-* [Microsoft Graph documentation](https://learn.microsoft.com/graph/)
-* [Office Add-ins documentation](https://learn.microsoft.com/office/dev/add-ins/overview/office-add-ins)
+- [Microsoft Graph documentation](https://learn.microsoft.com/graph/)
+- [Office Add-ins documentation](https://learn.microsoft.com/office/dev/add-ins/overview/office-add-ins)
 
 ## Copyright
 

Samples/auth/Office-Add-in-Microsoft-Graph-ASPNET/Office-Add-in-Microsoft-Graph-ASPNETWeb/Scripts/Document.js

@@ -8,8 +8,8 @@ Office.initialize = function () {
     $(document).ready(function () {
         app.initialize();
 
-        $("#getOneDriveFilesButton").click(getFileNamesFromGraph);
-        $("#logoutO365PopupButton").click(logout);        
+        $("#getOneDriveFilesButton").on("click", getFileNamesFromGraph);
+        $("#logoutO365PopupButton").on("click", logout);        
     });
 };