Skip to content

Commit

Permalink
Merge pull request #1879 from dotnet/main
Browse files Browse the repository at this point in the history
✅ Merge `main` into `live`
  • Loading branch information
dotnet-policy-service[bot] authored Oct 22, 2024
2 parents 62ba11d + 722e125 commit 0d3258e
Show file tree
Hide file tree
Showing 142 changed files with 647 additions and 245 deletions.
24 changes: 12 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ updates:
patterns:
- "*" # Prefer a single PR per solution update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/mstest" #AspireApp.sln
directory: "/docs/testing/snippets/testing/mstest" #AspireApp.sln
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -185,7 +185,7 @@ updates:
patterns:
- "*" # Prefer a single PR per solution update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/nunit" #AspireApp.sln
directory: "/docs/testing/snippets/testing/nunit" #AspireApp.sln
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -196,7 +196,7 @@ updates:
patterns:
- "*" # Prefer a single PR per solution update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/xunit" #AspireApp.sln
directory: "/docs/testing/snippets/testing/xunit" #AspireApp.sln
schedule:
interval: "weekly"
day: "wednesday"
Expand Down Expand Up @@ -768,7 +768,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/mstest/AspireApp.AppHost" #AspireApp.AppHost.csproj
directory: "/docs/testing/snippets/testing/mstest/AspireApp.AppHost" #AspireApp.AppHost.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -779,7 +779,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/mstest/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
directory: "/docs/testing/snippets/testing/mstest/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -790,7 +790,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/mstest/AspireApp.Tests" #AspireApp.Tests.csproj
directory: "/docs/testing/snippets/testing/mstest/AspireApp.Tests" #AspireApp.Tests.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -801,7 +801,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/nunit/AspireApp.AppHost" #AspireApp.AppHost.csproj
directory: "/docs/testing/snippets/testing/nunit/AspireApp.AppHost" #AspireApp.AppHost.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -812,7 +812,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/nunit/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
directory: "/docs/testing/snippets/testing/nunit/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -823,7 +823,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/nunit/AspireApp.Tests" #AspireApp.Tests.csproj
directory: "/docs/testing/snippets/testing/nunit/AspireApp.Tests" #AspireApp.Tests.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -834,7 +834,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/xunit/AspireApp.AppHost" #AspireApp.AppHost.csproj
directory: "/docs/testing/snippets/testing/xunit/AspireApp.AppHost" #AspireApp.AppHost.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -845,7 +845,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/xunit/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
directory: "/docs/testing/snippets/testing/xunit/AspireApp.ServiceDefaults" #AspireApp.ServiceDefaults.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand All @@ -856,7 +856,7 @@ updates:
patterns:
- "*" # Prefer a single PR per project update.
- package-ecosystem: "nuget"
directory: "/docs/fundamentals/snippets/testing/xunit/AspireApp.Tests" #AspireApp.Tests.csproj
directory: "/docs/testing/snippets/testing/xunit/AspireApp.Tests" #AspireApp.Tests.csproj
schedule:
interval: "weekly"
day: "wednesday"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: 'Dependency Review'
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5
6 changes: 5 additions & 1 deletion .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@
{
"source_path_from_root": "/docs/messaging/rabbitmq-client-integration.md",
"redirect_url": "/dotnet/aspire/messaging/rabbitmq-integration"
},
{
"source_path_from_root": "/docs/fundamentals/testing.md",
"redirect_url": "/dotnet/aspire/testing/write-your-first-test"
}
]
}
}
8 changes: 4 additions & 4 deletions docs/community-toolkit/hosting-azure-static-web-apps.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ This integration requires the [Azure Static Web Apps CLI](/azure/static-web-apps

## Hosting integration

To get started with the .NET Aspire Azure Static Web Apps emulator hosting integration, install the [📦 Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps) NuGet package in the AppHost project.
To get started with the .NET Aspire Azure Static Web Apps emulator hosting integration, install the [📦 CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps) NuGet package in the AppHost project.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps
dotnet add package CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps"
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Azure.StaticWebApps"
Version="*" />
```

Expand All @@ -47,7 +47,7 @@ var api = builder.AddProject<Projects.Aspire_CommunityToolkit_StaticWebApps_ApiA

// Define the frontend resource
var web = builder
.AddNpmApp("web", Path.Combine("..", "Aspire.CommunityToolkit.StaticWebApps.WebApp"), "dev")
.AddNpmApp("web", Path.Combine("..", "CommunityToolkit.Aspire.StaticWebApps.WebApp"), "dev")
.WithHttpEndpoint(env: "PORT")
.WithExternalHttpEndpoints();

Expand Down
6 changes: 3 additions & 3 deletions docs/community-toolkit/hosting-golang.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ In this article, you learn how to use the .NET Aspire Go hosting integration to

## Hosting integration

To get started with the .NET Aspire Go hosting integration, install the [📦 Aspire.CommunityToolkit.Hosting.Go](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.Hosting.Golang) NuGet package in the AppHost project.
To get started with the .NET Aspire Go hosting integration, install the [📦 CommunityToolkit.Aspire.Hosting.Go](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.Hosting.Golang) NuGet package in the AppHost project.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.Hosting.Golang
dotnet add package CommunityToolkit.Aspire.Hosting.Golang
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.Hosting.Golang"
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Golang"
Version="*" />
```

Expand Down
6 changes: 3 additions & 3 deletions docs/community-toolkit/hosting-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ Invoke-WebRequest `

## Get started

To get started with the .NET Aspire Azure Static Web Apps emulator integration, install the [📦 Aspire.CommunityToolkit.Hosting.Java](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.Hosting.Java) NuGet package in the AppHost project.
To get started with the .NET Aspire Azure Static Web Apps emulator integration, install the [📦 CommunityToolkit.Aspire.Hosting.Java](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.Hosting.Java) NuGet package in the AppHost project.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.Hosting.Java
dotnet add package CommunityToolkit.Aspire.Hosting.Java
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.Hosting.Java"
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Java"
Version="*" />
```

Expand Down
6 changes: 3 additions & 3 deletions docs/community-toolkit/hosting-nodejs-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ In this article, you learn about the .NET Aspire Community Toolkit Node.js hosti

## Hosting integration

To get started with the .NET Aspire Community Toolkit Node.js hosting extensions, install the [📦 Aspire.CommunityToolkit.Hosting.NodeJS.Extensions](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.Hosting.NodeJS.Extensions) NuGet package in the AppHost project.
To get started with the .NET Aspire Community Toolkit Node.js hosting extensions, install the [📦 CommunityToolkit.Aspire.Hosting.NodeJS.Extensions](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions) NuGet package in the AppHost project.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.Hosting.NodeJS.Extensions
dotnet add package CommunityToolkit.Aspire.Hosting.NodeJS.Extensions
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.Hosting.NodeJS.Extensions"
<PackageReference Include="CommunityToolkit.Aspire.Hosting.NodeJS.Extensions"
Version="*" />
```

Expand Down
12 changes: 6 additions & 6 deletions docs/community-toolkit/ollama.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ In this article, you learn how to use the .NET Aspire Ollama hosting integration

## Hosting integration

To model the Ollama server, install the [📦 Aspire.CommunityToolkit.Hosting.Ollama](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.Hosting.Ollama) NuGet package in the [app host](xref:aspire/app-host) project.
To model the Ollama server, install the [📦 CommunityToolkit.Aspire.Hosting.Ollama](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.Hosting.Ollama) NuGet package in the [app host](xref:aspire/app-host) project.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.Hosting.Ollama
dotnet add package CommunityToolkit.Aspire.Hosting.Ollama
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.Hosting.Ollama"
<PackageReference Include="CommunityToolkit.Aspire.Hosting.Ollama"
Version="*" />
```

Expand Down Expand Up @@ -73,18 +73,18 @@ var ollama = builder.AddOllama("ollama")

## Client integration

To get started with the .NET Aspire OllamaSharp integration, install the [Aspire.CommunityToolkit.OllamaSharp](https://github.com/orgs/CommunityToolkit/packages/nuget/package/Aspire.CommunityToolkit.OllamaSharp) NuGet package in the client-consuming project, that is, the project for the application that uses the Ollama client.
To get started with the .NET Aspire OllamaSharp integration, install the [CommunityToolkit.Aspire.OllamaSharp](https://dev.azure.com/dotnet/CommunityToolkit/_artifacts/feed/CommunityToolkit-MainLatest/NuGet/CommunityToolkit.Aspire.OllamaSharp) NuGet package in the client-consuming project, that is, the project for the application that uses the Ollama client.

### [.NET CLI](#tab/dotnet-cli)

```dotnetcli
dotnet add package Aspire.CommunityToolkit.OllamaSharp
dotnet add package CommunityToolkit.Aspire.OllamaSharp
```

### [PackageReference](#tab/package-reference)

```xml
<PackageReference Include="Aspire.CommunityToolkit.OllamaSharp"
<PackageReference Include="CommunityToolkit.Aspire.OllamaSharp"
Version="*" />
```

Expand Down
2 changes: 1 addition & 1 deletion docs/community-toolkit/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ If you've proposed an integration on the `dotnet/aspire` repository, you can sti

### Finding Community Toolkit Integrations

Integrations from the .NET Aspire Community Toolkit appear in the **Add Aspire Integration** dialog in Visual Studio under the namespace `Aspire.CommunityToolkit.*`.
Integrations from the .NET Aspire Community Toolkit appear in the **Add Aspire Integration** dialog in Visual Studio under the namespace `CommunityToolkit.Aspire.*`.

[github-repo]: https://github.com/CommunityToolkit/Aspire
Loading

0 comments on commit 0d3258e

Please sign in to comment.