Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-qsrt1722536

davidsmatlak · davidsmatlak · commit 394162e9a6be · 2020-05-26T14:33:21.000-07:00
diff --git a/articles/cost-management-billing/costs/understand-work-scopes.md b/articles/cost-management-billing/costs/understand-work-scopes.md
@@ -62,6 +62,7 @@ Cost Management supports the following built-in roles for each of the following
 
 Cost Management Contributor is the recommended least-privilege role. It allows people access to create and manage budgets and exports to more effectively monitor and report on costs. Cost Management Contributors might also require additional roles to support end-to-end cost management scenarios. Consider the following scenarios:
 
+- **Reporting on resource usage** – Azure Cost Management shows cost in the Azure portal and also includes usage as it pertains to cost in the full usage and charges API and download, but you may also want to drill into detailed usage metrics in Azure Monitor to get a deeper understanding. Consider granting [Monitoring Reader](../../role-based-access-control/built-in-roles.md#monitoring-reader) on any scope where you need also report on detailed usage metrics.
 - **Act when budgets are exceeded** – Cost Management Contributors also need access to create and/or manage action groups to automatically react to overages. Consider granting [Monitoring Contributor](../../role-based-access-control/built-in-roles.md#monitoring-contributor) to a resource group that contains the action group to use when budget thresholds are exceeded. Automating specific actions requires additional roles for the specific services used, such as Automation and Azure Functions.
 - **Schedule cost data export** – Cost Management Contributors also need access to manage storage accounts to schedule an export to copy data into a storage account. Consider granting [Storage Account Contributor](../../role-based-access-control/built-in-roles.md#storage-account-contributor) to a resource group that contains the storage account where cost data is exported.
 - **Viewing cost-saving recommendations** – Cost Management Readers and Cost Management Contributors have access to *view* cost recommendations by default. However, access to act on the cost recommendations requires access to individual resources. Consider granting a [service-specific role](../../role-based-access-control/built-in-roles.md#all) if you want to act on a cost-based recommendation.
diff --git a/articles/dev-spaces/about.md b/articles/dev-spaces/about.md
@@ -34,7 +34,7 @@ For more information on how Azure Dev Spaces works, see [How Azure Dev Spaces wo
 
 ## Supported regions and configurations
 
-Azure Dev Spaces is supported only by AKS clusters in [some regions][supported-regions]. Azure Dev Spaces supports using the [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest) or [Visual Studio Code](https://code.visualstudio.com/download) with the [Azure Dev Spaces extension](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) installed on Linux, macOS, or Windows 8 or greater to build and run your applications on AKS. It also supports using [Visual Studio](https://aka.ms/vsdownload?utm_source=mscom&utm_campaign=msdocs) installed on Windows 8 or greater. For Visual Studio 2019, you will need the Azure Development workload. For Visual Studio 2017, you will need the Web Development workload and [Visual Studio Tools for Kubernetes](https://aka.ms/get-vsk8stools).
+Azure Dev Spaces is supported only by AKS clusters in [some regions][supported-regions]. Azure Dev Spaces supports using the [Azure CLI](/cli/azure/install-azure-cli?view=azure-cli-latest) or [Visual Studio Code](https://code.visualstudio.com/download) with the [Azure Dev Spaces extension](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds) installed on Linux, macOS, or Windows 8 or greater to build and run your applications on AKS. It also supports using [Visual Studio 2019](https://aka.ms/vsdownload?utm_source=mscom&utm_campaign=msdocs) installed on Windows with the Azure Development workload.
 
 ## Next steps
 
diff --git a/articles/dev-spaces/get-started-netcore-visualstudio.md b/articles/dev-spaces/get-started-netcore-visualstudio.md
@@ -44,7 +44,7 @@ In this guide, you will learn how to:
 1. Select **Review + create** and then **Create** when complete.
 
 ## Get the Visual Studio tools
-Install the latest version of [Visual Studio](https://www.visualstudio.com/vs/). For Visual Studio 2019 on Windows you need to install the Azure Development workload. For Visual Studio 2017 on Windows you need to install the ASP.NET and web development workload as well as [Visual Studio Tools for Kubernetes](https://aka.ms/get-azds-visualstudio).
+Install the latest version of [Visual Studio 2019](https://www.visualstudio.com/vs/) on Windows with the Azure Development workload.
 
 ## Create a web app running in a container
 
diff --git a/articles/dev-spaces/how-dev-spaces-works-cluster-setup.md b/articles/dev-spaces/how-dev-spaces-works-cluster-setup.md
@@ -81,7 +81,7 @@ While your application is running, the client-side tooling also:
 You can use the client-side tooling from the command line as part of the `azds` command. You can also use the client-side tooling with:
 
 * Visual Studio Code using the [Azure Dev Spaces extension](https://marketplace.visualstudio.com/items?itemName=azuredevspaces.azds).
-* Visual Studio with [Visual Studio Tools for Kubernetes](https://aka.ms/get-vsk8stools).
+* Visual Studio with the Azure Development workload.
 
 ## Next steps
 
diff --git a/articles/dev-spaces/how-to/install-dev-spaces.md b/articles/dev-spaces/how-to/install-dev-spaces.md
@@ -79,7 +79,6 @@ You can use the Azure Dev Spaces client-side tools to interact with dev spaces o
 
 * In [Visual Studio Code][vscode], install the [Azure Dev Spaces extension][vscode-extension].
 * In [Visual Studio 2019][visual-studio], install the Azure Development workload.
-* In Visual Studio 2017, install the Web Development workload and [Visual Studio Tools for Kubernetes][visual-studio-k8s-tools].
 * Download and install the [Windows][cli-win], [Mac][cli-mac], or [Linux][cli-linux] CLI.
 
 ## Next steps
diff --git a/articles/dev-spaces/how-to/upgrade-tools.md b/articles/dev-spaces/how-to/upgrade-tools.md
@@ -29,11 +29,9 @@ az aks use-dev-spaces -n <your-aks-cluster> -g <your-aks-cluster-resource-group>
 
 Once installed, the extension updates automatically. You might need to reload the extension to use the new features. In VS Code, open the **Extensions** pane, choose the **Azure Dev Spaces** extensions, and choose **Reload**.
 
-## Update the Visual Studio extension
+## Update Visual Studio
 
-Like with other extensions and updates, Visual Studio will notify you when there's an update available to the Visual Studio Tools for Kubernetes, which includes Azure Dev Spaces. Look for a flag icon on the top right of the screen.
-
-To update the tools in Visual Studio, choose the **Tools > Extensions and Updates** menu item, and on the left side, choose **Updates**. Find **Visual Studio Tools for Kubernetes** and choose the **Update** button.
+Azure Dev Spaces is part of the Azure Development workload and is included in all Visual Studio updates.
 
 ## Next steps
 
diff --git a/articles/dev-spaces/quickstart-netcore-visualstudio.md b/articles/dev-spaces/quickstart-netcore-visualstudio.md
@@ -25,7 +25,7 @@ Azure Dev Spaces also allows you debug and iterate using:
 ## Prerequisites
 
 - An Azure subscription. If you don't have one, you can create a [free account](https://azure.microsoft.com/free).
-- Visual Studio 2019 on Windows with the Azure Development workload installed. You can also use Visual Studio 2017 on Windows with the Web Development workload and [Visual Studio Tools for Kubernetes](https://aka.ms/get-vsk8stools) installed. If you don't have Visual Studio installed, download it [here](https://aka.ms/vsdownload?utm_source=mscom&utm_campaign=msdocs).
+- Visual Studio 2019 on Windows with the Azure Development workload installed. If you don't have Visual Studio installed, download it [here](https://aka.ms/vsdownload?utm_source=mscom&utm_campaign=msdocs).
 
 ## Create an Azure Kubernetes Service cluster
 
diff --git a/articles/dev-spaces/troubleshooting.md b/articles/dev-spaces/troubleshooting.md
@@ -16,7 +16,7 @@ If you have a problem when using Azure Dev Spaces, create an [issue in the Azure
 
 To troubleshoot problems more effectively, it may help to create more detailed logs for review.
 
-For the Visual Studio extension, set the `MS_VS_AZUREDEVSPACES_TOOLS_LOGGING_ENABLED` environment variable to 1. Be sure to restart Visual Studio for the environment variable to take effect. Once enabled, detailed logs are written to your `%TEMP%\Microsoft.VisualStudio.Azure.DevSpaces.Tools` directory.
+For Visual Studio, set the `MS_VS_AZUREDEVSPACES_TOOLS_LOGGING_ENABLED` environment variable to 1. Be sure to restart Visual Studio for the environment variable to take effect. Once enabled, detailed logs are written to your `%TEMP%\Microsoft.VisualStudio.Azure.DevSpaces.Tools` directory.
 
 In the CLI, you can output more information during command execution by using the `--verbose` switch. You can also browse more detailed logs in `%TEMP%\Azure Dev Spaces`. On a Mac, the *TEMP* directory can be found by running `echo $TMPDIR` from a terminal window. On a Linux computer, the *TEMP* directory is usually `/tmp`. In addition, verify that logging is enabled in your [Azure CLI configuration file](/cli/azure/azure-cli-configuration?view=azure-cli-latest#cli-configuration-values-and-environment-variables).
 
diff --git a/articles/marketplace/partner-center-portal/customer-dashboard.md b/articles/marketplace/partner-center-portal/customer-dashboard.md
@@ -94,6 +94,7 @@ The **Customer details** table displays a numbered list of the top 1000 customer
 - If records number is over 1000, exported data will be asynchronously placed in a downloads page for the next 30 days.
 - Filters can be applied to the table to display only the data that you are interested in. Data can be filtered by Company name, Customer ID, Marketplace Subscription ID, Azure License Type, Date Acquired, Date Lost, Customer Email, Customer Country/Region/State/City/Zip, Customer Language, and so on.
 - When an offer is purchased by a protected customer, information in **Customer Detailed Data** will be masked (************).
+- Customer dimension details such as Company Name, Customer Name, and Customer Email are at an organization ID level, not at Azure Marketplace or AppSource transaction level.
 
 ### Customer page filters
 
diff --git a/articles/storage/files/storage-sync-files-planning.md b/articles/storage/files/storage-sync-files-planning.md
@@ -270,7 +270,7 @@ Azure File Sync does not interoperate with NTFS Encrypted File System (NTFS EFS)
 ### Encryption in transit
 
 > [!NOTE]
-> Azure File Sync service will remove support for TLS1.0 and 1.1 in August 2020. All supported Azure File Sync agent versions already use TLS1.2 by default. Using an earlier version of TLS could occur if TLS1.2 was disabled on your server or a proxy is used. If you are using a proxy, we recommend you check the proxy configuration. Azure File Sync service regions added after 5/1/2020 will only support TLS1.2 and support for TLS1.0 and 1.1 will be removed from existing regions in August 2020.  For more information, see the [troubleshooting guide](storage-sync-files-troubleshoot.md#tls-12-required-for-azure-file-sync).
+> Azure File Sync service will remove support for TLS1.0 and 1.1 on August 1st, 2020. All supported Azure File Sync agent versions already use TLS1.2 by default. Using an earlier version of TLS could occur if TLS1.2 was disabled on your server or a proxy is used. If you are using a proxy, we recommend you check the proxy configuration. Azure File Sync service regions added after 5/1/2020 will only support TLS1.2 and support for TLS1.0 and 1.1 will be removed from existing regions on August 1st, 2020.  For more information, see the [troubleshooting guide](storage-sync-files-troubleshoot.md#tls-12-required-for-azure-file-sync).
 
 Azure File Sync agent communicates with your Storage Sync Service and Azure file share using the Azure File Sync REST protocol and the FileREST protocol, both of which always use HTTPS over port 443. Azure File Sync does not send unencrypted requests over HTTP. 
 
diff --git a/articles/stream-analytics/custom-deserializer-examples.md b/articles/stream-analytics/custom-deserializer-examples.md
@@ -107,7 +107,7 @@ message MessageBodyProto {
 }
 ```
 
-Running `protoc.exe` from the **Google.Protobuf.Tools** NuGet generates a .cs file with the definition. The generated file is not shown here.
+Running `protoc.exe` from the **Google.Protobuf.Tools** NuGet generates a .cs file with the definition. The generated file is not shown here. You must ensure that the version of Protobuf Nuget you use in your Stream Analytics project matches the Protobuf version that was used to generate the input. 
 
 The following code snippet is the deserializer implementation assuming the generated file is included in the project. This implementation is just a thin wrapper over the generated file.
 
diff --git a/articles/stream-analytics/machine-learning-udf.md b/articles/stream-analytics/machine-learning-udf.md
@@ -12,9 +12,6 @@ ms.date: 03/19/2020
 
 You can implement machine learning models as a user-defined function (UDF) in your Azure Stream Analytics jobs to do real-time scoring and predictions on your streaming input data. [Azure Machine Learning](../machine-learning/overview-what-is-azure-ml.md) allows you to use any popular open-source tool, such as Tensorflow, scikit-learn, or PyTorch, to prep, train, and deploy models.
 
-> [!NOTE]
-> This functionality is in public preview. You can access this feature on the Azure portal only by using the [Stream Analytics portal preview link](https://aka.ms/asaportalpreview). This functionality is also available in the latest version of [Stream Analytics tools for Visual Studio](https://docs.microsoft.com/azure/stream-analytics/stream-analytics-tools-for-visual-studio-install).
-
 ## Prerequisites
 
 Complete the following steps before you add a machine learning model as a function to your Stream Analytics job:
@@ -25,7 +22,7 @@ Complete the following steps before you add a machine learning model as a functi
 
 3. Make sure your web service accepts and returns JSON serialized data.
 
-4. Deploy your model on [Azure Kubernetes Service](../machine-learning/how-to-deploy-and-where.md#choose-a-compute-target) for high-scale production deployments. If the web service is not able to handle the number of requests coming from your job, the performance of your Stream Analytics job will be degraded, which impacts latency. Models deployed on Azure Container Instances are not supported today but will become available in the coming months.
+4. Deploy your model on [Azure Kubernetes Service](../machine-learning/how-to-deploy-and-where.md#choose-a-compute-target) for high-scale production deployments. If the web service is not able to handle the number of requests coming from your job, the performance of your Stream Analytics job will be degraded, which impacts latency. Models deployed on Azure Container Instances are supported only when you use the Azure portal.
 
 ## Add a machine learning model to your job
 
