Merge pull request #52924 from MicrosoftDocs/release-ignite-service-fabric

Ignite Merge Down

Author: Cory Fowler

articles/service-fabric-mesh/TOC.yml

@@ -13,14 +13,28 @@
     href: service-fabric-mesh-quickstart-dotnet-core.md
 - name: Tutorials
   items:
-  - name: Create, debug and deploy a multi-service Service Fabric Mesh web app
+  - name: Build and deploy a Mesh app with Visual Studio
     items:
-    - name: 1- Build a Service Fabric Mesh web app
+    - name: 1- Create a Mesh app
       href: service-fabric-mesh-tutorial-create-dotnetcore.md
-    - name: 2- Debug a Service Fabric Mesh web app
+    - name: 2- Debug a Mesh app
       href: service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md
-    - name: 3- Deploy a Service Fabric Mesh web app
+    - name: 3- Deploy a Mesh app
       href: service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md
+    - name: 4- Upgrade a Mesh app
+      href: service-fabric-mesh-tutorial-upgrade.md
+    - name: 5- Clean up Mesh resources
+      href: service-fabric-mesh-tutorial-cleanup-resources.md
+  - name: Deploy, scale, and upgrade an Service Fabric Mesh app using a template
+    items:
+    - name: 1- Deploy a Service Fabric Mesh app
+      href: service-fabric-mesh-tutorial-template-deploy-app.md
+    - name: 2- Scale services in an application
+      href: service-fabric-mesh-tutorial-template-scale-services.md
+    - name: 3- Upgrade an application
+      href: service-fabric-mesh-tutorial-template-upgrade-app.md
+    - name: 4- Remove an application
+      href: service-fabric-mesh-tutorial-template-remove-app.md
 - name: Concepts
   items:
   - name: Terminology

articles/service-fabric-mesh/index.yml

@@ -34,11 +34,11 @@ sections:
 - title: Step-by-Step Tutorials
   items:
   - type: paragraph
-    text: Learn how to create, debug, and deploy a multi-service Azure Service Fabric Mesh app.
+    text: Learn how to build and deploy a Mesh app with Visual Studio.
   - type: list
     style: unordered
     items:
-    - html: <a href="/azure/service-fabric-mesh/service-fabric-mesh-tutorial-create-dotnetcore">Create, debug, and deploy a multi-service web application to Service Fabric Mesh</a>
+    - html: <a href="/azure/service-fabric-mesh/service-fabric-mesh-tutorial-create-dotnetcore">Create, debug, deploy and upgrade a multi-service web application to Service Fabric Mesh</a>
 - title: Reference
   items:
   - type: list

articles/service-fabric-mesh/service-fabric-mesh-tutorial-cleanup-resources.md

@@ -0,0 +1,70 @@
+---
+title: Tutorial- Cleanup Azure Service Fabric Mesh resources | Microsoft Docs
+description: Learn how to remove Azure Service Fabric Mesh resources so that you do not get charged for resources you are no longer using.
+services: service-fabric-mesh
+documentationcenter: .net
+author: TylerMSFT
+manager: jeconnoc
+editor: ''
+ms.assetid:  
+ms.service: service-fabric-mesh
+ms.devlang: dotNet
+ms.topic: tutorial
+ms.tgt_pltfrm: NA
+ms.workload: NA
+ms.date: 09/18/2018
+ms.author: twhitney
+ms.custom: mvc, devcenter 
+#Customer intent: As a developer, I want to avoid being charged for Azure resources I am no longer using.
+---
+
+# Tutorial: Remove Azure resources
+
+This tutorial is part five of a series and shows you how to delete the app and its resources so that you don't get charged for them.
+
+In this tutorial you learn how to:
+> [!div class="checklist"]
+> * Clean up the resources used by the app so that you are not incurring a charge for them.
+
+In this tutorial series you learn how to:
+> [!div class="checklist"]
+> * [Create a Service Fabric Mesh app in Visual Studio](service-fabric-mesh-tutorial-create-dotnetcore.md)
+> * [Debug a Service Fabric Mesh app running in your local development cluster](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md)
+> * [Deploy a Service Fabric Mesh app](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> * [Upgrade a Service Fabric Mesh app](service-fabric-mesh-tutorial-upgrade.md)
+> * Clean up Service Fabric Mesh resources
+
+[!INCLUDE [preview note](./includes/include-preview-note.md)]
+
+## Prerequisites
+
+Before you begin this tutorial:
+
+* If you haven't deployed the to-do app, follow the instructions in [Publish a Service Fabric Mesh web application](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md).
+
+## Clean up resources
+
+This is the end of the tutorial. When you are done with the resources you have created, delete them so that you are not charged for resources you are no longer using. This is particularly important because Mesh is a serverless service that bills per second. To learn more about Mesh pricing, check out https://aka.ms/sfmeshpricing.
+
+One of the conveniences that Azure provides is that when you create resources that are associated to a particular resource group, deleting the resource group deletes all of the associated resources. That way you don't have to delete them one by one.
+
+Since you created a new resource group to create the to-do app, you can safely delete this resource group, which will delete all of the associated resources.
+
+```azurecli
+az group delete --resource-group sfmeshTutorial1RG
+```
+
+```powershell
+Remove-AzureRmResourceGroup -Name sfmeshTutorial1RG
+```
+
+Alternatively, you can delete the **sfmeshTutorial1RG** resource group [from the portal](../azure-resource-manager/resource-group-portal.md#delete-resource-group-or-resources). 
+
+## Next steps
+
+Now that you have completed publishing a Service Fabric Mesh application to Azure, try the following:
+
+* To see another example of service-to-service communication, explore the [Voting app sample](https://github.com/Azure-Samples/service-fabric-mesh/tree/master/src/votingapp)
+* To learn more about Service Fabric Resource Model, see [Service Fabric Mesh Resource Model](service-fabric-mesh-service-fabric-resources.md).
+* To learn more about Service Fabric Mesh, read the [Service Fabric Mesh overview](service-fabric-mesh-overview.md).
+* Read about the [Cloud Shell](https://docs.microsoft.com/azure/cloud-shell/overview)

articles/service-fabric-mesh/service-fabric-mesh-tutorial-create-dotnetcore.md

@@ -1,5 +1,5 @@
 ---
-title: Tutorial-Create, debug, and deploy a multi-service web application to Service Fabric Mesh | Microsoft Docs
+title: Tutorial-Create, debug, deploy, and monitor a multi-service application to Service Fabric Mesh | Microsoft Docs
 description: In this tutorial, you create a multi-service Azure Service Fabric Mesh application consisting of an ASP.NET Core website that communicates with a back-end web service, debug it locally, and publish it to Azure.
 services: service-fabric-mesh
 documentationcenter: .net
@@ -12,22 +12,24 @@ ms.devlang: dotNet
 ms.topic: tutorial
 ms.tgt_pltfrm: NA
 ms.workload: NA
-ms.date: 07/17/2018
+ms.date: 09/18/2018
 ms.author: twhitney
 ms.custom: mvc, devcenter
-#Customer intent: As a developer, I want learn how to create a Service Fabric Mesh app that communicates with another service, and then publish it to Azure.
+#Customer intent: As a developer, I want learn how to create a Service Fabric Mesh app that communicates with another service, debug it on my local development cluster, publish it to Azure, monitor it, upgrade it, and then clean up resources so that I am not charged for what I'm not using.
 ---
 
-# Tutorial: Create, debug, and deploy a multi-service web application to Service Fabric Mesh
+# Tutorial: Create, debug, deploy and upgrade a multi-service Service Fabric Mesh app
 
-This tutorial is part one of a series. You'll learn how to create an Azure Service Fabric Mesh application that has an ASP.NET web front end and an ASP.NET Core Web API back-end service. Then you'll debug the app on your local development cluster and publish the app to Azure. When you're finished, you'll have a simple to-do app that demonstrates a service-to-service call in a Service Fabric Mesh application running in Azure Service Fabric Mesh.
+This tutorial is part one of a series. You'll learn how to use Visual Studio to create an Azure Service Fabric Mesh app that has an ASP.NET web front-end and an ASP.NET Core Web API back-end service. Then you'll debug the app on your local development cluster. You'll publish the app to Azure and then make config and code changes and upgrade the app. Finally, you'll clean up unused Azure resources so that you are not charged for what you aren't using.
+
+When you're finished, you'll have walked through most of the phases of app lifecycle management and have built an app that demonstrates a service-to-service call in a Service Fabric Mesh app.
 
 If you don't want to manually create the to-do application, you can [download the source code](https://github.com/azure-samples/service-fabric-mesh) for the completed application  and skip ahead to [Debug the app locally](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md).
 
 In part one of the series, you learn how to:
 
 > [!div class="checklist"]
-> * Create a Service Fabric Mesh application consisting of an ASP.NET web front end.
+> * Use Visual Studio to create a Service Fabric Mesh app consisting of an ASP.NET web front end.
 > * Create a model to represent to-do items.
 > * Create a back-end service & retrieve data from it.
 > * Add a controller and DataContext as part of that Model View Controller pattern for the back-end service.
@@ -36,9 +38,11 @@ In part one of the series, you learn how to:
 
 In this tutorial series you learn how to:
 > [!div class="checklist"]
-> * Build a Service Fabric Mesh application
-> * [Debug the app locally](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md)
-> * [Publish the app to Azure](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> * Create a Service Fabric Mesh app in Visual Studio
+> * [Debug a Service Fabric Mesh app running in your local development cluster](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md)
+> * [Deploy a Service Fabric Mesh app](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> * [Upgrade a Service Fabric Mesh app](service-fabric-mesh-tutorial-upgrade.md)
+> * [Clean up Service Fabric Mesh resources](service-fabric-mesh-tutorial-cleanup-resources.md)
 
 [!INCLUDE [preview note](./includes/include-preview-note.md)]
 
@@ -50,9 +54,7 @@ Before you begin this tutorial:
 
 * Make sure that you've [set up your development environment](service-fabric-mesh-howto-setup-developer-environment-sdk.md) which includes installing the Service Fabric runtime, SDK, Docker, and Visual Studio 2017.
 
-* The app for this tutorial must, for now, be built using the English locale.
-
-## Create a Service Fabric Mesh project
+## Create a Service Fabric Mesh project in Visual Studio
 
 Run Visual Studio and select **File** > **New** > **Project...**
 
@@ -208,10 +210,7 @@ public static class DataContext
 
     static DataContext()
     {
-        ToDoList = new Model.ToDoList("Main List");
-
         // Seed to-do list
-
         ToDoList.Add(Model.ToDoItem.Load("Learn about microservices", 0, true));
         ToDoList.Add(Model.ToDoItem.Load("Learn about Service Fabric", 1, true));
         ToDoList.Add(Model.ToDoItem.Load("Learn about Service Fabric Mesh", 2, false));
@@ -364,6 +363,7 @@ In the service.yaml file, add the following variables under `environmentVariable
 
 > [!IMPORTANT]
 > Spaces, not tabs, must be used to indent the variables in the service.yaml file or it won't compile. Visual Studio may insert tabs as you create the environment variables. Replace all tabs with spaces. Although you'll see errors in the **build** debug output, the app will still launch. It won't work, however, until you convert the tabs to spaces. To ensure that no tabs are in the service.yaml file, you can make whitespace visible in the Visual Studio editor with  **Edit**  > **Advanced**  > **View White Space**.
+> Note that service.yaml files are processed using the English locale.  For example, if you need to use a decimal separator, use a period rather than a comma.
 
 Your **WebFrontEnd** project's **service.yaml** file should look something like this although your `ApiHostPort` value will probably be different:
 
@@ -376,7 +376,7 @@ Now you are ready to build and deploy the image the Service Fabric Mesh applicat
 In this part of the tutorial, you learned how to:
 
 > [!div class="checklist"]
-> * Create a Service Fabric Mesh application consisting of an ASP.NET web front end.
+> * Create a Service Fabric Mesh app consisting of an ASP.NET web front-end.
 > * Create a model to represent to-do items.
 > * Create a back-end service & retrieve data from it.
 > * Add a controller and DataContext as part of that Model View Controller pattern for the back-end service.
@@ -385,4 +385,4 @@ In this part of the tutorial, you learned how to:
 
 Advance to the next tutorial:
 > [!div class="nextstepaction"]
-> [Debug a Service Fabric Mesh application running locally](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md)
+> [Debug a Service Fabric Mesh application running in your local development cluster](service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md)

articles/service-fabric-mesh/service-fabric-mesh-tutorial-debug-service-fabric-mesh-app.md

@@ -1,5 +1,5 @@
 ---
-title: Tutorial- Debug an Azure Service Fabric Mesh web application | Microsoft Docs
+title: Tutorial- Debug an Azure Service Fabric Mesh web application running in your local development cluster | Microsoft Docs
 description: In this tutorial, debug an Azure Service Fabric Mesh application running on your local cluster.
 services: service-fabric-mesh
 documentationcenter: .net
@@ -12,15 +12,15 @@ ms.devlang: dotNet
 ms.topic: tutorial
 ms.tgt_pltfrm: NA
 ms.workload: NA
-ms.date: 07/17/2018
+ms.date: 09/18/2018
 ms.author: twhitney
 ms.custom: mvc, devcenter 
-#Customer intent: As a developer, I want learn how to debug a Service Fabric Mesh app that communicates with another service.
+#Customer intent: As a developer, I want learn how to debug a Service Fabric Mesh app on my local development cluster
 ---
 
-# Tutorial: Debug a Service Fabric Mesh web application
+# Tutorial: Debug a Service Fabric Mesh application running in your local development cluster
 
-This tutorial is part two of a series and shows you how to debug an Azure Service Fabric Mesh web application on your local development cluster.
+This tutorial is part two of a series and shows you how to build and debug an Azure Service Fabric Mesh app on your local development cluster.
 
 In this tutorial you will learn:
 
@@ -30,9 +30,11 @@ In this tutorial you will learn:
 
 In this tutorial series you learn how to:
 > [!div class="checklist"]
-> * [Build a Service Fabric Mesh application](service-fabric-mesh-tutorial-create-dotnetcore.md)
-> * Debug the app locally
-> * [Publish the app to Azure](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> * [Create a Service Fabric Mesh app in Visual Studio](service-fabric-mesh-tutorial-create-dotnetcore.md)
+> * Debug a Service Fabric Mesh app running in your local development cluster
+> * [Deploy a Service Fabric Mesh app](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> * [Upgrade a Service Fabric Mesh app](service-fabric-mesh-tutorial-upgrade.md)
+> * [Clean up Service Fabric Mesh resources](service-fabric-mesh-tutorial-cleanup-resources.md)
 
 [!INCLUDE [preview note](./includes/include-preview-note.md)]
 
@@ -101,4 +103,4 @@ In this part of the tutorial, you learned:
 
 Advance to the next tutorial:
 > [!div class="nextstepaction"]
-> [Publish a Service Fabric Mesh web application](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)
+> [Deploy a Service Fabric Mesh app](service-fabric-mesh-tutorial-deploy-service-fabric-mesh-app.md)