Skip to content

Commit 7615e18

Browse files
authored
docs update (#9408)
1 parent 1e8ee55 commit 7615e18

File tree

6 files changed

+60
-93
lines changed

6 files changed

+60
-93
lines changed

docs/api-review-process.md

Lines changed: 0 additions & 53 deletions
This file was deleted.

docs/area-owners.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If you need to tag folks on an issue or PR, you will generally want to tag the o
1010
| [area-app-model](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-app-model) | @adityamandaleeka | @aspire/area-app-model | Issues/PRs related to the Aspire app model and Aspire AppHost |
1111
| [area-app-testing](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-app-testing) | @ReubenBond | @aspire/area-app-testing | Issues/PRs related to the framework we provide for scenario testing of Aspire apps |
1212
| [area-components](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-components) | @sebastienros | @aspire/area-components | Issues/PRs related to Aspire Components |
13-
| [area-dashboard](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-dashboard) | @kvenkatrajan | @aspire/area-dashboard | Issues/PRs related to the Dashboard UI |
13+
| [area-dashboard](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-dashboard) | @JakeRadMSFT | @aspire/area-dashboard | Issues/PRs related to the Dashboard UI |
1414
| [area-deployment](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-deployment) | @davidfowl | @aspire/area-deployment | Issues/PRs related to deploying Aspire apps |
1515
| [area-docs](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-docs) | @IEvangelist | @aspire/area-docs | Issues/PRs related to documentation |
1616
| [area-engineering-systems](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-engineering-systems) | @joperezr | @aspire/area-engineering-systems | Issues/PRs related to how the repository is built and tested (build and test infrastructure) |
@@ -19,8 +19,8 @@ If you need to tag folks on an issue or PR, you will generally want to tag the o
1919
| [area-samples](https://github.com/dotnet/aspire-samples/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-samples) | @DamianEdwards | @aspire/area-samples | Issues/PRs related to the Aspire samples. These are in the [dotnet/aspire-samples](https://github.com/dotnet/aspire-samples) repo. |
2020
| [area-service-discovery](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-service-discovery) | @ReubenBond | @aspire/area-service-discovery | Issues/PRs related to Aspire's Service Discovery and communication between services |
2121
| [area-templates](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-templates) | @DamianEdwards | @aspire/area-templates | Issues/PRs related to the Aspire templates |
22-
| [area-telemetry](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-telemetry) | @samsp-msft | @aspire/area-telemetry | Issues/PRs related to telemetry (logs, metrics, tracing) |
23-
| [area-tooling](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-tooling) | @vijayrkn | @aspire/area-tooling | Issues/PRs related to Visual Studio and Visual Studio Code tooling for Aspire |
22+
| [area-telemetry](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-telemetry) | @maddymontaquila | @aspire/area-telemetry | Issues/PRs related to telemetry (logs, metrics, tracing) |
23+
| [area-tooling](https://github.com/dotnet/aspire/issues?q=is%3Aopen+is%3Aissue+label%3Aarea-tooling) | @JakeRadMSFT | @aspire/area-tooling | Issues/PRs related to Visual Studio and Visual Studio Code tooling for Aspire |
2424

2525
## Community Triagers
2626

docs/contributing.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,26 @@ These instructions will get you ready to contribute to this project. If you just
77
See [machine-requirements.md](machine-requirements.md).
88

99
## Build the repo
10-
`.\build.cmd` (Windows) or `.\build.sh` (macOS and Linux)
10+
11+
`.\build.sh` (macOS and Linux) or `.\build.cmd` (Windows)
1112

1213
## Run TestShop
1314

1415
This will confirm that you're all set up.
1516

16-
If you are using Visual Studio:
17-
18-
1. Open `Aspire.slnx`
19-
1. Set the Startup Project to be the `AppHost` project (it's under `\playground\TestShop`). Make sure the launch profile is set to "http".
20-
1. <kbd>F5</kbd> to debug, or <kbd>Ctrl+F5</kbd> to launch without debugging.
17+
In your shell or in VS Code:
2118

22-
Otherwise:
2319
```shell
2420
dotnet restore playground/TestShop/TestShop.AppHost/TestShop.AppHost.csproj
2521
dotnet run --project playground/TestShop/TestShop.AppHost/TestShop.AppHost.csproj
2622
```
2723

24+
Or, if you are using Visual Studio:
25+
26+
1. Open `Aspire.slnx`
27+
1. Set the Startup Project to be the `AppHost` project (it's under `\playground\TestShop`). Make sure the launch profile is set to "http".
28+
1. <kbd>F5</kbd> to debug, or <kbd>Ctrl+F5</kbd> to launch without debugging.
29+
2830
## View Dashboard
2931

3032
When you start the sample app in Visual Studio, it will automatically open your browser to show the dashboard.
@@ -56,7 +58,7 @@ If you want to try local changes on a separate Aspire based project or solution
5658
in a local folder and use it as a package source.
5759

5860
To do so simply execute:
59-
`.\build.cmd -pack` (Windows) or `.\build.sh -pack` (macOS and Linux)
61+
`.\build.sh -pack` (macOS and Linux) or `.\build.cmd -pack` (Windows)
6062

6163
This will generate all the packages in the folder `./artifacts/packages/Debug/Shipping`. At this point from your solution folder run:
6264

docs/getting-perf-traces.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
11
# Wall-clock time investigations
22

3-
## Collect the trace
4-
Collect the trace using PerfView (https://github.com/microsoft/perfview/releases). Use Collect menu, then Collect again, to open the collection dialog and make the following changes from defaults:
3+
Aspire has some built-in EventPipe providers that you can collect from during performance investigations.
4+
5+
## Collection with dotnet trace
6+
7+
You can use [dotnet trace](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/dotnet-trace) to collect your managed code trace. Follow the documentation, but for extra context include the Aspire event pipe provider, as in the below example:
8+
9+
```sh
10+
dotnet trace collect --providers *Microsoft-Aspire-Hosting --process-id 1234
11+
```
12+
13+
or more elaborately
14+
```sh
15+
dotnet trace collect --providers Microsoft-DotNETCore-SampleProfiler:0x0000F00000000000:4,Microsoft-Windows-DotNETRuntime:0x00000014C14FCCBD:5,Microsoft-Aspire-Hosting --buffersize 8192
16+
```
17+
18+
Then analyze using `dotnet trace report` or convert to a format such as Speedscope.
19+
20+
## Collection with PerfView (Windows only)
21+
22+
On Windows, you can collect the trace using PerfView instead (https://github.com/microsoft/perfview/releases). Use Collect menu, then Collect again, to open the collection dialog and make the following changes from defaults:
523

624
1. If you do not intend to share the trace with anyone, uncheck the "Zip" and "Merge" option.
7-
1. Increase Circular MB to 8192.
8-
1. Check the "Thread Time" checkbox.
25+
1. Increase Circular MB to `8192`.
26+
1. Check the `Thread Time` checkbox.
927
1. Expand Advanced Options panel and make sure you have Kernel Base, Cpu Samples, File I/O, .NET, and Task (TPL) options checked.
1028
1. In "Additional Providers" add `*Microsoft-Aspire-Hosting` (note the asterisk before the .NET Aspire provider name!).
1129

1230
Once you are ready, git "Start Collection" button and run your scenario.
1331

1432
When done with the scenario, hit "Stop Collection". Wait for PerfView to finish merging and analyzing data (the "working" status bar stops flashing).
1533

16-
## Verify that the trace contains data .NET Aspire data
34+
### Verify that the trace contains data .NET Aspire data
1735

1836
This is an optional step, but if you are wondering if your trace has been captured properly, you can check the following:
1937

20-
1. Open the trace (usually named PerfViewData.etl, if you haven't changed the name) and double click Events view. Verify you have a bunch of events from Microsoft-Aspire-Hosting provider.
38+
1. Open the trace (usually named PerfViewData.etl, if you haven't changed the name) and double click Events view. Verify you have a bunch of events from the Microsoft-Aspire-Hosting provider.

docs/machine-requirements.md

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
Whether you want to contribute to Aspire, or just use the latest build of Aspire, these are the common pieces you need to install.
44

5-
## (Windows) Install Visual Studio
6-
7-
On Windows, Visual Studio contains special tooling support for .NET Aspire that you will want to have.
8-
9-
[Visual Studio 2022 version 17.12](https://visualstudio.microsoft.com/vs) or later
10-
11-
When you install, ensure that both:
12-
* `ASP.NET and web development` Workload is checked.
13-
* `.NET Aspire SDK` component in `Individual components` is checked.
14-
15-
## Install the latest .NET 8 SDK
16-
[.NET 8 SDK](https://github.com/dotnet/installer#installers-and-binaries)
17-
185
## Install a supported container runtime
196

207
### Docker Desktop
@@ -27,21 +14,30 @@ When you install, ensure that both:
2714
* [macOS](https://podman.io/docs/installation#macos)
2815
* [Linux](https://podman.io/docs/installation#installing-on-linux)
2916

30-
## (Windows / Linux / Mac) DevContainer in VS Code
17+
Then you can use either VS Code, Visual Studio, or Codespaces:
3118

32-
On Windows you could also use VS Code with the DevContainers extension. This requires that you have installed a container engine.
33-
Currently it's only tested with Docker Desktop.
19+
## Using VS Code with DevContainers
20+
21+
On Windows, Linux, or Mac you can use VS Code with the DevContainers extension. Currently it's only tested with Docker Desktop.
3422

3523
> :warning: This will use around 16GB of RAM, after you loaded the solution.
3624
37-
### Install VS Code with DevContainers Extension
25+
#### Install VS Code with DevContainers Extension
3826

3927
* [VS Code](https://code.visualstudio.com/Download)
4028
* [DevContainers Extension](https://marketplace.visualstudio.com/items?itemName=ms-VSCode-remote.remote-containers)
4129

42-
## (Browser) Codespaces
30+
Then choose "Open Folder In Container", choose the root of your cloned repo, then choose ".NET Aspire - Contribute".
31+
32+
## Using Visual Studio
33+
34+
To use Visual Studio, ensure you have [Visual Studio 2022 version 17.14](https://visualstudio.microsoft.com/vs) or later.
35+
36+
When you install, ensure that `ASP.NET and web development` workload is checked.
37+
38+
## Using Codespaces
4339

44-
Just start the Codespaces in your fork. The initialization of the code space takes around 5 mins. After that you can open the solution.
40+
In your browser, start a Codespace in your fork. The initialization of the code space takes around 5 mins. After that you can open the solution.
4541
This will take on the free version of Codespace around 10 mins.
4642

4743
> :warning: With the free version of Codespaces the development experience can be less than ideal. We recommend using at least a Codespace with 16GB of RAM or use your local VS Code / DevContainers instance.

docs/using-latest-daily.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# Set up your machine to use the latest Aspire builds
22

3-
These instructions will get you set up with the latest build of Aspire. If you just want the last preview release of .NET Aspire, the packages are on nuget.org, and install [Visual Studio 2022 version 17.12](https://visualstudio.microsoft.com/vs/preview/) or later for the tooling.
3+
If you just want an official release of .NET Aspire, you don't need this document. [The Aspire documentation](https://learn.microsoft.com/en-us/dotnet/aspire/get-started/aspire-overview) will get you started.
4+
5+
If you want the latest, unsupported build of Aspire to try, read on.
46

57
## Prepare the machine
68

79
See [machine-requirements.md](machine-requirements.md).
810

911
## (Optional) Create a local nuget.config file
1012

11-
Since dogfooding will require using daily build feeds, you may not want to add feeds globally which could alter how other code on your machine builds. To avoid this happening, you can create a local nuget.config file by running the following command in the root of your repository:
13+
Since this will require using daily build feeds, you may not want to add feeds globally which could alter how other code on your machine builds. To avoid this happening, you can create a local nuget.config file by running the following command in the root of your repository:
1214

1315
```bash
1416
dotnet new nugetconfig
@@ -42,11 +44,11 @@ dotnet new install Aspire.ProjectTemplates::*-* --force
4244
```
4345

4446
> [!TIP]
45-
> Release branches are a little different. For example, for the latest build from `release/X.X` branch change the above to be `Aspire.ProjectTemplates::X.X.*-*`. For example, if you want to use the latest build from the `release/9.2` branch, change the above to be `dotnet new install Aspire.ProjectTemplates::9.2.*-* --force`
47+
> Release branches are a little different. For example, for the latest build from `release/X.X` branch change the above to be `Aspire.ProjectTemplates::X.X.*-*`. For example, if you want to use the latest build from the `release/9.3` branch, change the above to be `dotnet new install Aspire.ProjectTemplates::9.3.*-* --force`
4648
4749
<!-- break between blocks -->
4850

49-
> [!NOTE]
51+
> [!NOTE]
5052
> The `--force` parameter is required if you also have the legacy .NET Aspire Workload installed. The new templates have the same name as the old ones, so this command would override those.
5153
5254
## Create a new Project
@@ -84,3 +86,5 @@ Alternatively, if you are using Visual Studio, you can instead create a new Blaz
8486
```sh
8587
dotnet tool install --global aspire.cli --prerelease --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json
8688
```
89+
90+
now `aspire` will be available as a tool.

0 commit comments

Comments
 (0)