Skip to content

Commit dc52d17

Browse files
authored
Merge pull request #354 from dotnet/main
✅ Merge `main` into `live`
2 parents 8ddbf5d + fe49db6 commit dc52d17

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/markdownlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Use Node.js
28-
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
28+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
2929
with:
3030
node-version: 16.x
3131
- name: Run Markdownlint

.github/workflows/snippets5000.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
6363
# Update build output json file
6464
- name: Upload build results
65-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #@v4.3.0
65+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 #@v4.3.1
6666
with:
6767
name: build
6868
path: ./output.json

docs/deployment/manifest-format.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ a .NET Aspire application using the `aspire-starter` .NET template:
1818

1919
```dotnetcli
2020
dotnet new aspire-starter --use-redis-cache `
21-
-n AspireApp && `
21+
-o AspireApp && `
2222
cd AspireApp
2323
```
2424

2525
Manifest generation is achieved by running `dotnet build` with a special target:
2626

2727
```dotnetcli
28-
dotnet build --project AspireApp.AppHost\AspireApp.AppHost.csproj `
28+
dotnet run --project AspireApp.AppHost\AspireApp.AppHost.csproj `
2929
-- `
3030
--publisher manifest `
3131
--output-path aspire-manifest.json

docs/fundamentals/dashboard.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The search bar in the upper right of the dashboard also provides the option to f
5050

5151
:::image type="content" source="media/dashboard/select-resource-type.png" alt-text="A screenshot of the resource type selector list in the .NET Aspire dashboard Resources page.":::
5252

53-
In this example, only containers are displayed in the list. For example, if you enable **Use Redis for caching** when creating a .NET Aspire project, you should see a Redis container listed.:
53+
In this example, only containers are displayed in the list. For example, if you enable **Use Redis for caching** when creating a .NET Aspire project, you should see a Redis container listed:
5454

5555
:::image type="content" source="media/dashboard/resources-filtered-containers.png" lightbox="media/dashboard/resources-filtered-containers.png" alt-text="A screenshot of the .NET Aspire dashboard Resources page filtered to show only containers.":::
5656

@@ -96,7 +96,7 @@ If you select a container or executable, formatting is different from a project
9696

9797
.NET Aspire automatically configures your projects with logging using OpenTelemetry. Navigate to the **Structured logs** page to view the semantic logs for your .NET Aspire app. [Semantic, or structured logging](https://github.com/NLog/NLog/wiki/How-to-use-structured-logging) makes it easier to store and query log-events, as the log-event message-template and message-parameters are preserved, instead of just transforming them into a formatted message. You'll notice a clean structure for the different logs displayed on the page using columns:
9898

99-
- **Resource**: The resourcece the log originated from.
99+
- **Resource**: The resource the log originated from.
100100
- **Level**: The log level of the entry, such as information, warning, or error.
101101
- **Timestamp**: The time that the log occurred.
102102
- **Message**: The details of the log.

0 commit comments

Comments
 (0)