Merge pull request #8556 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to main

Author: ghogen

docs/ide/file-nesting-solution-explorer.md

@@ -16,10 +16,10 @@ ms.technology: vs-ide-general
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
-**Solution Explorer** nests related files to help organize them and make them easier to locate. For example, if you add a Windows Forms form to a project, the code file for the form is nested below the form in **Solution Explorer**. In ASP.NET Core projects, file nesting can be taken a step further. You can choose between the file nesting presets **Off**, **Default**, and **Web**. You can also [customize how files are nested](#customize-file-nesting) or [create solution-specific and project-specific settings](#create-project-specific-settings).
+**Solution Explorer** nests related files to help organize them and make them easier to locate. For example, if you add a Windows Forms form to a project, the code file for the form is nested below the form in **Solution Explorer**. In .NET Core (and .NET 5 and later) projects, file nesting can be taken a step further. You can choose between the file nesting presets **Off**, **Default**, and **Web**. You can also [customize how files are nested](#customize-file-nesting) or [create solution-specific and project-specific settings](#create-project-specific-settings).
 
 > [!NOTE]
-> The feature is supported for all .NET Core projects, but is only on by default for ASP.NET Core projects.
+> In Visual Studio 2022 version 17.2 and earlier, this feature was only supported for ASP.NET Core projects.
 
 ## File nesting options
 

docs/install/troubleshooting-installation-issues.md

@@ -20,7 +20,7 @@ ms.technology: vs-installation
 
  [!INCLUDE [Visual Studio](~/includes/applies-to-version/vs-windows-only.md)]
 
-> [!IMPORTANT]
+> [!TIP]
 > Having a problem installing? We can help. We offer an [**installation chat**](https://visualstudio.microsoft.com/vs/support/#talktous) (English only) support option.
 
 This troubleshooting guide includes step-by-step instructions that should resolve most installation issues.
@@ -154,15 +154,3 @@ Two policies control the ability to install WebView2: [Microsoft Edge 'Install (
 
 > [!NOTE]
 > If neither policy is configured, WebView2 installation is allowed by your organization.
-
-## Live help
-
-If the solutions listed in this troubleshooting guide don't help you successfully install or upgrade Visual Studio, use our [**live chat**](https://visualstudio.microsoft.com/vs/support/#talktous) support option (English only) for further assistance.
-
-## See also
-
-* [Repair Visual Studio](repair-visual-studio.md)
-* [Remove Visual Studio](uninstall-visual-studio.md#remove)
-* [Install and use Visual Studio and Azure Services behind a firewall or proxy server](install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md)
-* [Tools for detecting and managing Visual Studio instances](tools-for-managing-visual-studio-instances.md)
-* [Visual Studio administrator guide](visual-studio-administrator-guide.md)

docs/version-control/git-with-visual-studio.md

@@ -86,12 +86,6 @@ To personalize your Git settings at a repository level as well as at a global le
 
 :::image type="content" source="media/git-options-settings.png" alt-text="The Options dialog box where you can choose personalization and customization settings in Visual Studio IDE.":::
 
-## Enhanced experience & feedback
-
-We continue to add new features to enhance the Git experience. For more info about recent features and a feedback survey, see the [Multi-repo support in Visual Studio](https://devblogs.microsoft.com/visualstudio/multi-repo-support-in-visual-studio/) blog post. If you have a suggestion, let us know! We appreciate the opportunity to engage with you in the [**Developer Community**](https://aka.ms/vs-suggest).
-
-To try more recent/preview updates to the Git experience available, download and install from the [Visual Studio 2022 Preview](https://visualstudio.microsoft.com/vs/preview/) page. Read our [Visual Studio 2022 release notes](/visualstudio/releases/2022/release-notes) for details on each release.
-
 ::: moniker-end
 
 ::: moniker range="<=vs-2019"
@@ -283,11 +277,4 @@ The new Git experience is the default version control system in Visual Studio 20
 
 :::image type="content" source="media/git-opt-new-user-experience.png" alt-text="The Preview Features section of the Options dialog box in Visual Studio ":::
 
-## See also
-
-- [The new Git experience in Visual Studio 2019](git-with-visual-studio.md?view=vs-2019&preserve-view=true)
-- [Compare Git and Team Explorer side-by-side in Visual Studio 2019](git-team-explorer-feature-comparison.md?view=vs-2019&preserve-view=true)
-- [Work with GitHub accounts in Visual Studio](../ide/work-with-github-accounts.md)
-- [Visual Studio 2019 release notes](/visualstudio/releases/2019/release-notes)
-- To learn more about using Git and GitHub in Visual Studio 2019, watch the following YouTube video: [Getting started with Git in Visual Studio](https://www.youtube.com/watch?v=GCZ9x3yqkyc&list=PLReL099Y5nRc-zbaFbf0aNcIamBQujOxP)
 ::: moniker-end

docs/version-control/index.yml

@@ -31,6 +31,13 @@ landingContent:
             url: git-clone-repository.md
           - text: Create a new repo
             url: git-create-repository.md
+      - linkListType: reference
+        links:
+          - text: Compare Git & Team Explorer
+            url: git-team-explorer-feature-comparison.md
+          - text: Become a master at Git & open source (blog)
+            url: https://devblogs.microsoft.com/visualstudio/become-a-master-at-git-and-open-source/
+
 
   # Card
   - title: Innerloop dev workflow
@@ -62,28 +69,3 @@ landingContent:
           - text: Git settings & preferences
             url: git-settings.md
 
-  # Card
-  - title: Reference
-    linkLists:
-      - linkListType: reference
-        links:
-          - text: Compare Git & Team Explorer
-            url: git-team-explorer-feature-comparison.md
-          - text: Become a master at Git & open source (blog)
-            url: https://devblogs.microsoft.com/visualstudio/become-a-master-at-git-and-open-source/
-
-  # Card
-  - title: Resources
-    linkLists:
-      - linkListType: whats-new
-        links:
-          - text: Performance Enhancement - Git branch switching (blog)
-            url: https://devblogs.microsoft.com/visualstudio/vs2022-performance-enhancements-git-branch-switching/
-          - text: Supercharge your Git experience (blog)
-            url: https://devblogs.microsoft.com/visualstudio/supercharge-your-git-experience-in-vs/
-          - text: Release notes
-            url: /visualstudio/releases/2022/release-notes-preview
-          - text: Videos and more...
-            url: https://visualstudio.microsoft.com/vs/github/
-
-

docs/version-control/toc.yml

@@ -12,6 +12,8 @@
     href: git-clone-repository.md
   - name: Create a repo
     href: git-create-repository.md
+  - name: Git settings and preferences
+    href: git-settings.md    
 - name: Innerloop workflow
   expanded: true
   items:
@@ -36,11 +38,7 @@
     href: git-resolve-conflicts.md
 - name: Resources
   items:
-  - name: Git settings and preferences
-    href: git-settings.md
   - name: Create a GitHub account
     href: git-create-github-account.md
   - name: Compare Git and Team Explorer side-by-side
     href: git-team-explorer-feature-comparison.md
-  - name: Release notes
-    href: /visualstudio/releases/2022/release-notes

mac/set-up-git-repository.md

@@ -186,7 +186,3 @@ If you have issues with initializing your project with an empty remote repositor
 1. Browse to the Version Control menu and choose **Publish in Version Control**.
 1. Follow the steps of the above tutorial starting from the step 6.
 ::: moniker-end
-
-## See also
-
-- [Version control in Visual Studio (on Windows)](/visualstudio/version-control/)