Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Align Aspire on 13.4.6 and net10.0 (#762)

Krzysztof Pajakeb8fd9189154
diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml
index 5ab842c20..eb19bb993 100644
--- a/.github/workflows/aspnetcore.yml
+++ b/.github/workflows/aspnetcore.yml
@@ -17,8 +17,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
- - name: Install .NET Aspire workload
- run: dotnet workload install aspire
- name: Restore
run: dotnet restore ./GrandNode.sln
- name: Build with dotnet
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4345d096..458655b21 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,8 +22,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
- - name: Install .NET Aspire workload
- run: dotnet workload install aspire
- name: Cache SonarQube Cloud packages
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
diff --git a/.github/workflows/grandnode.yml b/.github/workflows/grandnode.yml
index 95e4ce74e..11f81b46e 100644
--- a/.github/workflows/grandnode.yml
+++ b/.github/workflows/grandnode.yml
@@ -27,8 +27,6 @@ jobs:
sleep 2
done
echo "MongoDB did not become ready" && exit 1
- - name: Install .NET Aspire workload
- run: dotnet workload install aspire
- name: Restore
run: dotnet restore "${{ env.WORKING_DIRECTORY }}"
- name: Build sln
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a846c02c7..6fdf625a4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -72,11 +72,7 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.17.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.17.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.17.0" />
- <PackageVersion Include="Aspire.Dashboard.Sdk.$(NETCoreSdkRuntimeIdentifier)" Version="9.0.0" />
- <PackageVersion Include="Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier)" Version="9.0.0" />
- </ItemGroup>
- <ItemGroup>
- <PackageVersion Update="Aspire.Dashboard.Sdk.win-x64" Version="13.4.6" />
- <PackageVersion Update="Aspire.Hosting.Orchestration.win-x64" Version="13.4.6" />
+ <PackageVersion Include="Aspire.Dashboard.Sdk.$(NETCoreSdkRuntimeIdentifier)" Version="13.4.6" />
+ <PackageVersion Include="Aspire.Hosting.Orchestration.$(NETCoreSdkRuntimeIdentifier)" Version="13.4.6" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3f961fa9c..08e5f997e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,13 +53,6 @@ steps:
inputs:
version: '10.0.x'
-- task: Bash@3
- displayName: Install .NET Aspire workload
- inputs:
- targetType: 'inline'
- script: |
- dotnet workload install aspire
-
# Replaced NuGet tasks with dotnet CLI commands to fix Ubuntu 24.04 compatibility
- task: DotNetCoreCLI@2
displayName: 'dotnet restore'
diff --git a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
index aef766843..db57b84f6 100644
--- a/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
+++ b/src/Aspire/Aspire.AppHost/Aspire.AppHost.csproj
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
+ <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.6" />
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net9.0</TargetFramework>
+ <TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
diff --git a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
index 3812d8e5d..1efcb64ca 100644
--- a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
+++ b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net9.0</TargetFramework>
+ <TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>