Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✅ Merge main into live #354

Merged
merged 6 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
with:
node-version: 16.x
- name: Run Markdownlint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snippets5000.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

# Update build output json file
- name: Upload build results
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #@v4.3.0
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 #@v4.3.1
with:
name: build
path: ./output.json
4 changes: 2 additions & 2 deletions docs/deployment/manifest-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ a .NET Aspire application using the `aspire-starter` .NET template:

```dotnetcli
dotnet new aspire-starter --use-redis-cache `
-n AspireApp && `
-o AspireApp && `
cd AspireApp
```

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

```dotnetcli
dotnet build --project AspireApp.AppHost\AspireApp.AppHost.csproj `
dotnet run --project AspireApp.AppHost\AspireApp.AppHost.csproj `
-- `
--publisher manifest `
--output-path aspire-manifest.json
Expand Down
4 changes: 2 additions & 2 deletions docs/fundamentals/dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The search bar in the upper right of the dashboard also provides the option to f

:::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.":::

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.:
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:

:::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.":::

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

.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:

- **Resource**: The resourcece the log originated from.
- **Resource**: The resource the log originated from.
- **Level**: The log level of the entry, such as information, warning, or error.
- **Timestamp**: The time that the log occurred.
- **Message**: The details of the log.
Expand Down
Loading