From dc8940fe9918ddf97cc2144718368793a6b747ef Mon Sep 17 00:00:00 2001 From: Jon Galloway Date: Fri, 15 Nov 2024 17:57:04 -0800 Subject: [PATCH] Markdown fixes --- README.md | 6 +++--- labs/1-Create-Catalog-API/README.md | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8105cf4..9a0a36c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ In this workshop, you'll learn by building out features of the [eShop Reference ### Using Windows and Visual Studio -If you're on Windows and using Visual Studio, you must use [Visual Studio 2022 Preview](https://visualstudio.com/preview) (version 17.10.0 Preview 5.0 or later). The preview version of Visual Studio 2022 is safe to install side-by-side with the release version. We recommend using Visual Studio 2022 Preview if you're on Windows as it includes support for working with .NET Aspire projects. +If you're on Windows and using Visual Studio, you must use [Visual Studio 2022 Preview](https://visualstudio.com/preview) (version 17.12.0 or later). The preview version of Visual Studio 2022 is safe to install side-by-side with the release version. > Note: When installing Visual Studio you only need to install the `ASP.NET and web development` workload. @@ -20,11 +20,11 @@ If you're in an instructor-led workshop session and have issues downloading the ### Using macOS, Linux, or Windows but not using Visual Studio -If you're using macOs or Linux, or on Windows but don't want to use Visual Studio, you must [download](https://www.microsoft.com/net/download) and install the .NET SDK (version 8.0.100 or newer). You can use the editor or IDE of your choice but note that some operations might be more difficult due to lack of support for .NET Aspire at this time. +If you're using macOs or Linux, or on Windows but don't want to use Visual Studio, you must [download](https://www.microsoft.com/net/download) and install the .NET SDK (version 8.0.100 or newer). .NET Aspire 9.0 runs on both .NET 8.0 and .NET 9.0. You can use the editor or IDE of your choice but note that some operations might be more difficult due to lack of support for .NET Aspire at this time. ### Updating and installing the .NET SDK workload for Aspire -After installing Visual Studio Preview or the required .NET SDK, you will need to update and install the .NET SDK workload for Aspire. This workshop is using the latest version of .NET Aspire (8.2). For your convenience, scripts are provided in this repository to make this process easy: +After installing Visual Studio Preview or the required .NET SDK, you will need to update and install the .NET SDK workload for Aspire. This workshop is using the latest version of .NET Aspire (9.0). For your convenience, scripts are provided in this repository to make this process easy: 1. Clone [this repo](https://github.com/dotnet-presentations/eshop-app-workshop) to your machine. 1. In your terminal, navigate to the repo root and run the command `dotnet --version` to verify you are using version 8.0.100 or later of the .NET SDK: diff --git a/labs/1-Create-Catalog-API/README.md b/labs/1-Create-Catalog-API/README.md index 79b03a9..a966196 100644 --- a/labs/1-Create-Catalog-API/README.md +++ b/labs/1-Create-Catalog-API/README.md @@ -21,13 +21,13 @@ We're going to run 2 docker container:, the PostgreSQL container, and [pgAdmin]( postgres -``` +```bash docker run --name postgres-dev -e POSTGRES_HOST_AUTH_METHOD=trust -p 5432:5432 -d postgres ``` pgAdmin -``` +```bash docker run --name pgadmin-dev -e PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False -e PGADMIN_CONFIG_SERVER_MODE=False -e PGADMIN_DEFAULT_EMAIL=admin@domain.com -e PGADMIN_DEFAULT_PASSWORD=admin -p 0:80 -d dpage/pgadmin4 ``` @@ -65,15 +65,16 @@ docker run --name pgadmin-dev -e PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False - 1. Stop the application and try launching it again and seeing the output of the `/health` endpoint return `Degraded` while the database initialization is still in progress. 1. Find the port assigned to the pgAdmin container. -**Docker CLI** +### Docker CLI -``` + +```bash docker ps ``` ![Image of the docker CLI showing the port for pgAdmin](./img/find-docker-endpoint.png) -**Docker Desktop** +###Docker Desktop ![Image of docker desktop UI showing the port for pgAdmin](./img/find-docker-endpoint-ui.png) @@ -108,7 +109,7 @@ Containers are extremely useful for hosting service dependencies, but rather tha 1. Run the following commands in the `src` folder to create the `eShop.AppHost` and `eShop.ServiceDefaults` projects. - ``` + ```bash dotnet new aspire-apphost -n eShop.AppHost dotnet new aspire-servicedefaults -n eShop.ServiceDefaults dotnet sln add eShop.AppHost @@ -117,7 +118,7 @@ Containers are extremely useful for hosting service dependencies, but rather tha 1. Now add a reference to the `eShop.AppHost`: - ``` + ```bash cd eShop.AppHost dotnet add reference ..\Catalog.Data.Manager ``` @@ -345,6 +346,7 @@ Now that we've setup the solution to use Aspire for composing our distributed ap ### ``` + 1. Click the **Send request** link displayed above it to send the request and have the response displayed: ![Catalog.API.http file open in Visual Studio](./img/vs-catalog.api-http-file.png)