Merge pull request #8665 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: ghogen

docs/extensibility/migration/update-visual-studio-extension.md

@@ -135,7 +135,7 @@ All these steps can be completed with Visual Studio 2019.
 Leave the `source.extension.vsixmanifest` file in the VSIX project.
    ![Shared project contains all source files](media/update-visual-studio-extension/source-files-in-shared-project.png)
 
-1. Metadata files (release notes, license, icons, and so on) and VSCT files should be moved to a shared directory and added as linked files to the VSIX project.
+1. Metadata files (release notes, license, icons, and so on) and VSCT files should be moved to a shared directory and added as linked files to the VSIX project. Note that the shared directory is separate from the shared project.
    ![Add metadata and VSCT files as linked files](media/update-visual-studio-extension/add-linked-items-to-vsix.png)
     - For Metadata files, set BuildAction to `Content` and set Include in VSIX to `true`.
 

docs/ide/reference/simplify-linq-expression.md

@@ -1,7 +1,7 @@
 ---
 title: Simplify LINQ expression
 description: "This refactoring is used to remove unnecessary calls to the Enumerable for the Where method."
-ms.date: 08/12/2020
+ms.date: 07/05/2021
 ms.topic: reference
 author: m-redding
 ms.author: midumont
@@ -22,7 +22,7 @@ This refactoring applies to:
 
 **When:**  All instances where the method calls `Single()`, `SingleOrDefault()`, and so on, doesn't have any arguments and is preceded by a `Where()` expression. The input to the `Where()` expression cannot be constructed as an expression tree.
 
-**Why:** Removing the unnecessary call to the Enumerable for the `.Where()` method improves performance and readability.
+**Why:** Removing the unnecessary call to the Enumerable for the `.Where()` method improves readability and in some cases performance, see remarks.
 
 ## How-to
 
@@ -31,6 +31,10 @@ This refactoring applies to:
 3. Select **Simplify LINQ expression**
 
    ![Convert typeof to nameof](media/simplify-linq-expression.png)
+   
+## Remarks
+
+In some cases this refactoring may reduce performance. LINQ operations on `List<T>` and `T[]` are not optimized in this case and result in worse performance.
 
 ## See also
 

docs/ide/work-with-multi-factor-authentication.md

@@ -63,7 +63,7 @@ Clicking on **Reenter your credentials** will open your system's default web bro
 
 ## How to opt out of using a specific Azure Active Directory tenant in Visual Studio
 
-Visual Studio 2019 version 16.6 offers the flexibility to filter out tenants individually or globally, effectively hidding them from Visual Studio. Filtering eliminates the need to authenticate with that tenant, but it also means that you won't be able to access any associated resources.
+Visual Studio 2019 version 16.6 offers the flexibility to filter out tenants individually or globally, effectively hiding them from Visual Studio. Filtering eliminates the need to authenticate with that tenant, but it also means that you won't be able to access any associated resources.
 
 This functionality is useful when you have multiple tenants, but want to optimize your development environment by targeting a specific subset. It can also help in instances when you can't validate a particular CA/MFA policy, as you can filter out the offending tenant. 
 

docs/msbuild/property-functions.md

@@ -210,32 +210,60 @@ $([MSBuild]::EnsureTrailingSlash('$(PathProperty)'))
 
 ## MSBuild GetDirectoryNameOfFileAbove
 
-The MSBuild `GetDirectoryNameOfFileAbove` property function looks for a file in the directories above the current directory in the path.
+The MSBuild `GetDirectoryNameOfFileAbove` property function searches upward for a directory containing the specified file, beginning in (and including) the specified directory. It returns the full path of the nearest directory containing the file if it is found, otherwise an empty string.
 
- This property function has the following syntax:
+This property function has the following syntax:
 
 ```
-$([MSBuild]::GetDirectoryNameOfFileAbove(string ThePath, string TheFile))
+$([MSBuild]::GetDirectoryNameOfFileAbove(string startingDirectory, string fileName))
 ```
 
- The following code is an example of this syntax.
+This example shows how to import the nearest *EnlistmentInfo.props* file in or above the current folder, only if a match is found:
 
 ```xml
 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), EnlistmentInfo.props))' != '' " />
 ```
 
+Note that this example can be written more concisely by using the `GetPathOfFileAbove` function instead:
+
+```xml
+<Import Project="$([MSBuild]::GetPathOfFileAbove(EnlistmentInfo.props))" Condition=" '$([MSBuild]::GetPathOfFileAbove(EnlistmentInfo.props))' != '' " />
+```
+
 ## MSBuild GetPathOfFileAbove
 
-The `GetPathOfFileAbove` property function in MSBuild returns the path of the specified file, if located in the directory structure above the current directory. It is functionally equivalent to calling
+The MSBuild `GetPathOfFileAbove` property function searches upward for a directory containing the specified file, beginning in (and including) the specified directory. It returns the full path of the nearest matching file if it is found, otherwise an empty string.
+
+This property function has the following syntax:
+
+```
+$([MSBuild]::GetDirectoryNameOfFileAbove(string file, [string startingDirectory]))
+```
+
+where `file` is the name of the file to search for and `startingDirectory` is an optional directory to start the search in. By default, the search will start in the current file's own directory.
+ 
+This example shows how to import a file named *dir.props* in or above the current directory, only if a match is found:
 
 ```xml
-<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+<Import Project="$([MSBuild]::GetPathOfFileAbove(dir.props))" Condition=" '$([MSBuild]::GetPathOfFileAbove(dir.props))' != '' " />
 ```
 
-This property function has the following syntax:
+which is functionally equivalent to
+
+```xml
+<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))' != '' " />
+```
 
+However, sometimes you need to start the search in the parent directory, to avoid matching the current file. This example shows how a *Directory.Build.props* file can import the nearest *Directory.Build.props* file in a strictly higher level of the tree, without recursively importing itself:
+
+```xml
+<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 ```
-$([MSBuild]::GetPathOfFileAbove(dir.props))
+
+which is functionally equivalent to
+
+```xml
+<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/Directory.Build.props" />
 ```
 
 ## MSBuild GetRegistryValue

docs/vsto/upgrading-and-migrating-office-solutions.md

@@ -1,6 +1,6 @@
 ---
 title: "Upgrade and migrate Office solutions"
-description: You must upgrade the project to use it in current versions of Visual Studio if you have a Offince project that was created in an earlier version of Visual Studio.
+description: You must upgrade the project to use it in current versions of Visual Studio if you have an Office project that was created in an earlier version of Visual Studio.
 ms.custom: SEO-VS-2020
 ms.date: "08/14/2019"
 ms.topic: "conceptual"