Update to Aspire 9.1 (#521)

* Update to Aspire 9.1 * Update NuGet.config * Update NuGet.config * Update MS.Ext.Http.Resilience version * Update NuGet.config * Update NuGet.config * Update Aspire bits to latest preview & merge main * Update to latest patches for dependencies * Fix SDK version * Update more bits to latest build * More updates * More fixes * Update ImageGallery.ServiceDefaults.csproj * Update to latest 9.1 build & remove Dapr sample * Add improvements to dev cert extensions * Revert "Add improvements to dev cert extensions" This reverts commit 14d4540. * Update to latest 9.1 build * Update to stable 9.1 bits * Update deps * Use WaitForResourcesHealthyAsync * Final bits & revert test change * Go back to using WaitForResources * PR feedback * Update dependabot.yml * Update HealthChecksUI.ServiceDefaults.csproj * PR feedback - Remove gRPC instrumentation where gRPC isn't being used - Ensure all OTel references are 1.9.0 - Use AspNetCore.HealthChecks v9 everywhere --------- Co-authored-by: Eric Erhardt <[email protected]>
dotnet · Feb 26, 2025 · 9a0955b · 9a0955b
1 parent 2bc9d5d
commit 9a0955b
Show file tree

Hide file tree

Showing 91 changed files with 219 additions and 1,220 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,6 +11,9 @@ updates:
     schedule:
       interval: daily
     open-pull-requests-limit: 15
+    ignore:
+       # See https://github.com/dotnet/aspire/issues/7123
+      - dependency-name: "OpenTelemetry.*"
     groups:
       Aspire:
         patterns:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,12 +33,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Dapr tool installer
-      uses: dapr/setup-dapr@v2
-      with:
-        version: '1.14.1'
-      id: install-dapr
-
     - name: Install Azure Functions Core Tools
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -47,14 +41,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install azure-functions-core-tools-4
 
-    - name: Initialize Dapr (Ubuntu)
-      if: matrix.os == 'ubuntu-latest'
-      run: ${{ steps.install-dapr.outputs.dapr-path }} init --slim
-
-    - name: Initialize Dapr (Windows)
-      if: matrix.os == 'windows-latest'
-      run: ${{ steps.install-dapr.outputs.dapr-path }} init --slim
-
     - name: Install .NET SDK (global.json)
       uses: actions/setup-dotnet@v4
       with:
@@ -77,8 +63,6 @@ jobs:
 
     - name: Build
       run: ${{ matrix.os == 'ubuntu-latest' && './build.sh' || '.\build.cmd' }}
-      env:
-        DAPR_CLI_PATH: ${{ steps.install-dapr.outputs.dapr-path }}
 
     - name: Test
       id: test
@@ -91,8 +75,6 @@ jobs:
         --results-directory ./TestResults --blame
         -- 
         RunConfiguration.CollectSourceInformation=true
-      env:
-        DAPR_CLI_PATH: ${{ steps.install-dapr.outputs.dapr-path }}
     
     - name: Publish Test Results
       if: (success() || steps.test.conclusion == 'failure') && matrix.os == 'ubuntu-latest'

diff --git a/README.md b/README.md
@@ -17,7 +17,6 @@ Sample highlights include:
 - [Integrating a Node.js app](./samples/AspireWithNode)
 - [Integrating frontend apps using React, Vue, Angular, etc.](./samples/AspireWithJavaScript)
 - [Integrating a Go app using a Dockerfile](./samples/ContainerBuild)
-- [Integrating Dapr](./samples/AspireWithDapr)
 - [Integrating Orleans](./samples/OrleansVoting)
 - [Persisting data in composed containers using volume mounts](./samples/VolumeMount)
 - [Working with and initializing database containers](./samples/DatabaseContainers)

diff --git a/for.dependabot.only.sln b/for.dependabot.only.sln
@@ -17,14 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireShop.Frontend", "samp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireShop.ServiceDefaults", "samples\AspireShop\AspireShop.ServiceDefaults\AspireShop.ServiceDefaults.csproj", "{9F8BE5D7-566D-446C-A867-84A2F6EF3609}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireWithDapr.ApiService", "samples\AspireWithDapr\AspireWithDapr.ApiService\AspireWithDapr.ApiService.csproj", "{D3CA0BA5-6327-433B-92D6-0AB9211C38FA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireWithDapr.AppHost", "samples\AspireWithDapr\AspireWithDapr.AppHost\AspireWithDapr.AppHost.csproj", "{84D8CAB9-3776-4374-8F09-D87249C9BEE1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireWithDapr.ServiceDefaults", "samples\AspireWithDapr\AspireWithDapr.ServiceDefaults\AspireWithDapr.ServiceDefaults.csproj", "{1014EAF3-752D-4891-8CB8-1CDF5407D9B7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireWithDapr.Web", "samples\AspireWithDapr\AspireWithDapr.Web\AspireWithDapr.Web.csproj", "{37B564AE-1922-4441-8263-980E183E1A0C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireJavaScript.AppHost", "samples\AspireWithJavaScript\AspireJavaScript.AppHost\AspireJavaScript.AppHost.csproj", "{9932E9F8-85C4-4978-BE21-DF665C0CACCF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireJavaScript.MinimalApi", "samples\AspireWithJavaScript\AspireJavaScript.MinimalApi\AspireJavaScript.MinimalApi.csproj", "{68732D90-7FEE-426F-9921-07675EA78E41}"
@@ -105,16 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireShop.ServiceDefaults"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireShop", "AspireShop", "{C14A33A9-EE13-4AD8-B14A-A702C3965715}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireWithDapr.ApiService", "AspireWithDapr.ApiService", "{424ABEA8-79A0-4E9E-AD7E-50DEA8C190CF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireWithDapr.AppHost", "AspireWithDapr.AppHost", "{2CACF027-33F1-4B01-B2BD-EFD0D57D9967}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireWithDapr.ServiceDefaults", "AspireWithDapr.ServiceDefaults", "{3659241D-F13D-466B-A9B8-7918CBEE7782}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireWithDapr.Web", "AspireWithDapr.Web", "{F4AC819D-918A-4C9A-8AA5-C032ED31C752}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireWithDapr", "AspireWithDapr", "{421079A5-D123-4684-87A2-F943FF4C2449}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireJavaScript.AppHost", "AspireJavaScript.AppHost", "{C266F0C0-41C1-4A2F-A276-8D4CF52490C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspireJavaScript.MinimalApi", "AspireJavaScript.MinimalApi", "{9A0CFC71-B8FF-4F12-9087-4D8AA199EDC0}"

diff --git a/samples/AspireShop/AspireShop.AppHost/AspireShop.AppHost.csproj b/samples/AspireShop/AspireShop.AppHost/AspireShop.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
-    <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
-    <PackageReference Include="Aspire.Hosting.Redis" Version="9.0.0" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0" />
     <ProjectReference Include="..\AspireShop.BasketService\AspireShop.BasketService.csproj" />
     <ProjectReference Include="..\AspireShop.CatalogDbManager\AspireShop.CatalogDbManager.csproj" />
     <ProjectReference Include="..\AspireShop.CatalogService\AspireShop.CatalogService.csproj" />

diff --git a/samples/AspireShop/AspireShop.BasketService/AspireShop.BasketService.csproj b/samples/AspireShop/AspireShop.BasketService/AspireShop.BasketService.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
     <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.67.0" />
-    <PackageReference Include="Aspire.StackExchange.Redis" Version="9.0.0" />
+    <PackageReference Include="Aspire.StackExchange.Redis" Version="9.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/AspireShop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj b/samples/AspireShop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-preview.5.*" />
+    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/AspireShop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj b/samples/AspireShop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-preview.5.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.11">
+    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/samples/AspireShop/AspireShop.CatalogService/AspireShop.CatalogService.csproj b/samples/AspireShop/AspireShop.CatalogService/AspireShop.CatalogService.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-preview.5.*" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/AspireShop/AspireShop.Frontend/AspireShop.Frontend.csproj b/samples/AspireShop/AspireShop.Frontend/AspireShop.Frontend.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.1.0" />
     <PackageReference Include="Yarp.ReverseProxy" Version="2.2.0" />
     <PackageReference Include="Grpc.Net.ClientFactory" Version="2.67.0" />
     <PackageReference Include="Grpc.Tools" Version="2.69.0">

diff --git a/samples/AspireShop/AspireShop.ServiceDefaults/AspireShop.ServiceDefaults.csproj b/samples/AspireShop/AspireShop.ServiceDefaults/AspireShop.ServiceDefaults.csproj
@@ -11,18 +11,18 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
     <!-- Open Telemetry -->
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.8.0-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.0" />
+    <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.GrpcNetClient" Version="1.9.0-beta.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
     <!-- Health checks -->
     <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
-
+    
     <PackageReference Include="Grpc.HealthCheck" Version="2.67.0" />
     <PackageReference Include="Grpc.Net.ClientFactory" Version="2.67.0" />
   </ItemGroup>

diff --git a/samples/AspireWithAzureFunctions/ImageGallery.AppHost/ImageGallery.AppHost.csproj b/samples/AspireWithAzureFunctions/ImageGallery.AppHost/ImageGallery.AppHost.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
-    <PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.0.0" />
-    <PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.0.0-preview.5.24551.3" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.1.0-preview.1.25121.10" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/AspireWithAzureFunctions/ImageGallery.FrontEnd/ImageGallery.FrontEnd.csproj b/samples/AspireWithAzureFunctions/ImageGallery.FrontEnd/ImageGallery.FrontEnd.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.0.0" />
-    <PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.0.0" />
+    <PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.1.0" />
+    <PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/AspireWithAzureFunctions/ImageGallery.Functions/ImageGallery.Functions.csproj b/samples/AspireWithAzureFunctions/ImageGallery.Functions/ImageGallery.Functions.csproj
@@ -11,13 +11,13 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Blobs" Version="6.6.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Blobs" Version="6.6.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.5.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.9.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
-    <PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.0.0" />
-    <PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.10.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.1.0" />
+    <PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.1.0" />
     <PackageReference Include="SkiaSharp" Version="3.116.1" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
   </ItemGroup>

diff --git a/...AspireWithAzureFunctions/ImageGallery.ServiceDefaults/ImageGallery.ServiceDefaults.csproj b/...AspireWithAzureFunctions/ImageGallery.ServiceDefaults/ImageGallery.ServiceDefaults.csproj
@@ -10,13 +10,13 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
+    <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/samples/AspireWithDapr/AspireWithDapr.ApiService/AspireWithDapr.ApiService.csproj b/samples/AspireWithDapr/AspireWithDapr.ApiService/AspireWithDapr.ApiService.csproj
diff --git a/samples/AspireWithDapr/AspireWithDapr.ApiService/Program.cs b/samples/AspireWithDapr/AspireWithDapr.ApiService/Program.cs
diff --git a/samples/AspireWithDapr/AspireWithDapr.ApiService/Properties/launchSettings.json b/samples/AspireWithDapr/AspireWithDapr.ApiService/Properties/launchSettings.json
diff --git a/samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.Development.json b/samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.Development.json
diff --git a/samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.json b/samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.json
diff --git a/samples/AspireWithDapr/AspireWithDapr.AppHost/AspireWithDapr.AppHost.csproj b/samples/AspireWithDapr/AspireWithDapr.AppHost/AspireWithDapr.AppHost.csproj