Skip to content

Commit 90ee1c5

Browse files
mijacobsmijacobs
committed
Merged main into live
2 parents 7e347a1 + 602e0b3 commit 90ee1c5

14 files changed

+137
-84
lines changed

‎docs/azure/includes/vs-2019/create-aspnet5-app-2019.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,23 @@ author: ghogen
55
ms.subservice: azure-development
66
ms.author: ghogen
77
ms.topic: include
8-
ms.date: 03/08/2021
8+
ms.date: 08/22/2024
99
---
1010

1111
1. In the Visual Studio start window, select **Create a new project**.
12+
1213
1. Select **ASP.NET Core Web App**, and then select **Next**.
14+
1315
1. Enter a name for your new application (or use the default name), specify the location on disk, and then select **Next**.
14-
1. Choose the .NET version you want to target. If you don't know, [choose the LTS (long-term support) release](https://dotnet.microsoft.com/download/dotnet).
1516

16-
![Create a web project - Additional information screen](../../media/create-aspnet5-app/net-core-50-enable-docker-support-visual-studio.png)
17+
1. Select the .NET version you want to target. If you're not sure, [choose the LTS (long-term support) release](https://dotnet.microsoft.com/download/dotnet).
18+
19+
:::image type="content" source="../../media/create-aspnet5-app/net-core-50-enable-docker-support-visual-studio.png" border="false" alt-text="Screenshot that shows how to create a new ASP.NET Core web app project in Visual Studio 2019.":::
1720

1821
1. Choose whether you want SSL support by selecting or clearing the **Configure for HTTPS** checkbox.
22+
1923
1. Select the **Enable Docker Support** checkbox.
20-
1. Select the type of container you want (Windows or Linux), and then select **Create**.
24+
25+
1. Use the dropdown list to select the type of container you want: **Windows** or **Linux**.
26+
27+
1. Select **Create** to complete the process.

‎docs/azure/includes/vs-2022/create-aspnet5-app-2022.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,23 @@ author: ghogen
55
ms.subservice: azure-development
66
ms.author: ghogen
77
ms.topic: include
8-
ms.date: 10/25/2021
8+
ms.date: 08/22/2024
99
---
1010

1111
1. In the Visual Studio start window, select **Create a new project**.
12+
1213
1. Select **ASP.NET Core Web App**, and then select **Next**.
14+
1315
1. Enter a name for your new application (or use the default name), specify the location on disk, and then select **Next**.
14-
1. Choose the .NET version you want to target. If you don't know, [choose the LTS (long-term support) release](https://dotnet.microsoft.com/download/dotnet).
1516

16-
![Create a web project - Additional information screen](../../media/create-aspnet5-app/asp-net-enable-docker-support-visual-studio.png)
17+
1. Select the .NET version you want to target. If you're not sure, [choose the LTS (long-term support) release](https://dotnet.microsoft.com/download/dotnet).
18+
19+
:::image type="content" source="../../media/create-aspnet5-app/asp-net-enable-docker-support-visual-studio.png" border="false" alt-text="Screenshot that shows how to create a new ASP.NET Core web app project in Visual Studio 2022.":::
1720

1821
1. Choose whether you want SSL support by selecting or clearing the **Configure for HTTPS** checkbox.
22+
1923
1. Select the **Enable Docker** checkbox.
20-
1. In the **Docker OS** textbox, select the type of container you want (Windows or Linux), and then select **Create**.
24+
25+
1. Use the **Docker OS** dropdown list to select the type of container you want: **Windows** or **Linux**.
26+
27+
1. Select **Create** to complete the process.

‎docs/containers/hosting-web-apps-in-docker.md

Lines changed: 66 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,103 +6,122 @@ manager: mijacobs
66
ms.devlang: dotnet
77
ms.topic: how-to
88
ms.subservice: container-tools
9-
ms.date: 10/27/2021
9+
ms.date: 08/22/2024
1010
ms.author: ghogen
11+
12+
#customer intent: As a developer, I want to use Visual Studio Container Tools, so I can deploy a containerized ASP.NET or ASP.NET Core web app to Azure Container Registry.
1113
---
1214

1315
# Deploy an ASP.NET container to a container registry using Visual Studio
1416

1517
Docker is a lightweight container engine, similar in some ways to a virtual machine, which you can use to host applications and services.
16-
This tutorial walks you through using Visual Studio to publish your containerized application to an [Azure Container Registry](https://azure.microsoft.com/services/container-registry).
18+
This tutorial walks you through using Visual Studio to publish your containerized application to an [Azure Container Registry](https://azure.microsoft.com/products/container-registry).
1719

18-
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/dotnet/?utm_source=acr-publish-doc&utm_medium=docs&utm_campaign=docs) before you begin.
20+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?icid=dotnet?utm_source=acr-publish-doc&utm_medium=docs&utm_campaign=docs) before you begin.
1921

2022
## Prerequisites
2123

22-
To complete this tutorial:
23-
2424
::: moniker range="vs-2019"
25-
- Install the latest version of [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta) with the "ASP.NET and web development" workload
26-
- Install [Docker Desktop for Windows](https://docs.docker.com/desktop/windows/install/)
25+
26+
- Install the latest version of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/older-downloads/) with the "ASP.NET and web development" workload.
27+
2728
::: moniker-end
2829
::: moniker range=">=vs-2022"
29-
- Install the latest version of [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta) with the "ASP.NET and web development" workload
30-
- Install [Docker Desktop for Windows](https://docs.docker.com/desktop/windows/install/)
30+
31+
- Install the latest version of [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/?cid=learn-onpage-download-cta) with the "ASP.NET and web development" workload.
32+
3133
:::moniker-end
3234

35+
- Install [Docker Desktop for Windows](https://docs.docker.com/desktop/windows/install/).
36+
3337
## Create an ASP.NET Core web app
3438

35-
The following steps guide you through creating a basic ASP.NET Core app that will be used in this tutorial. If you already have a project, you can skip this section.
39+
The following steps guide you through creating a basic ASP.NET Core app that you use in this tutorial. If you already have a project, you can skip this section.
3640

3741
::: moniker range="vs-2019"
42+
3843
[!INCLUDE [create-aspnet5-app](../azure/includes/vs-2019/create-aspnet5-app-2019.md)]
44+
3945
::: moniker-end
4046
:::moniker range=">=vs-2022"
47+
4148
[!INCLUDE [create-aspnet5-app](../azure/includes/vs-2022/create-aspnet5-app-2022.md)]
49+
4250
::: moniker-end
4351

52+
## Publish your container to Azure Container Registry
53+
4454
::: moniker range="vs-2019"
4555

46-
## Publish your container to Azure Container Registry
56+
1. Right-click your project in **Solution Explorer** and choose **Publish**. The **Publish** dialog opens.
4757

48-
1. Right-click your project in **Solution Explorer** and choose **Publish**.
49-
2. On the **Publish** dialog, select **Docker Container Registry**.
58+
1. On the **Target** tab, select **Docker Container Registry**, and then select **Next**.
5059

51-
![Screenshot of Publish dialog - choose Docker Container Registry.](media/container-tools/vs-2019/docker-container-registry.png)
60+
:::image type="content" source="media/container-tools/vs-2019/docker-container-registry.png" border="false" alt-text="Screenshot that shows the Publish dialog and how to choose Docker Container Registry.":::
5261

53-
3. Choose **Create New Azure Container Registry**.
62+
1. On the **Specific target** tab, select **Azure Container Registry**, and then select **Next**.
5463

55-
![Screenshot of Publish dialog - choose Create New Azure container registry.](media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png)
64+
1. On the **Container Registry** tab, select the **Create a new Azure Container Registry** option at the bottom:
5665

57-
4. Fill in your desired values in the **Azure Container Registry** screen.
66+
:::image type="content" source="media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure container registry.":::
5867

59-
| Setting | Suggested value | Description |
60-
| ------------ | ------- | -------------------------------------------------- |
61-
| **DNS Prefix** | Globally unique name | Name that uniquely identifies your container registry. |
62-
| **Subscription** | Choose your subscription | The Azure subscription to use. |
63-
| **[Resource Group](/azure/azure-resource-manager/resource-group-overview)** | myResourceGroup | Name of the resource group in which to create your container registry. Choose **New** to create a new resource group.|
64-
| **[SKU](/azure/container-registry/container-registry-skus)** | Standard | Service tier of the container registry |
65-
| **Registry Location** | A location close to you | Choose a Location in a [region](https://azure.microsoft.com/regions/) near you or near other services that will use your container registry. |
68+
1. On the **Azure Container Registry** page, enter your values for the new resource:
6669

67-
![Screenshot of Visual Studio's create Azure Container Registry dialog.](media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog-2019.png)
70+
| Setting | Suggested value | Description |
71+
| ------------ | ------- | -------------------------------------------------- |
72+
| **DNS Prefix** | Globally unique name | Name that uniquely identifies your container registry. |
73+
| **Subscription** | Your subscription | The Azure subscription to use. |
74+
| **[Resource Group](/azure/azure-resource-manager/management/overview)**| Your resource group | Name of the resource group in which to create your container registry. Select **New** to create a new resource group. |
75+
| **[SKU](/azure/container-registry/container-registry-skus)** | "Standard" | Select the service tier of the container registry. |
76+
| **Registry Location** | A nearby location | Choose a location in a [region](https://azure.microsoft.com/explore/global-infrastructure/geographies/) close to you or close to other services that you expect to use the container registry. |
6877

69-
5. Click **Create**.
78+
:::image type="content" source="media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog-2019.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure Container Registry.":::
7079

71-
6. Choose **Finish** to complete the process.
72-
::: moniker-end
80+
1. After you enter the resource values, select **Create**.
81+
82+
Visual Studio validates the property values and creates the new container resource.
83+
When the process completes, Visual Studio returns to the **Publish** dialog and selects the new container in the list.
84+
85+
1. Select **Finish** to publish the new container.
7386

87+
::: moniker-end
7488
::: moniker range=">=vs-2022"
7589

76-
## Publish your container to Azure Container Registry
90+
1. Right-click your project in **Solution Explorer** and choose **Publish**. The **Publish** dialog opens.
91+
92+
1. On the **Target** tab, select **Docker Container Registry**, and then select **Next**.
93+
94+
:::image type="content" source="media/container-tools/vs-2022/docker-container-registry.png" border="false" alt-text="Screenshot that shows the Publish dialog and how to choose Docker Container Registry.":::
95+
96+
1. On the **Specific target** tab, select **Azure Container Registry**, and then select **Next**.
7797

78-
1. Right-click your project in **Solution Explorer** and choose **Publish**.
79-
2. On the **Publish** dialog, select **Docker Container Registry**.
98+
1. On the **Registry** tab, select the **Create new** (+) option at the right:
8099

81-
![Screenshot of Publish dialog - choose Docker Container Registry.](media/container-tools/vs-2022/docker-container-registry.png)
100+
:::image type="content" source="media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png" border="false" alt-text="Screenshot of the Publish dialog that shows how to choose Create New Azure container registry.":::
82101

83-
3. Choose **Create New Azure Container Registry**.
102+
1. Fill in your desired values in the **Azure Container Registry** screen.
84103

85-
![Screenshot of Publish dialog - choose Create New Azure container registry.](media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png)
104+
| Setting | Suggested value | Description |
105+
| ------------ | ------- | -------------------------------------------------- |
106+
| **DNS Prefix** | Globally unique name | Name that uniquely identifies your container registry. |
107+
| **Subscription** | Your subscription | The Azure subscription to use. |
108+
| **[Resource Group](/azure/azure-resource-manager/management/overview)**| Your resource group | Name of the resource group in which to create your container registry. Select **New** to create a new resource group. |
109+
| **[SKU](/azure/container-registry/container-registry-skus)** | "Standard" | Select the service tier of the container registry. |
110+
| **Registry Location** | A nearby location | Choose a location in a [region](https://azure.microsoft.com/explore/global-infrastructure/geographies/) close to you or close to other services that you expect to use the container registry. |
86111

87-
4. Fill in your desired values in the **Azure Container Registry** screen.
112+
:::image type="content" source="media/container-tools/vs-2022/vs-azure-container-registry-provisioning-dialog.png" border="false" alt-text="Screenshot that shows how to enter values in the dialog to create a new Azure Container Registry.":::
88113

89-
| Setting | Suggested value | Description |
90-
| ------------ | ------- | -------------------------------------------------- |
91-
| **DNS Prefix** | Globally unique name | Name that uniquely identifies your container registry. |
92-
| **Subscription** | Choose your subscription | The Azure subscription to use. |
93-
| **[Resource Group](/azure/azure-resource-manager/resource-group-overview)** | myResourceGroup | Name of the resource group in which to create your container registry. Choose **New** to create a new resource group.|
94-
| **[SKU](/azure/container-registry/container-registry-skus)** | Standard | Service tier of the container registry |
95-
| **Registry Location** | A location close to you | Choose a Location in a [region](https://azure.microsoft.com/regions/) near you or near other services that will use your container registry. |
114+
1. After you enter the resource values, select **Create**.
96115

97-
![Screenshot of Visual Studio's create Azure Container Registry dialog.](media/container-tools/vs-2022/vs-azure-container-registry-provisioning-dialog.png)
116+
Visual Studio validates the property values and creates the new container resource.
117+
When the process completes, Visual Studio returns to the **Publish** dialog and selects the new container in the list.
98118

99-
5. Click **Create**.
119+
1. Select **Finish** to publish the new container.
100120

101-
6. Choose **Finish** to complete the process.
102121
::: moniker-end
103122

104-
You can now pull the container from the registry to any host capable of running Docker images, for example [Azure Container Instances](/azure/container-instances/container-instances-tutorial-deploy-app).
123+
You can now pull the container from the registry to any host capable of running Docker images, such as [Azure Container Instances](/azure/container-instances/container-instances-tutorial-deploy-app).
105124

106125
## Related content
107126

108-
[Quickstart: Deploy a container instance in Azure using the Azure CLI](/azure/container-instances/container-instances-quickstart)
127+
- [Quickstart: Deploy a container instance in Azure using the Azure CLI](/azure/container-instances/container-instances-quickstart)

‎docs/containers/media/container-tools/vs-2019/docker-container-registry.png

-2.31 KB
Loading

‎docs/containers/media/container-tools/vs-2019/select-existing-or-create-new-azure-container-registry.png

13.9 KB
Loading

‎docs/containers/media/container-tools/vs-2022/docker-container-registry.png

665 Bytes
Loading

‎docs/containers/media/container-tools/vs-2022/select-existing-or-create-new-azure-container-registry.png

6.94 KB
Loading

‎docs/containers/media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog-2019.png

4.14 KB
Loading

‎docs/containers/media/hosting-web-apps-in-docker/vs-azure-container-registry-provisioning-dialog.png

24.1 KB
Loading

‎docs/designers/windows-forms-designer-overview.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ Using the designer you can:
3131
> [!NOTE]
3232
> Use Windows Forms Designer, and not the Resource Editor, to make changes to a form's resource (*.resx*) file. If you edit a form-based .resx file, you'll see a warning that changes you make in the Resource Editor may be lost. This is because the Windows Forms Designer generates the .resx file.
3333
34+
> [!CAUTION]
35+
> Windows Forms Designer executes application code when displaying controls or forms on the design surface. Only open projects from [trusted locations](..\ide\reference\trust-settings.md).
36+
37+
> [!CAUTION]
38+
> Resources in `.resx` files may be serialized using `BinaryFormatter`, which is [not secure](/dotnet/standard/serialization/binaryformatter-security-guide). Only use Windows Forms Designer to work with forms and controls that you trust.
39+
3440
## See also
3541

3642
- [Windows Forms overview](/dotnet/framework/winforms/windows-forms-overview)

0 commit comments

Comments
 (0)