Merge pull request #928 from MicrosoftDocs/master

Pushing Linh's solution updates to live.

Author: Mattp123

powerapps-docs/maker/TOC.yml

@@ -535,6 +535,8 @@
             href: ./canvas-apps/functions/function-datetime-parts.md
           - name: Year
             href: ./canvas-apps/functions/function-datetime-parts.md
+      - name: Create an app in a solution
+        href: ./canvas-apps/add-app-solution.md
       - name: Build a global app
         href: ./canvas-apps/global-apps.md
       - name: Make an app accessible
@@ -918,14 +920,16 @@
   - name: Work with solutions
     href: ./common-data-service/solutions-overview.md
     items:
-    - name: Use solution explorer 
+    - name: Use solutions 
       href: ./common-data-service/use-solution-explorer.md
     - name: Use the Common Data Services default solution
       href: ./common-data-service/use-solutions-for-your-customizations.md   
     - name: Import, update, and export solutions
       href: ./common-data-service/import-update-export-solutions.md 
     - name: Navigate to a specific solution
       href: ./common-data-service/navigate-specific-solution.md
+    - name: Create a solution
+      href: ./common-data-service/create-solution.md
     - name: Use segmented solutions
       href: ./common-data-service/use-segmented-solutions-patches-simplify-updates.md
     - name: Change the solution publisher prefix

powerapps-docs/maker/canvas-apps/add-app-solution.md

@@ -0,0 +1,113 @@
+---
+title: Create a canvas app in a solution | Microsoft Docs
+description: In PowerApps, create a canvas app in a solution so that you can deploy the app to another environment
+author: AFTOwen
+manager: kvivek
+ms.service: powerapps
+ms.topic: article
+ms.custom: canvas
+ms.reviewer:
+ms.date: 10/23/2018
+ms.author: anneta
+search.audienceType: 
+  - maker
+search.app: 
+  - PowerApps
+---
+# Create a canvas app from within a solution
+
+Create an app from within a solution if you want to deploy the app, for example, to a different environment. Solutions can contain not only apps but also customized entities, option sets, and other components. You can quickly customize an environment in a variety of ways by creating apps and other components from within a solution, exporting the solution, and then importing it into another environment.
+
+Solutions are built on the same platform as Dynamics 365 for Customer Engagement. For more information, see [Solutions overview](../common-data-service/solutions-overview.md).
+
+## Prerequisite
+
+To follow the steps in this topic, you must switch to an environment that contains a Common Data Services for Apps database.
+
+## Create a solution
+
+You can skip this procedure if you already have a solution in which you want to create an app or to which you want to link an app.
+
+1. [Sign in](https://web.powerapps.com?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) to PowerApps, and then (if necessary) switch to the appropriate environment:
+
+    - If you want to create an app from within a solution, switch to any environment that contains a CDS for Apps database.
+    - If you want to link an existing app to a solution, switch to the environment that contains that app.
+
+1. In the left navigation bar, select **Solutions**.
+
+    ![Solutions option in the left navigation bar](./media/add-app-solution/left-nav.png)
+
+1. In the banner under the title bar, select **New solution**.
+
+    ![New-solution option in the banner](./media/add-app-solution/banner-new-solution.png)
+
+1. In the window that appears, specify a display name, a publisher, and a version for your solution.
+
+    ![Options for a new solution](./media/add-app-solution/configure-new-solution.png)
+
+    A name (with no spaces) will be automatically generated based on the display name that you specify, but you can customize the generated name if you want. You can specify the default publisher for your environment and **1.0** for the version if you don't have specific needs in those areas.
+
+1. Near the upper-left corner, select **Save and close**.
+
+    ![Save a new solution](./media/add-app-solution/save-new-solution.png)
+
+## Create a canvas app in a solution
+
+You can create a blank canvas app from within a solution. You can't automatically generate a three-screen app or customize a template or sample app from within a solution.
+
+1. [Sign in](https://web.powerapps.com?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) to PowerApps.
+
+1. If necessary, switch to the environment that contains the solution in which you want to create a canvas app.
+
+1. In the left navigation bar, select **Solutions**.
+
+    ![Solutions option in the left navigation bar](./media/add-app-solution/left-nav.png)
+
+1. In the list of solutions, select the solution in which you want to create a canvas app.
+
+1. In the banner under the title bar, select **New** > **App** > **Canvas app**, and then select the form factor (phone or tablet) of the app that you want to create.
+
+    ![Options to create an app in a solution](./media/add-app-solution/new-option.png)
+
+    PowerApps Studio opens with a blank canvas in another browser tab.
+
+1. Create your app (or make at least one change), and then save your changes.
+
+1. On the browser tab where you selected your solution, select **Done** to refresh the list of components in your solution.
+
+    ![Done button](./media/add-app-solution/done-button.png)
+
+    Your new app appears in the list of components for that solution. If you save any changes to your app, they will be reflected in the version that's in the solution.
+
+## Link an existing canvas app to a solution
+
+If you want to link an app to a solution, they must be in the same environment, and the app must have been created from within a solution.
+
+1. [Sign in](https://web.powerapps.com?utm_source=padocs&utm_medium=linkinadoc&utm_campaign=referralsfromdoc) to PowerApps.
+
+1. If necessary, switch to the environment that contains the solution to which you want to link an app.
+
+1. In the left navigation bar, select **Solutions**.
+
+    ![Solutions option in the left navigation bar](./media/add-app-solution/left-nav.png)
+
+1. In the list of solutions, select the solution to which you want to link an app.
+
+1. In the banner under the title bar, select **Add existing** > **App** > **Canvas app**.
+
+    ![Banner options to link an existing app](./media/add-app-solution/add-existing.png)
+
+    A list of canvas apps that were created within a solution in this environment appears.
+
+1. In the list of apps, select the app that you want to link to the solution, and then select **Add**.
+
+    ![Add button](./media/add-app-solution/add-button.png)
+
+## Known limitations
+
+Please refer to this [section](../common-data-service/use-solution-explorer.md#known-limitations) for a complete list of known limitations for canvas app in solution. 
+
+## Next steps
+
+- Create or link more apps and [other components](../common-data-service/use-solution-explorer.md), such as entities, flows, and dashboards, to your solution.
+- [Export your solution](../common-data-service/import-update-export-solutions.md) so that you can deploy it to another environment, on AppSource, and so forth.

powerapps-docs/maker/canvas-apps/data-platform-create-app-scratch.md

@@ -154,4 +154,5 @@ When you build an app from the Common Data Service, you don't need to create a c
 
 ## Next steps
 
-[Open one or more sample apps](open-and-run-a-sample-app.md), and explore different types of apps that you can create.
+- [Link this app to a project](add-app-solution.md) so that you can, for example, deploy it to a different environment or publish it on AppSource.
+- [Open one or more sample apps](open-and-run-a-sample-app.md), and explore different types of apps that you can create.

powerapps-docs/maker/canvas-apps/get-started-create-from-blank.md

@@ -236,6 +236,8 @@ To follow the steps in this tutorial exactly, first create an Excel file using t
 1. Close Preview mode by pressing Esc (or by selecting the close icon in the upper-right corner).
 
 ## Next steps
-* Press Ctrl-S to save your app in the cloud so that you can run it from other devices.
-* [Share the app](share-app.md) so that other people can run it.
-* Learn more about [functions](working-with-formulas.md) such as **Patch**, which you can use to manage data without creating a standard form.
+
+- Press Ctrl-S to save your app in the cloud so that you can run it from other devices.
+- [Share the app](share-app.md) so that other people can run it.
+- Learn more about [functions](working-with-formulas.md) such as **Patch**, which you can use to manage data without creating a standard form.
+- [Link this app to a project](add-app-solution.md) so that you can, for example, deploy it to a different environment or publish it on AppSource.