From 5e74bc50a97e860664691615ca7fa13b3290cff2 Mon Sep 17 00:00:00 2001 From: hello Date: Fri, 1 Mar 2024 19:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=208.0=20=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?=209.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HelloShop.sln | 6 +- .../HelloShop.ApiService.csproj | 7 +- .../HelloShop.AppHost.csproj | 10 +- .../HelloShop.BasketService.csproj | 11 +- src/HelloShop.HybridApp/App.xaml | 2 +- .../HelloShop.HybridApp.csproj | 110 ++++++++---------- src/HelloShop.HybridApp/MainPage.xaml | 2 +- .../Platforms/Windows/App.xaml | 2 +- .../HelloShop.IdentityService.csproj | 10 +- .../HelloShop.OrderingService.csproj | 10 +- .../HelloShop.ProductService.csproj | 10 +- .../HelloShop.ServiceDefaults.csproj | 24 ++-- src/HelloShop.WebApp/HelloShop.WebApp.csproj | 7 +- ...Shop.ProductService.FunctionalTests.csproj | 16 +-- .../HelloShop.ProductService.UnitTests.csproj | 16 +-- 15 files changed, 95 insertions(+), 148 deletions(-) diff --git a/HelloShop.sln b/HelloShop.sln index 37403ea..ac47d29 100644 --- a/HelloShop.sln +++ b/HelloShop.sln @@ -18,15 +18,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.ProductService", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.BasketService", "src\HelloShop.BasketService\HelloShop.BasketService.csproj", "{02EBA5AD-84B4-4AF4-B519-72061C08800D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.HybridApp", "src\HelloShop.HybridApp\HelloShop.HybridApp.csproj", "{CC0E5839-B7E9-400E-9AF3-95863BBF518B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.HybridApp", "src\HelloShop.HybridApp\HelloShop.HybridApp.csproj", "{CC0E5839-B7E9-400E-9AF3-95863BBF518B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1AD03316-A743-4E9D-B3BC-FB9499D15141}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{29BE158E-825E-48AB-A02D-4E537A5DC502}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.ProductService.UnitTests", "tests\HelloShop.ProductService.UnitTests\HelloShop.ProductService.UnitTests.csproj", "{2022279A-E39F-4489-82AE-39AC53C594C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.ProductService.UnitTests", "tests\HelloShop.ProductService.UnitTests\HelloShop.ProductService.UnitTests.csproj", "{2022279A-E39F-4489-82AE-39AC53C594C9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloShop.ProductService.FunctionalTests", "tests\HelloShop.ProductService.FunctionalTests\HelloShop.ProductService.FunctionalTests.csproj", "{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloShop.ProductService.FunctionalTests", "tests\HelloShop.ProductService.FunctionalTests\HelloShop.ProductService.FunctionalTests.csproj", "{45932B7F-6ED0-40F3-AA2C-F14A844FEE18}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/HelloShop.ApiService/HelloShop.ApiService.csproj b/src/HelloShop.ApiService/HelloShop.ApiService.csproj index fdb792c..ec25ce8 100644 --- a/src/HelloShop.ApiService/HelloShop.ApiService.csproj +++ b/src/HelloShop.ApiService/HelloShop.ApiService.csproj @@ -1,14 +1,11 @@ - Exe - net8.0 + net9.0 enable enable - - - + \ No newline at end of file diff --git a/src/HelloShop.AppHost/HelloShop.AppHost.csproj b/src/HelloShop.AppHost/HelloShop.AppHost.csproj index 133b07f..cbb7c49 100644 --- a/src/HelloShop.AppHost/HelloShop.AppHost.csproj +++ b/src/HelloShop.AppHost/HelloShop.AppHost.csproj @@ -1,13 +1,11 @@ - Exe - net8.0 + net9.0 enable enable true - @@ -16,9 +14,7 @@ - - + - - + \ No newline at end of file diff --git a/src/HelloShop.BasketService/HelloShop.BasketService.csproj b/src/HelloShop.BasketService/HelloShop.BasketService.csproj index 0cc0417..36218ec 100644 --- a/src/HelloShop.BasketService/HelloShop.BasketService.csproj +++ b/src/HelloShop.BasketService/HelloShop.BasketService.csproj @@ -1,21 +1,16 @@ - - net8.0 + net9.0 enable enable - - - + - - - + \ 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 + 10.0.17763.0 + 6.5 + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/HelloShop.HybridApp/MainPage.xaml b/src/HelloShop.HybridApp/MainPage.xaml index aac6f14..ef0446a 100644 --- a/src/HelloShop.HybridApp/MainPage.xaml +++ b/src/HelloShop.HybridApp/MainPage.xaml @@ -1,4 +1,4 @@ - + - - net8.0 + net9.0 enable enable true - - + - - - + \ No newline at end of file diff --git a/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj b/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj index 0fcd596..a97a79f 100644 --- a/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj +++ b/src/HelloShop.OrderingService/HelloShop.OrderingService.csproj @@ -1,18 +1,14 @@ - - net8.0 + net9.0 enable enable true - - + - - - + \ No newline at end of file diff --git a/src/HelloShop.ProductService/HelloShop.ProductService.csproj b/src/HelloShop.ProductService/HelloShop.ProductService.csproj index 0fcd596..a97a79f 100644 --- a/src/HelloShop.ProductService/HelloShop.ProductService.csproj +++ b/src/HelloShop.ProductService/HelloShop.ProductService.csproj @@ -1,18 +1,14 @@ - - net8.0 + net9.0 enable enable true - - + - - - + \ No newline at end of file diff --git a/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj b/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj index 00e0d1f..bea61d9 100644 --- a/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj +++ b/src/HelloShop.ServiceDefaults/HelloShop.ServiceDefaults.csproj @@ -1,24 +1,20 @@ - Library - net8.0 + 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 fdb792c..ec25ce8 100644 --- a/src/HelloShop.WebApp/HelloShop.WebApp.csproj +++ b/src/HelloShop.WebApp/HelloShop.WebApp.csproj @@ -1,14 +1,11 @@ - Exe - net8.0 + net9.0 enable enable - - - + \ 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 9e0c306..cc6669e 100644 --- a/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj +++ b/tests/HelloShop.ProductService.FunctionalTests/HelloShop.ProductService.FunctionalTests.csproj @@ -1,25 +1,21 @@ - - net8.0 + net9.0 enable enable - false true - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + \ 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 9e0c306..cc6669e 100644 --- a/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj +++ b/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj @@ -1,25 +1,21 @@ - - net8.0 + net9.0 enable enable - false true - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + \ No newline at end of file