Merge pull request #10415 from MicrosoftDocs/main638628230369395994sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

.github/workflows/clean-repo.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Create the PR for the work done by the "clean repo" tool
       - name: create-pull-request
-        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
         with:
           branch: create-cleanrepo-pull-request/patch
           title: "Monthly chores: Automated repo cleanup"

.github/workflows/whats-new.yml

@@ -41,7 +41,7 @@ jobs:
           savefile: './docs/ide/whats-new-visual-studio-docs.md'
 
       - name: create-pull-request
-        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
         with:
           branch: create-whatsnew-pull-request/patch
           title: "What's new article"

docker/tutorials/tutorial-multi-container-app-mysql.md

@@ -95,6 +95,9 @@ In this example, you create the network and attach the MySQL container at startu
 
    This command also defines the `MYSQL_ROOT_PASSWORD` and `MYSQL_DATABASE` environment variables. For more information, see [MySQL Docker Hub listing](https://hub.docker.com/_/mysql/).
 
+   > [!WARNING]
+   > This tutorial illustrates password credentials to authenticate with a MySQL database, which is not the most secure method. Refer to the [MySQL documentation](https://dev.mysql.com/doc/) to learn about more secure methods of authentication.
+
 1. Get your container ID for use in the next step.
 
    ```bash

docs/data-tools/create-a-simple-data-application-by-using-adonet.md

@@ -137,8 +137,8 @@ You can find the connection string by right-clicking on the **Sales** data conne
 
    :::image type="content" source="media/vs-2022/simple-data-app-settings.png" alt-text="Screenshot of Connection String in Settings.settings" lightbox="media/vs-2022/simple-data-app-settings.png":::
 
-> [!NOTE]
-> In a real application, you should store the connection string securely, as described in [Connection strings and configuration files](/dotnet/framework/data/adonet/connection-strings-and-configuration-files).
+> [!CAUTION]
+> In a real application, you should store the connection string securely, as described in [Connection strings and configuration files](/dotnet/framework/data/adonet/connection-strings-and-configuration-files). For best security, use an authentication method that doesn't rely on storing a password in the connection string, such as Windows Authentication for an on-premises SQL Server database. See [Save and edit connection strings](how-to-save-and-edit-connection-strings.md).
 
 ## Write the code for the forms
 

docs/data-tools/create-a-sql-database-by-using-a-designer.md

@@ -68,6 +68,9 @@ To complete this walkthrough, you need the **.NET desktop development** and **Da
 
 1. On the **Choose your Database Objects** page, you see a message that says the database doesn't contain any objects. Choose **Finish**.
 
+> [!CAUTION]
+> In a real application, you should store the connection string securely, as described in [Connection strings and configuration files](/dotnet/framework/data/adonet/connection-strings-and-configuration-files). For best security, use an authentication method that doesn't rely on storing a password in the connection string, such as Windows Authentication for an on-premises SQL Server database. See [Save and edit connection strings](how-to-save-and-edit-connection-strings.md).
+
 ### View properties of the data connection
 
 You can view some of the properties of the *SampleDatabase.mdf* file by opening the **Properties** window of the data connection:

docs/deployment/includes/create-publish-settings-iis.md

@@ -20,8 +20,6 @@
         publishUrl="https://myhostname:8172/msdeploy.axd"
         msdeploySite="Default Web Site"
         destinationAppUrl="http://myhostname:80/"
-        mySQLDBConnectionString=""
-        SQLServerDBConnectionString=""
         profileName="Default Settings"
         publishMethod="MSDeploy"
         userName="myhostname\myusername" />

docs/extensibility/visualstudio.extensibility/get-started/in-proc-extensions.md

@@ -41,9 +41,7 @@ While the VisualStudio.Extensibility model was created primarily to host extensi
 
 ### Debug your extension
 
-* Set the *Container* project as *Startup Project*, press `F5` to start debugging.
-
-* Pressing `F5` builds your extension and deploys it to the experimental instance of Visual Studio version you're using. The debugger should attach once your extension is loaded.
+* Press `F5` to start debugging, this builds your extension and deploys it to the experimental instance of Visual Studio version you're using. The debugger should attach once your extension is loaded.
 
 * You can find the command in `Extensions` menu as shown in the following image:
 
@@ -87,22 +85,19 @@ The following example shows how the `DTE2` and `IBufferTagAggregatorFactoryServi
 
 ## Anatomy of a VSSDK-compatible VisualStudio.Extensibility extension
 
-While using the *VisualStudio.Extensibility Extension with VS SDK Compatibility* template takes care of setting up the entire solution, it's useful to know what are the basic components of a VS-SDK-compatible VisualStudio.Extensibility extension and how it differs from the common variant described in the ["create your first extension" guide](create-your-first-extension.md).
-
-### Container project
-
-A VS-SDK-compatible VisualStudio.Extensibility solution is composed of two projects:
+While using the *VisualStudio.Extensibility Extension with VS SDK Compatibility* template takes care of setting up the entire project, it's useful to know what are the basic components of a VS-SDK-compatible VisualStudio.Extensibility extension and how it differs from the common variant described in the ["create your first extension" guide](create-your-first-extension.md).
 
-1. a class library that references both the VisualStudio.Extensibility and Visual Studio SDK packages and contains all the code of the extension,
-1. a container VSIX project that you use to deploy and debug the extension.
+### TargetFramework and VssdkCompatibleExtension
 
-This separation is a temporary solution while the VisualStudio.Extensibility is in preview and the final packaging and deployment design is being finalized.
+The extension project must target the .NET version used by the target Visual Studio version. For Visual Studio 2022, they must target .NET Framework 4.7.2.
 
-The extender shouldn't add code, content or resources to the container project. The only goal of the container project is to include the assets provided by the other project.
+The extension project must also contain the `VssdkCompatibleExtension` property set to `true`.
 
-### TargetFramework
-
-Both the extension project and the container project must target the .NET version used by the target Visual Studio version. For Visual Studio 2022, they must target .NET Framework 4.7.2.
+```xml
+<PropertyGroup>
+  <VssdkCompatibleExtension>true</VssdkCompatibleExtension>
+</PropertyGroup>
+```
 
 ### RequiresInProcessHosting property
 
@@ -120,6 +115,35 @@ internal class MyExtension : Extension
     ...
 ```
 
+### Package manifest
+
+The extension project must include a [package manifest](/visualstudio/extensibility/vsix-extension-schema-2-0-reference) named `source.extension.vsixmanifest`. The `Installation` tag must have `ExtensionType` set to `VSSDK+VisualStudio.Extensibility`.
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+    <Metadata>
+        <Identity Id="MyExtensionId.f14b8c45-154f-4584-abd7-9ec22af003e2" Version="1.0" Language="en-US" Publisher="Microsoft" />
+        <DisplayName>My extension</DisplayName>
+        <Description xml:space="preserve">My extension's description.</Description>
+    </Metadata>
+    <Installation ExtensionType="VSSDK+VisualStudio.Extensibility">
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.9,18.0)">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+      <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.9,18.0)">
+        <ProductArchitecture>arm64</ProductArchitecture>
+      </InstallationTarget>
+    </Installation>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
+</PackageManifest>
+```
+
 ## Use VisualStudio.Extensibility from existing VSSDK extensions
 
 For existing VSSDK extensions, another option is to query for the [VisualStudioExtensibility](/dotnet/api/microsoft.visualstudio.extensibility.visualstudioextensibility) instance via service provider and utilize its methods. This method allows you to use new the API surface area of VisualStudio.Extensibility SDK in your existing components. This option can be useful in situations where you like to use the new API to query project information, document management without creating a new VisualStudio.Extensibility-based extension. 
@@ -130,7 +154,7 @@ Here's an example code snippet that shows how one can utilize `VisualStudioExten
 
 ```XML
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility" Version="17.9.23-preview-1" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility" Version="17.9.2092" />
   </ItemGroup>
 ```
 
@@ -161,8 +185,8 @@ If you also want to contribute components like tool windows, editor listeners us
 * Remove package reference for `Microsoft.VSSDK.BuildTools` and instead add package references for VisualStudio.Extensibility.
 
 ```XML
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.9.23-preview-1" />
-    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.9.23-preview-1" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.9.2092" />
+    <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.9.2092" />
 ```
 
 * Add `VssdkCompatibleExtension` property to your project file, setting it to `true`. This property will enable some VSSDK features for compatibility.
@@ -174,5 +198,10 @@ If you also want to contribute components like tool windows, editor listeners us
 ```
 
 * Create a new extension class inheriting from [`Extension`](/dotnet/api/microsoft.visualstudio.extensibility.extension) base class and set [RequiresInProcessHosting](#requiresinprocesshosting-property) property as shown previously.
+* Modify the `source.extension.vsixmanifest` file adding `ExtensionType="VSSDK+VisualStudio.Extensibility"` to the `Installation` tag.
+
+```xml
+<Installation ExtensionType="VSSDK+VisualStudio.Extensibility">
+```
 
 You can now use all capabilities of VisualStudio.Extensibility together with your existing VSSDK extension.