Merge pull request #1147 from dotnet/main

✅ Merge `main` into `live`
dotnet · Jun 21, 2024 · 8f5677e · 8f5677e
2 parents 2f7f214 + 31fa7c1
commit 8f5677e
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -52,6 +52,17 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per solution update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/deployment/azure/snippets/AppHost.Bicep" #AppHost.Bicep.sln
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for solutions.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per solution update.
   - package-ecosystem: "nuget"
     directory: "/docs/extensibility/snippets/MailDevResource" #MailDevResource.sln
     schedule:
@@ -294,6 +305,17 @@ updates:
       dotnet:
         patterns:
           - "*" # Prefer a single PR per project update.
+  - package-ecosystem: "nuget"
+    directory: "/docs/deployment/azure/snippets/WebHook.Api" #WebHook.Api.csproj
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+    open-pull-requests-limit: 5
+    groups:
+      # Group .NET updates together for projects.
+      dotnet:
+        patterns:
+          - "*" # Prefer a single PR per project update.
   - package-ecosystem: "nuget"
     directory: "/docs/extensibility/snippets/MailDevResource/MailDev.Hosting" #MailDev.Hosting.csproj
     schedule:

diff --git a/docs/deployment/azure/aca-deployment-azd-in-depth.md b/docs/deployment/azure/aca-deployment-azd-in-depth.md
@@ -1,7 +1,7 @@
 ---
 title: Deploy a .NET Aspire project to Azure Container Apps using `azd` (in-depth guide)
 description: Learn how to use `azd` to deploy .NET Aspire projects to Azure Container Apps.
-ms.date: 03/08/2024
+ms.date: 06/14/2024
 ms.custom: devx-track-extended-azdevcli
 ---
 
@@ -87,6 +87,10 @@ services:
     host: containerapp
 ```
 
+### Resource naming
+
+[!INCLUDE [azure-container-app-naming](../../includes/azure-container-app-naming.md)]
+
 ### Initial deployment
 
 1. In order to deploy the .NET Aspire project, authenticate to Azure AD to call the Azure resource management APIs.

diff --git a/docs/deployment/azure/aca-deployment-github-actions.md b/docs/deployment/azure/aca-deployment-github-actions.md
@@ -1,7 +1,7 @@
 ---
 title: Deploy a .NET Aspire project using the Azure Developer CLI and GitHub Actions
 description: Learn how to use `azd` and GitHub Actions to deploy .NET Aspire projects.
-ms.date: 05/30/2024
+ms.date: 06/14/2024
 zone_pivot_groups: deployment-platform
 ms.custom: devx-track-extended-azdevcli
 ---
@@ -58,6 +58,10 @@ curl -fsSL https://aka.ms/install-azd.sh | bash
 
 As a starting point, this article assumes that you've created a .NET Aspire project from the **.NET Aspire Starter Application** template. For more information, see [Quickstart: Build your first .NET Aspire project](../../get-started/build-your-first-aspire-app.md).
 
+### Resource naming
+
+[!INCLUDE [azure-container-app-naming](../../includes/azure-container-app-naming.md)]
+
 [!INCLUDE [init workflow](includes/init-workflow.md)]
 
 :::zone pivot="github-actions"

diff --git a/docs/deployment/azure/aca-deployment-visual-studio.md b/docs/deployment/azure/aca-deployment-visual-studio.md
@@ -1,7 +1,7 @@
 ---
 title: Deploy .NET Aspire projects to Azure Container Apps using Visual Studio
 description: Learn how to use Bicep, the Azure CLI, and Azure Developer CLI to deploy .NET Aspire projects to Azure using Visual Studio.
-ms.date: 05/18/2024
+ms.date: 06/14/2024
 ---
 
 # Deploy a .NET Aspire project to Azure Container Apps using Visual Studio
@@ -22,6 +22,10 @@ ms.date: 05/18/2024
 
 As a starting point, this article assumes that you've created a .NET Aspire project from the **.NET Aspire Starter Application** template. For more information, see [Quickstart: Build your first .NET Aspire project](../../get-started/build-your-first-aspire-app.md).
 
+### Resource naming
+
+[!INCLUDE [azure-container-app-naming](../../includes/azure-container-app-naming.md)]
+
 ### Deploy the app
 
 1. In the solution explorer, right-click on the **.AppHost** project and select **Publish** to open the **Publish** dialog.

diff --git a/docs/deployment/azure/aca-deployment.md b/docs/deployment/azure/aca-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: Deploy .NET Aspire projects to Azure Container Apps
 description: Learn how to use the Azure Developer CLI to deploy .NET Aspire projects to Azure.
-ms.date: 05/18/2024
+ms.date: 06/14/2024
 ms.custom: devx-track-extended-azdevcli
 ---
 
@@ -29,6 +29,10 @@ With .NET Aspire and Azure Container Apps (ACA), you have a great hosting scenar
 
 As a starting point, this article assumes that you've created a .NET Aspire project from the **.NET Aspire Starter Application** template. For more information, see [Quickstart: Build your first .NET Aspire project](../../get-started/build-your-first-aspire-app.md).
 
+### Resource naming
+
+[!INCLUDE [azure-container-app-naming](../../includes/azure-container-app-naming.md)]
+
 ## Install the Azure Developer CLI
 
 The process for installing `azd` varies based on your operating system, but it is widely available via `winget`, `brew`, `apt`, or directly via `curl`. To install `azd`, see [Install Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd).

diff --git a/docs/deployment/azure/snippets/WebHook.Api/WebHook.Api.csproj b/docs/deployment/azure/snippets/WebHook.Api/WebHook.Api.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/includes/azure-container-app-naming.md b/docs/includes/azure-container-app-naming.md
@@ -0,0 +1,3 @@
+When you create new Azure resources, it's important to follow the naming requirements. For Azure Container Apps, the name must be 2-32 characters long and consist of lowercase letters, numbers, and hyphens. The name must start with a letter and end with an alphanumeric character.
+
+For more information, see [Naming rules and restrictions for Azure resources](/azure/azure-resource-manager/management/resource-name-rules#microsoftapp).
diff --git a/docs/real-time/snippets/signalr/SignalR.ServiceDefaults/SignalR.ServiceDefaults.csproj b/docs/real-time/snippets/signalr/SignalR.ServiceDefaults/SignalR.ServiceDefaults.csproj
@@ -12,11 +12,11 @@
 
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.6.0" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.1" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/real-time/snippets/signalr/SignalR.Web/SignalR.Web.csproj b/docs/real-time/snippets/signalr/SignalR.Web/SignalR.Web.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Blazor.LocalStorage" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
   </ItemGroup>
 
   <ItemGroup>