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.

Sign up for GitHub

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

[WIP] Update to Aspire 9.1 #521

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

[WIP] Update to Aspire 9.1 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bd7f0bb
Update to Aspire 9.1
DamianEdwards Oct 24, 2024
7bde007
Update NuGet.config
DamianEdwards Oct 24, 2024
9365118
Update NuGet.config
DamianEdwards Oct 24, 2024
6a48674
Update MS.Ext.Http.Resilience version
DamianEdwards Oct 24, 2024
7297abe
Update NuGet.config
DamianEdwards Oct 24, 2024
b9b187e
Update NuGet.config
DamianEdwards Oct 24, 2024
637360b
Merge branch 'main' into UpdateToAspire9.1
DamianEdwards Jan 22, 2025
4eb1148
Update Aspire bits to latest preview & merge main
DamianEdwards Jan 23, 2025
15df0a5
Update to latest patches for dependencies
DamianEdwards Jan 23, 2025
c557c07
Fix SDK version
DamianEdwards Jan 23, 2025
a07a036
Update more bits to latest build
DamianEdwards Jan 23, 2025
670c0d9
More updates
DamianEdwards Jan 23, 2025
94af1e8
More fixes
DamianEdwards Jan 23, 2025
e260d87
Update ImageGallery.ServiceDefaults.csproj
DamianEdwards Jan 23, 2025
7295fd9
Update to latest 9.1 build & remove Dapr sample
DamianEdwards Jan 28, 2025
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
18 changes: 0 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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'
Expand Down
12 changes: 12 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSourceMapping>
<packageSource key="dotnet9">
<package pattern="Aspire.*" />
<package pattern="Microsoft.Extensions.ServiceDiscovery*" />
<package pattern="Microsoft.Extensions.*" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="Microsoft.Extensions.*" />
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 0 additions & 18 deletions for.dependabot.only.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"
Expand Down
8 changes: 4 additions & 4 deletions samples/AspireShop/AspireShop.AppHost/AspireShop.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-preview.1.25078.3" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -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-preview.1.25078.3" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0-preview.1.25078.3" />
<ProjectReference Include="..\AspireShop.BasketService\AspireShop.BasketService.csproj" />
<ProjectReference Include="..\AspireShop.CatalogDbManager\AspireShop.CatalogDbManager.csproj" />
<ProjectReference Include="..\AspireShop.CatalogService\AspireShop.CatalogService.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions samples/AspireShop/AspireShop.BasketService/AspireShop.BasketService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.66.0" />
<PackageReference Include="Aspire.StackExchange.Redis" Version="9.0.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.67.0" />
<PackageReference Include="Aspire.StackExchange.Redis" Version="9.1.0-preview.1.25078.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/AspireShop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-preview.1.25078.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions samples/AspireShop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-preview.1.25078.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.12">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions samples/AspireShop/AspireShop.CatalogService/AspireShop.CatalogService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.12" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0-preview.1.25078.3" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions samples/AspireShop/AspireShop.Frontend/AspireShop.Frontend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.2.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.66.0" />
<PackageReference Include="Grpc.Tools" Version="2.67.0">
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.67.0" />
<PackageReference Include="Grpc.Tools" Version="2.69.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions samples/AspireShop/AspireShop.ServiceDefaults/AspireShop.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0-preview.1.25078.3" />
<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.8.0-beta.1" />
<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" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
Expand Down
8 changes: 4 additions & 4 deletions samples/AspireWithAzureFunctions/ImageGallery.AppHost/ImageGallery.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-preview.1.25078.3" />

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -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-preview.1.25078.3" />
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="Aspire.Hosting.Azure.Functions" Version="9.1.0-preview.1.25078.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/AspireWithAzureFunctions/ImageGallery.FrontEnd/ImageGallery.FrontEnd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-preview.1.25078.3" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.1.0-preview.1.25078.3" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions samples/AspireWithAzureFunctions/ImageGallery.Functions/ImageGallery.Functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<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.Sdk" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
<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.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImageGallery.ServiceDefaults\ImageGallery.ServiceDefaults.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...AspireWithAzureFunctions/ImageGallery.ServiceDefaults/ImageGallery.ServiceDefaults.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0-preview.1.25078.3" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
Expand Down
14 changes: 0 additions & 14 deletions samples/AspireWithDapr/AspireWithDapr.ApiService/AspireWithDapr.ApiService.csproj
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions samples/AspireWithDapr/AspireWithDapr.ApiService/Program.cs
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions samples/AspireWithDapr/AspireWithDapr.ApiService/Properties/launchSettings.json
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.Development.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions samples/AspireWithDapr/AspireWithDapr.ApiService/appsettings.json
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions samples/AspireWithDapr/AspireWithDapr.AppHost/AspireWithDapr.AppHost.csproj
View file
Open in desktop

This file was deleted.

Loading