Merge pull request #206001 from tomvcassidy/ubuntu16.04Remove

Removing References to Ubuntu 16.04

Author: BCS2022

articles/service-fabric/service-fabric-cluster-creation-via-arm.md

@@ -26,7 +26,7 @@ If you are creating a production cluster to run production workloads, we recomme
 [!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
 
 ## Prerequisites 
-In this article, use the Service Fabric RM powershell or Azure CLI modules to deploy a cluster:
+In this article, use the Service Fabric RM PowerShell or Azure CLI modules to deploy a cluster:
 
 * [Azure PowerShell 4.1 and above][azure-powershell]
 * [Azure CLI version 2.0 and above][azure-CLI]
@@ -60,7 +60,7 @@ You can use either the following PowerShell or Azure CLI commands to create a cl
 The default template used is available here for [Windows](https://github.com/Azure-Samples/service-fabric-cluster-templates/tree/master/5-VM-Windows-1-NodeTypes-Secure-NSG)
  and here for [Ubuntu](https://github.com/Azure-Samples/service-fabric-cluster-templates/tree/master/5-VM-Ubuntu-1-NodeTypes-Secure).
 
-The following commands can create either Windows or Linux clusters, depending on how specify the OS parameter. Both PowerShell/CLI commands output the certificate in the specified *CertificateOutputFolder* (make sure the certificate folder location you specify already exists before running the command!).
+The following commands can create either Windows or Linux clusters, depending on how you specify the OS parameter. Both PowerShell/CLI commands output the certificate in the specified *CertificateOutputFolder* (make sure the certificate folder location you specify already exists before running the command!).
 
 > [!NOTE]
 > The following PowerShell command only works with the Azure PowerShell `Az` module. To check the current version of Azure Resource Manager PowerShell version, run the following PowerShell command "Get-Module Az". Follow [this link](/powershell/azure/install-Az-ps) to upgrade your Azure Resource Manager PowerShell version.
@@ -93,7 +93,7 @@ declare CertSubjectName="mylinux.westus.cloudapp.azure.com"
 declare vmpassword="Password!1"
 declare certpassword="Password!4321"
 declare vmuser="myadmin"
-declare vmOs="UbuntuServer1604"
+declare vmOs="UbuntuServer1804"
 declare certOutputFolder="c:\certificates"
 
 az sf cluster create --resource-group $resourceGroupName --location $resourceGroupLocation  \
@@ -159,7 +159,7 @@ You can use the following command to specify an existing certificate to create a
 
 If this is a CA signed certificate that you will end up using for other purposes as well, then it is recommended that you provide a distinct resource group specifically for your key vault. We recommend that you put the key vault into its own resource group. This action lets you remove the compute and storage resource groups, including the resource group that contains your Service Fabric cluster, without losing your keys and secrets. **The resource group that contains your key vault *must be in the same region* as the cluster that is using it.**
 
-### Use the default five node, one node type template that ships in the module
+### Use the default five nodes, one node type template that ships in the module
 
 The default template used is available here for [Windows](https://github.com/Azure-Samples/service-fabric-cluster-templates/tree/master/5-VM-Windows-1-NodeTypes-Secure-NSG)
  and here for [Ubuntu](https://github.com/Azure-Samples/service-fabric-cluster-templates/tree/master/5-VM-Ubuntu-1-NodeTypes-Secure).
@@ -190,7 +190,7 @@ declare resourceGroupName="mylinux"
 declare vaultResourceGroupName="myvaultrg"
 declare vaultName="myvault"
 declare certificate-file="c:\certificates\mycert.pem"
-declare vmOs="UbuntuServer1604"
+declare vmOs="UbuntuServer1804"
 
 az sf cluster create --resource-group $resourceGroupName --location $resourceGroupLocation  \
 	--certificate-file $certificate-file --certificate-password $certPassword  \

articles/service-fabric/service-fabric-cluster-upgrade-os.md

@@ -11,18 +11,18 @@ ms.date: 07/14/2022
 
 # Upgrade Linux OS for Azure Service Fabric
 
-This document describes how to migrate your Azure Service Fabric for Linux cluster from Ubuntu version 16.04 LTS to 18.04 LTS. Each operating system (OS) version requires a different Service Fabric runtime package. This article describes the steps required to facilitate a smooth migration to the newer version.
+This document describes how to migrate your Azure Service Fabric for Linux cluster from Ubuntu version 18.04 LTS to 20.04 LTS. Each operating system (OS) version requires a different Service Fabric runtime package. This article describes the steps required to facilitate a smooth migration to the newer version.
 
 ## Approach to migration
 
 The general approach to the migration follows these steps:
 
-1. Switch the Service Fabric cluster Azure Resource Manager resource `vmImage` to `Ubuntu18_04`. This setting pulls future code upgrades for this OS version. This temporary OS mismatch against existing node types blocks automatic code upgrade rollouts to ensure safe rollover.
+1. Switch the Service Fabric cluster Azure Resource Manager resource `vmImage` to `Ubuntu20_04`. This setting pulls future code upgrades for this OS version. This temporary OS mismatch against existing node types blocks automatic code upgrade rollouts to ensure safe rollover.
 
    > [!TIP]
    > Avoid issuing manual Service Fabric cluster code upgrades during the OS migration. Doing so may cause the old node type nodes to enter a state that requires human intervention.
 
-1. For each node type in the cluster, create another node type that targets the Ubuntu 18.04 OS image for the underlying Virtual Machine Scale Set. Each new node type assumes the role of its old counterpart.
+1. For each node type in the cluster, create another node type that targets the Ubuntu 20.04 OS image for the underlying Virtual Machine Scale Set. Each new node type assumes the role of its old counterpart.
 
    * A new primary node type has to be created to replace the old node type marked as `isPrimary: true`.
    * For each non-primary node type, these nodes types are marked `isPrimary: false`.
@@ -48,7 +48,7 @@ This procedure demonstrates how to quickly prototype the node type migration by
     $resourceGroup="Group1"
     $clusterName="Contoso01SFCluster"
     # Update cluster vmImage to target OS. This registers the SF runtime package type that is supplied for upgrades.
-    Update-AzServiceFabricVmImage -ResourceGroupName $resourceGroup -ClusterName $clusterName -VmImage Ubuntu18_04
+    Update-AzServiceFabricVmImage -ResourceGroupName $resourceGroup -ClusterName $clusterName -VmImage Ubuntu20_04
     ```
 
 2. Add new node type counterpart for each of the existing node types:

articles/service-fabric/service-fabric-get-started-linux.md

@@ -88,7 +88,7 @@ For manual installation of the Service Fabric runtime and common SDK, follow the
     sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     ```
 
-6. Add Azul JDK Key to your APT keyring and setup its repository.
+6. Add Azul JDK Key to your APT keyring and set up its repository.
 
     ```bash
     sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
@@ -195,16 +195,12 @@ Start a container-based [Service Fabric Onebox](https://hub.docker.com/_/microso
     ```bash
     docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u20
     ```
+
     <b>Ubuntu 18.04 LTS:</b>
     ```bash
     docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18
     ```
 
-    <b>Ubuntu 16.04 LTS:</b>
-    ```bash
-    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u16
-    ```
-
     >[!TIP]
     > By default, this will pull the image with the latest version of Service Fabric. For particular revisions, please visit the [Docker Hub](https://hub.docker.com/r/microsoft/service-fabric-onebox/) page.
 

articles/service-fabric/service-fabric-get-started-mac.md

@@ -14,16 +14,16 @@ ms.date: 07/14/2022
 # service-fabric-local-linux-cluster-windows.md
 ---
 
-# Set up your development environment on Mac OS X
+# Set up your development environment on macOS X
 > [!div class="op_single_selector"]
 > * [Windows](service-fabric-get-started.md)
 > * [Linux](service-fabric-get-started-linux.md)
-> * [Mac OS X](service-fabric-get-started-mac.md)
+> * [macOS X](service-fabric-get-started-mac.md)
 
-You can build Azure Service Fabric applications to run on Linux clusters by using Mac OS X. This document covers how to set up your Mac for development.
+You can build Azure Service Fabric applications to run on Linux clusters by using macOS X. This document covers how to set up your Mac for development.
 
 ## Prerequisites
-Azure Service Fabric doesn't run natively on Mac OS X. To run a local Service Fabric cluster, a pre-configured Docker container image is provided. Before you get started, you'll need:
+Azure Service Fabric doesn't run natively on macOS X. To run a local Service Fabric cluster, a pre-configured Docker container image is provided. Before you get started, you'll need:
 
 * The system requirements for installing [Docker Desktop on Mac](https://docs.docker.com/docker-for-mac/install/)
 
@@ -56,14 +56,14 @@ To set up a local Docker container and have a Service Fabric cluster running on
     >We recommend increasing the resources allocated to Docker when testing large applications. This can be done by selecting the **Docker Icon**, then selecting **Advanced** to adjust the number of cores and memory.
 
 2. Start the cluster.<br/>
-    <b>Ubuntu 18.04 LTS:</b>
+    <b>Ubuntu 20.04 LTS:</b>
     ```bash
-    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18
+    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u20
     ```
 
-    <b>Ubuntu 16.04 LTS:</b>
+    <b>Ubuntu 18.04 LTS:</b>
     ```bash
-    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u16
+    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18
     ```
 
     >[!TIP]
@@ -147,14 +147,14 @@ sfctl cluster select --endpoint http://localhost:19080
 
 Service Fabric provides scaffolding tools that help you to create a Service Fabric application from the terminal by using the Yeoman template generator. Use the following steps to ensure that the Service Fabric Yeoman template generator is working on your machine:
 
-1. Node.js and Node Package Manager (NPM) must be installed on your Mac. The software can be installed by using [HomeBrew](https://brew.sh/), as follows:
+1. Node.js and Node Package Manager must be installed on your Mac. The software can be installed by using [HomeBrew](https://brew.sh/), as follows:
 
     ```bash
     brew install node
     node -v
     npm -v
     ```
-2. Install the [Yeoman](https://yeoman.io/) template generator on your machine from NPM:
+2. Install the [Yeoman](https://yeoman.io/) template generator on your machine from Node Package Manager:
 
     ```bash
     npm install -g yo

articles/service-fabric/service-fabric-how-to-publish-linux-app-vs.md

@@ -1,6 +1,6 @@
 ---
-title: Create and Publish a.Net Core app to a remote Linux Cluster
-description: Create and publish .Net Core apps targeting a remote Linux cluster from Visual Studio
+title: Create and Publish a .NET Core app to a remote Linux Cluster
+description: Create and publish .NET Core apps targeting a remote Linux cluster from Visual Studio
 ms.topic: how-to
 ms.author: tomcassidy
 author: tomvcassidy
@@ -9,26 +9,26 @@ services: service-fabric
 ms.date: 07/14/2022
 ---
 
-# Use Visual Studio to create and publish .Net Core applications targeting a remote Linux Service Fabric cluster
-With Visual Studio tooling you can develop and publish Service Fabric .Net Core applications targeting a Linux Service Fabric cluster. The SDK version must be 3.4 or above to deploy a .Net Core application targeting Linux Service Fabric clusters from Visual Studio.
+# Use Visual Studio to create and publish .NET Core applications targeting a remote Linux Service Fabric cluster
+With Visual Studio tooling you can develop and publish Service Fabric .NET Core applications targeting a Linux Service Fabric cluster. The SDK version must be 3.4 or above to deploy a .NET Core application targeting Linux Service Fabric clusters from Visual Studio.
 
 > [!Note]
 > Visual Studio doesn't support debugging Service Fabric applications which target Linux.
 >
 
-## Create a Service Fabric application targeting .Net Core
+## Create a Service Fabric application targeting .NET Core
 1. Launch Visual Studio as an **administrator**.
 2. Create a project with **File->New->Project**.
 3. In the **New Project** dialog, choose **Cloud -> Service Fabric Application**.
 ![create-application]
 4. Name the application and click **Ok**.
-5. On the **New Service Fabric Service** page, select the type of service you would like to create under the **.Net Core Section**.
+5. On the **New Service Fabric Service** page, select the type of service you would like to create under the **.NET Core Section**.
 ![create-service]
 
 ## Deploy to a remote Linux cluster
 1. In the solution explorer, right click on the application and select **Build**.
 ![build-application]
-2. Once the build process for the application has completed, right click on the service and select edit the **csproj file**.
+2. Once the build process for the application has completed, right click on the service and choose to edit the **csproj file**.
 ![edit-csproj]
 3. Edit the UpdateServiceFabricManifestEnabled property from True to **False** if the service is an **actor project type**. If your application does not have an actor service, skip to step 4.
 ```xml
@@ -40,7 +40,7 @@ With Visual Studio tooling you can develop and publish Service Fabric .Net Core
 
 4. Update the RuntimeIndetifier from win7-x64 to the target platform in the service project.
 ```xml
-    <RuntimeIdentifier>ubuntu.16.04-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>ubuntu.20.04-x64</RuntimeIdentifier>
 ```
 5. In the ServiceManifest, update the entrypoint program to remove .exe. 
 ```xml
@@ -62,4 +62,4 @@ With Visual Studio tooling you can develop and publish Service Fabric .Net Core
 [publish-application]:./media/service-fabric-how-to-vs-remote-linux-cluster/publish-remote-linux.png
 
 ## Next steps
-* Learn about [Getting started with Service Fabric with .Net Core](https://azure.microsoft.com/resources/samples/service-fabric-dotnet-core-getting-started/)
+* Learn about [Getting started with Service Fabric with .NET Core](https://azure.microsoft.com/resources/samples/service-fabric-dotnet-core-getting-started/)

articles/service-fabric/service-fabric-local-linux-cluster-windows.md

@@ -51,14 +51,14 @@ To set up a local Docker container and have a Service Fabric cluster running on
     * Apply & Restart - restart the Docker daemon for the changes to take effect.
 
 2. Start the cluster via PowerShell.<br/>
-    <b>Ubuntu 18.04 LTS:</b>
-    ```powershell
-    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18
+    <b>Ubuntu 20.04 LTS:</b>
+    ```bash
+    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u20
     ```
 
-    <b>Ubuntu 16.04 LTS:</b>
+    <b>Ubuntu 18.04 LTS:</b>
     ```powershell
-    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u16
+    docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18
     ```
 
     >[!TIP]

articles/service-fabric/service-fabric-quickstart-containers-linux.md

@@ -75,7 +75,7 @@ az group create --name $ResourceGroupName --location $Location
 # Create secure five node Linux cluster. Creates a key vault in a resource group
 # and creates a certificate in the key vault. The certificate's subject name must match 
 # the domain that you use to access the Service Fabric cluster.  The certificate is downloaded locally.
-az sf cluster create --resource-group $ResourceGroupName --location $Location --certificate-output-folder . --certificate-password $Password --certificate-subject-name $Subject --cluster-name $ClusterName --cluster-size 5 --os UbuntuServer1604 --vault-name $VaultName --vault-resource-group $ResourceGroupName --vm-password $VmPassword --vm-user-name $VmUserName
+az sf cluster create --resource-group $ResourceGroupName --location $Location --certificate-output-folder . --certificate-password $Password --certificate-subject-name $Subject --cluster-name $ClusterName --cluster-size 5 --os UbuntuServer1804 --vault-name $VaultName --vault-resource-group $ResourceGroupName --vm-password $VmPassword --vm-user-name $VmUserName
 ```
 
 > [!Note]
@@ -87,12 +87,12 @@ az sf cluster create --resource-group $ResourceGroupName --location $Location --
 Service Fabric provides several tools that you can use to manage a cluster and its applications:
 
 - Service Fabric Explorer, a browser-based tool.
-- Service Fabric Command Line Interface (CLI), which runs on top of Azure CLI. 
+- Service Fabric Command Line Interface (CLI), which runs on top of Azure CLI.
 - PowerShell commands.
 
 In this quickstart, you use the Service Fabric CLI and Service Fabric Explorer (a web based tool). To use Service Fabric Explorer, you need to import the certificate PFX file into the browser. By default, the PFX file has no password.
 
-Mozilla Firefox is the default browser in Ubuntu 16.04. To import the certificate into Firefox, click the menu button in the upper right corner of your browser, then click **Options**. On the **Preferences** page, use the search box to search for "certificates". Click **View Certificates**, select the **Your Certificates** tab, click **Import** and follow the prompts to import the certificate.
+Mozilla Firefox is the default browser in Ubuntu 18.04. To import the certificate into Firefox, click the menu button in the upper right corner of your browser, then click **Options**. On the **Preferences** page, use the search box to search for "certificates". Click **View Certificates**, select the **Your Certificates** tab, click **Import** and follow the prompts to import the certificate.
 
    ![Install certificate on Firefox](./media/service-fabric-quickstart-containers-linux/install-cert-firefox.png)