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

Bump Aspire from 8.0.x to 9.0.x #4304

Merged
merged 8 commits into from
Jan 8, 2025
Merged

Bump Aspire from 8.0.x to 9.0.x #4304

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6bb58a
Bump Aspire from 8.0.x to 9.0.x
premun Jan 6, 2025
af66f49
Stop installing the aspire workload
premun Jan 6, 2025
995cd33
Add package mappings
premun Jan 6, 2025
2ed79ad
Fix the docker file
premun Jan 6, 2025
4e1d700
Bump BarViz to .NET 9.0
premun Jan 6, 2025
1874bc0
Revert bumping BarViz to 9.0
premun Jan 8, 2025
850ab2a
Roll back the SDK
premun Jan 8, 2025
f1ac03d
Merge remote-tracking branch 'dotnet/main' into prvysoky/aspire
premun Jan 8, 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
20 changes: 10 additions & 10 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AspNetAzureVersion>3.1.24</AspNetAzureVersion>
<AspNetCoreVersion>6.0.36</AspNetCoreVersion>
<MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
<AspireVersion>8.2.0</AspireVersion>
<AspireVersion>9.0.0</AspireVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
Expand All @@ -18,17 +18,17 @@
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="$(AspireVersion)" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
<PackageVersion Include="Azure.Core" Version="1.42.0" />
<PackageVersion Include="Azure.Core" Version="1.44.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" />
<PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.3.0" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.6.0" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.19.1" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.20.1" />
<PackageVersion Include="Blazored.SessionStorage" Version="2.4.0" />
<PackageVersion Include="CommandLineParser" Version="2.2.1" />
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
Expand Down Expand Up @@ -90,17 +90,17 @@
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="3.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
Expand Down
3 changes: 2 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<packageSource key="dotnet-public">
<package pattern="Argon" />
<package pattern="Aspire.*" />
<package pattern="AspNetCore.HealthChecks.Azure.Storage.Queues" />
<package pattern="AspNetCore.*" />
<package pattern="AspNetCoreRateLimit" />
<package pattern="AutoMapper" />
<package pattern="Azure.*" />
Expand Down Expand Up @@ -51,6 +51,7 @@
<package pattern="IdentityServer4.*" />
<package pattern="JetBrains.Annotations" />
<package pattern="Json.More.Net" />
<package pattern="JsonPatch.Net" />
<package pattern="JsonPointer.Net" />
<package pattern="JsonSchema.Net" />
<package pattern="KubernetesClient" />
Expand Down
1 change: 0 additions & 1 deletion docs/DevGuide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
1. Install the latest Preview VS.
- Be sure to install the `Azure Development => .NET Aspire SDK (Preview)` optional workload in the VS installer
- Be sure to install the `ASP.NET and web development` => `.NET 8.0/9.0 WebAssembly Build Tools`
- If you're building the project using the command line, run `dotnet workload install aspire` or `dotnet workload update` to install/update the aspire workload
1. Install Docker Desktop: https://www.docker.com/products/docker-desktop
1. Install SQL Server Express: https://www.microsoft.com/en-us/sql-server/sql-server-downloads
1. Install Entity Framework Core CLI by running `dotnet tool install --global dotnet-ef`
Expand Down
6 changes: 0 additions & 6 deletions eng/templates/jobs/e2e-pcs-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ jobs:
inputs:
versionSpec: 5.3.x

- powershell: |
. .\eng\common\tools.ps1
InitializeDotNetCli -install:$true
.\.dotnet\dotnet workload install aspire
displayName: Install .NET and Aspire Workload

- powershell: .\eng\common\build.ps1 -restore
displayName: Install .NET

Expand Down
6 changes: 0 additions & 6 deletions eng/templates/stages/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@ stages:
inputs:
versionSpec: 5.3.x

- powershell: |
. .\eng\common\tools.ps1
InitializeDotNetCli -install:$true
.\.dotnet\dotnet workload install aspire
displayName: Install .NET and Aspire Workload

- powershell: |
$az = Get-Command az.cmd
Write-Host "##vso[task.setvariable variable=azCliPath]$($az.Source)"
Expand Down
7 changes: 0 additions & 7 deletions eng/templates/steps/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ steps:
Write-Host "##vso[task.setvariable variable=VersionPrefix]1.1.0"
displayName: Set Package Version

- powershell: |
. .\eng\common\tools.ps1
InitializeDotNetCli -install:$true
.\.dotnet\dotnet workload update --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
.\.dotnet\dotnet workload install aspire --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
displayName: Install .NET and Aspire Workload

- script: >
.\eng\common\cibuild.cmd
-configuration ${{ parameters.configuration }}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "8.0.303",
"version": "9.0.101",
"rollForward": "minor"
},
"tools": {
"dotnet": "8.0.303",
"dotnet": "9.0.101",
"runtimes": {
"dotnet": [
"6.0.29"
Expand Down
2 changes: 1 addition & 1 deletion src/ProductConstructionService/ProductConstructionService.Api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

# Build .NET apps
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20 AS build
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.20 AS build
ARG BUILD_CONFIGURATION=Release
ARG PACKAGE_VERSION="0.0.99-dev"

Expand Down
2 changes: 2 additions & 0 deletions ...ctionService/ProductConstructionService.AppHost/ProductConstructionService.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
Expand Down
12 changes: 11 additions & 1 deletion ...ructionService/ProductConstructionService.BarViz/ProductConstructionService.BarViz.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<!-- We're referencing Maestro.Data, which isn't signed and doesn't have a strong name, so we can't be signed neither -->
Expand All @@ -15,6 +15,16 @@
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" />
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" />
<PackageReference Include="TextCopy" />

<!-- Pins that can go away once we upgrade to .NET 9.0 centrally -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have plans to move to 9.0 since it's not LTS?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to move the repo to 9.0 and it's problematic with darc still targeting 6.0 (which I don't know if we can bump).

However this PR shows that Blazor WASM compiled by 9.0 targeting 8.0 does not work well if it has libraries inside targeting older. I found quite a few threads on GitHub about problems like these.

<PackageReference Include="Microsoft.Extensions.Configuration" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" VersionOverride="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading