Merge pull request #151974 from v-jrushing/cmp_saasoffer

Updates as per Ming

Author: v-shmck

articles/marketplace/create-new-saas-offer.md

@@ -51,7 +51,7 @@ On the **Offer setup** tab, under **Setup details**, you’ll choose whether to
    + To provide a 30-day free trial, select **Free trial**, and then in the **Trial URL** box that appears, enter the URL (beginning with *http* or *https*) where customers can access your free trial through [one-click authentication by using Azure Active Directory (Azure AD)](azure-ad-saas.md). For example, `https://contoso.com/trial/saas-app`.
    + To have potential customers contact you to purchase your offer, select **Contact me**.
 
-### Enable a test drive (optional)
+## Enable a test drive (optional)
 
 A test drive is a great way to showcase your offer to potential customers by giving them access to a preconfigured environment for a fixed number of hours. Offering a test drive results in an increased conversion rate and generates highly qualified leads. To Learn more about test drives, see [What is a test drive?](./what-is-test-drive.md).
 
@@ -62,14 +62,14 @@ A test drive is a great way to showcase your offer to potential customers by giv
 1.	Under **Test drive**, select the **Enable a test drive** check box.
 1.	Select the test drive type from the list that appears.
 
-### Configure lead management
+## Configure lead management
 
 Connect your customer relationship management (CRM) system with your commercial marketplace offer so you can receive customer contact information when a customer expresses interest or deploys your product. You can modify this connection at any time during or after you create the offer.
 
 > [!NOTE]
 > You must configure lead management if you’re selling your offer through Microsoft or you selected the **Contact Me** listing option. For detailed guidance, see [Customer leads from your commercial marketplace offer](partner-center-portal/commercial-marketplace-get-customer-leads.md).
 
-#### To configure the connection details in Partner Center
+### Configure the connection details in Partner Center
 
 1.	Under **Customer leads**, select the **Connect** link.
 1. In the **Connection details** dialog box, select a lead destination from the list.
@@ -84,6 +84,36 @@ Connect your customer relationship management (CRM) system with your commercial
 1. To validate the configuration you provided, select the **Validate** link.
 1. To close the dialog box, select **OK**.
 
+## Configure Microsoft 365 App integration
+
+You can light up [unified discovery and delivery](./plan-SaaS-offer.md) of your SaaS offer and any related Microsoft 365 App consumption by linking them.
+
+### Integrate with Microsoft API
+
+1. If your SaaS offer does not integrate with Microsoft Graph API, select **No**. Continue to Link published Microsoft 365 App consumption clients.  
+
+1. If your SaaS offer integrates with Microsoft Graph API, select **Yes**, and then provide the Azure Active Directory App ID you have created and registered to integrate with Microsoft Graph API. 
+
+### Link published Microsoft 365 App consumption clients
+
+1. If you do not have published Office add-in, Teams app, or SharePoint Framework solutions that works with your SaaS offer, select **No**.
+
+1. If you have published Office add-in, Teams app, or SharePoint Framework solutions that works with your SaaS offer, select **Yes**, then select **+Add another AppSource link** to add new links.  
+
+1. Provide a valid AppSource link.
+
+1. Continue adding all the links by select **+Add another AppSource link** and provide valid AppSource links.  
+
+1. The order the linked products are shown on the listing page of the SaaS offer is indicated by the Rank value, you can change it by select, hold, and move the = icon up and down the list. 
+
+1. You can delete a linked product by select **Delete** in the product row.  
+
+
+> [!IMPORTANT]
+> If you stop-sell a linked product, it won’t be automatically unlinked on the SaaS offer, you must delete it from the list of linked products and resubmit the SaaS offer.  
+
+ 
+
 ## Next steps
 
 - [How to configure your SaaS offer properties](create-new-saas-offer-properties.md)

articles/marketplace/plan-saas-offer.md

@@ -12,7 +12,7 @@ ms.date: 03/26/2021
 
 # How to plan a SaaS offer for the commercial marketplace
 
-This article explains the different options and requirements for publishing software as a service (SaaS) offers to the Microsoft commercial marketplace. SaaS offers let you deliver and license software solutions to your customers via online subscriptions. As a SaaS publisher, you manage and pay for the infrastructure required to support your customers' use of your offer. This article will help you prepare your offer for publishing to the commercial marketplace with Partner Center.
+This article explains the different options and requirements for publishing software as a service (SaaS) offers to the Microsoft commercial marketplace. SaaS offers to let you deliver and license software solutions to your customers via online subscriptions. As a SaaS publisher, you manage and pay for the infrastructure required to support your customers' use of your offer. This article will help you prepare your offer for publishing to the commercial marketplace with Partner Center.
 
 ## Listing options
 
@@ -130,6 +130,29 @@ If you choose to use the standard contract, you have the option to add universal
 > [!NOTE]
 > After you publish an offer using the standard contract for the commercial marketplace, you cannot use your own custom terms and conditions. It is an "or" scenario. You either offer your solution under the standard contract or your own terms and conditions. If you want to modify the terms of the standard contract you can do so through Standard Contract Amendments.
 
+
+## Microsoft 365 integration
+
+Integration with Microsoft 365 allows your SaaS offer to provide connected experience across multiple Microsoft 365 App surfaces through related free add-ins like Teams apps, Office add-ins, and SharePoint Framework solutions. You can help your customers easily discover all facets of your E2E solution (web service + related add-ins) and deploy them within one process by providing the following information. 
+  - If your SaaS offer integrates with Microsoft Graph, then provide the Azure Active Directory (AAD) App ID used by your SaaS offer for the integration. Administrators can review access permissions required for the proper functioning of your SaaS offer as set on the AAD App ID and grant access if advanced admin permission is needed at deployment time. 
+    
+     If you choose to sell your offer through Microsoft, then this is the same AAD App ID that you have registered to use on your landing page to get basic user information needed to complete customer subscription activation. For detailed guidance, see [Build the landing page for your transactable SaaS offer in the commercial marketplace](azure-ad-transactable-saas-landing-page.md). 
+	
+   -	Provide a list of related add-ins that work with your SaaS offer you want to link. Customers will be able to discover your E2E solution on AppSource and administrators can deploy both the SaaS and all the related add-ins you have linked in the same process via Microsoft 365 admin center.
+    
+        To link related add-ins, you need to provide the AppSource link of the add-in, this means the add-in must be first published to AppSource. Supported add-in types you can link are: Teams apps, Office add-ins, and SharePoint Framework (SPFx) solutions. Each linked add-in must be unique for a SaaS offer. 
+
+For linked products, search on AppSource will return with one result that includes both SaaS and all linked add-ins. Customer can navigate between the product detail pages of the SaaS offer and linked add-ins. 
+IT admins can review and deploy both the SaaS and linked add-ins within the same process through an integrated and connected experience within the Microsoft 365 admin center. To learn more, see [Test and deploy Microsoft 365 Apps - Microsoft 365 admin](/microsoft-365/admin/manage/test-and-deploy-microsoft-365-apps).
+
+### Microsoft 365 integration support limitations
+Discovery as a single E2E solution is supported on AppSource for all cases, however, simplified deployment of the E2E solution as described above via the Microsoft 365 admin center is not supported for the following scenarios:
+
+   - The same add-in is linked to more than one SaaS offer.
+   - The SaaS offer is linked to add-ins, but it does not integrate with Microsoft Graph and no AAD App ID is provided.
+  - The SaaS offer is linked to add-ins, but AAD App ID provided for Microsoft Graph integration is shared across multiple SaaS offers.
+
+ 
 ## Offer listing details
 
 When you [create a new SaaS offer](create-new-saas-offer.md) in Partner Center, you will enter text, images, optional videos, and other details on the **Offer listing** page. This is the information that customers will see when they discover your offer listing in the commercial marketplace, as shown in the following example.