From e7e9afe11b4358898ddbd5c1a34275770563fe4a Mon Sep 17 00:00:00 2001 From: hello Date: Sat, 15 Mar 2025 14:21:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=BA=A6=E6=A1=86=E6=9E=B6=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0=20Aspire=209.0=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HelloShop.ApiService.csproj | 4 +- .../DaprSidecarResourceBuilderExtensions.cs | 2 +- .../HelloShop.AppHost.csproj | 43 +++---- src/HelloShop.AppHost/Program.cs | 2 +- .../HelloShop.BasketService.csproj | 48 ++++---- src/HelloShop.HybridApp/App.xaml | 2 +- src/HelloShop.HybridApp/App.xaml.cs | 2 - .../HelloShop.HybridApp.csproj | 110 ++++++++---------- src/HelloShop.HybridApp/MainPage.xaml | 2 +- .../Platforms/Android/MainActivity.cs | 1 + .../Platforms/MacCatalyst/AppDelegate.cs | 1 + .../Platforms/Windows/App.xaml | 2 +- .../Platforms/iOS/AppDelegate.cs | 1 + .../HelloShop.IdentityService.csproj | 15 +-- .../HelloShop.OrderingService.csproj | 37 +++--- .../HelloShop.ProductService.csproj | 35 +++--- .../Authorization/RemotePermissionChecker.cs | 2 +- .../HelloShop.ServiceDefaults.csproj | 46 ++++---- src/HelloShop.WebApp/HelloShop.WebApp.csproj | 2 +- ...oShop.BasketService.FunctionalTests.csproj | 84 +++++++------ .../HelloShop.BasketService.UnitTests.csproj | 18 +-- .../FirstWebApiIntegrationTest.cs | 1 + .../HelloShop.FunctionalTests.csproj | 19 ++- ...Shop.ProductService.FunctionalTests.csproj | 63 +++++----- .../HelloShop.ProductService.UnitTests.csproj | 19 ++- 25 files changed, 263 insertions(+), 298 deletions(-) diff --git a/src/HelloShop.ApiService/HelloShop.ApiService.csproj b/src/HelloShop.ApiService/HelloShop.ApiService.csproj index b3ff7dc..340662b 100644 --- a/src/HelloShop.ApiService/HelloShop.ApiService.csproj +++ b/src/HelloShop.ApiService/HelloShop.ApiService.csproj @@ -1,7 +1,7 @@  Exe - net8.0 + net9.0 enable enable @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs b/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs index 7b31e03..69882d2 100644 --- a/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs +++ b/src/HelloShop.AppHost/Extensions/DaprSidecarResourceBuilderExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. -using Aspire.Hosting.Dapr; +using CommunityToolkit.Aspire.Hosting.Dapr; using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; diff --git a/src/HelloShop.AppHost/HelloShop.AppHost.csproj b/src/HelloShop.AppHost/HelloShop.AppHost.csproj index 2498792..8f4f34b 100644 --- a/src/HelloShop.AppHost/HelloShop.AppHost.csproj +++ b/src/HelloShop.AppHost/HelloShop.AppHost.csproj @@ -1,23 +1,24 @@  - - Exe - net8.0 - enable - enable - true - - - - - - - - - - - - - - - + + + Exe + net9.0 + enable + enable + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HelloShop.AppHost/Program.cs b/src/HelloShop.AppHost/Program.cs index 7bbb1cc..f0a878b 100644 --- a/src/HelloShop.AppHost/Program.cs +++ b/src/HelloShop.AppHost/Program.cs @@ -1,8 +1,8 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. +using CommunityToolkit.Aspire.Hosting.Dapr; using HelloShop.AppHost.Extensions; -using Aspire.Hosting.Dapr; var builder = DistributedApplication.CreateBuilder(args); diff --git a/src/HelloShop.BasketService/HelloShop.BasketService.csproj b/src/HelloShop.BasketService/HelloShop.BasketService.csproj index 125ea08..7e23340 100644 --- a/src/HelloShop.BasketService/HelloShop.BasketService.csproj +++ b/src/HelloShop.BasketService/HelloShop.BasketService.csproj @@ -1,26 +1,26 @@  - - net8.0 - enable - enable - true - - - - - - - - - - - - - - - - - - - + + net9.0 + enable + enable + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HelloShop.HybridApp/App.xaml b/src/HelloShop.HybridApp/App.xaml index 32660a1..8a0b19a 100644 --- a/src/HelloShop.HybridApp/App.xaml +++ b/src/HelloShop.HybridApp/App.xaml @@ -1,4 +1,4 @@ - + - - - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - - + + - - - Exe - HelloShop.HybridApp - true - true - enable - false - enable - - - HelloShop.HybridApp - - - com.companyname.helloshop.hybridapp - - - 1.0 - 1 - - 14.2 - 14.0 - 24.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Exe + HelloShop.HybridApp + true + true + enable + false + enable + + HelloShop.HybridApp + + com.companyname.helloshop.hybridapp + + 1.0 + 1 + 14.2 + 14.0 + 24.0 + 10.0.17763.0 + 6.5 + 10.0.19041.0 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HelloShop.HybridApp/MainPage.xaml b/src/HelloShop.HybridApp/MainPage.xaml index c579936..c851437 100644 --- a/src/HelloShop.HybridApp/MainPage.xaml +++ b/src/HelloShop.HybridApp/MainPage.xaml @@ -1,4 +1,4 @@ - + + - net8.0 + net9.0 enable enable @@ -8,13 +8,14 @@ - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + \ No newline at end of file diff --git a/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj b/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj index 34f5553..bb154af 100644 --- a/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj +++ b/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj @@ -1,20 +1,21 @@ - - net8.0 - enable - enable - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - + + net9.0 + enable + enable + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + \ No newline at end of file diff --git a/src/HelloShop.ProductService/HelloShop.ProductService.csproj b/src/HelloShop.ProductService/HelloShop.ProductService.csproj index 80cc256..cf07d93 100644 --- a/src/HelloShop.ProductService/HelloShop.ProductService.csproj +++ b/src/HelloShop.ProductService/HelloShop.ProductService.csproj @@ -1,19 +1,20 @@ - - net8.0 - enable - enable - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - + + net9.0 + enable + enable + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + \ No newline at end of file diff --git a/src/HelloShop.ServiceDefaults/Authorization/RemotePermissionChecker.cs b/src/HelloShop.ServiceDefaults/Authorization/RemotePermissionChecker.cs index e0e0f21..e905f2f 100644 --- a/src/HelloShop.ServiceDefaults/Authorization/RemotePermissionChecker.cs +++ b/src/HelloShop.ServiceDefaults/Authorization/RemotePermissionChecker.cs @@ -19,7 +19,7 @@ public class RemotePermissionChecker(IHttpContextAccessor httpContextAccessor, I httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken); - httpClient.BaseAddress = new Uri("http://identityservice"); + httpClient.BaseAddress = new Uri("https+http://identityservice"); Dictionary parameters = new() { diff --git a/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj b/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj index 032b2a7..0f2240a 100644 --- a/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj +++ b/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj @@ -1,25 +1,25 @@  - - net8.0 - enable - enable - true - - - - - - - - - - - - - - - - - - + + net9.0 + enable + enable + true + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HelloShop.WebApp/HelloShop.WebApp.csproj b/src/HelloShop.WebApp/HelloShop.WebApp.csproj index 73123f7..ec25ce8 100644 --- a/src/HelloShop.WebApp/HelloShop.WebApp.csproj +++ b/src/HelloShop.WebApp/HelloShop.WebApp.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj b/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj index 4f293d5..353a791 100644 --- a/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj +++ b/tests/HelloShop.BasketService.FunctionalTests/HelloShop.BasketService.FunctionalTests.csproj @@ -1,46 +1,40 @@ - - - net8.0 - enable - enable - - false - true - true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - Protos\basket.proto - - - Protos\greet.proto - - - - - - - - + + net9.0 + enable + enable + false + true + true + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + Protos\basket.proto + + + Protos\greet.proto + + + + + + \ No newline at end of file diff --git a/tests/HelloShop.BasketService.UnitTests/HelloShop.BasketService.UnitTests.csproj b/tests/HelloShop.BasketService.UnitTests/HelloShop.BasketService.UnitTests.csproj index 131e442..1369371 100644 --- a/tests/HelloShop.BasketService.UnitTests/HelloShop.BasketService.UnitTests.csproj +++ b/tests/HelloShop.BasketService.UnitTests/HelloShop.BasketService.UnitTests.csproj @@ -1,34 +1,28 @@ - - net8.0 + net9.0 enable enable - false true - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + \ No newline at end of file diff --git a/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs b/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs index 3f9de8b..f309595 100644 --- a/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs +++ b/tests/HelloShop.FunctionalTests/FirstWebApiIntegrationTest.cs @@ -1,6 +1,7 @@ // Copyright (c) HelloShop Corporation. All rights reserved. // See the license file in the project root for more information. +using Aspire.Hosting; using Microsoft.AspNetCore.Authentication.BearerToken; using System.Dynamic; using System.Net; diff --git a/tests/HelloShop.FunctionalTests/HelloShop.FunctionalTests.csproj b/tests/HelloShop.FunctionalTests/HelloShop.FunctionalTests.csproj index a949376..464dc32 100644 --- a/tests/HelloShop.FunctionalTests/HelloShop.FunctionalTests.csproj +++ b/tests/HelloShop.FunctionalTests/HelloShop.FunctionalTests.csproj @@ -1,34 +1,29 @@  - - net8.0 + net9.0 enable enable false true - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + \ No newline at end of file diff --git a/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj b/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj index 9068ac2..481a2b0 100644 --- a/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj +++ b/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj @@ -1,35 +1,30 @@ - - - net8.0 - enable - enable - - false - true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - + + net9.0 + enable + enable + false + true + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + \ No newline at end of file diff --git a/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj b/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj index 0454e9f..982d087 100644 --- a/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj +++ b/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj @@ -1,35 +1,30 @@ - - net8.0 + net9.0 enable enable - false true - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - \ No newline at end of file