From 1cec4878fa012831f63319b3ac7a03b29c7d13a8 Mon Sep 17 00:00:00 2001 From: Juster Zhu Date: Thu, 7 Dec 2023 22:43:04 +0800 Subject: [PATCH 1/2] Modify method name --- .../GeneralUpdate.Core/Pipelines/Pipeline/IPipelineBuilder.cs | 2 +- src/c#/GeneralUpdate.Core/Pipelines/PipelineBuilder.cs | 2 +- .../Strategys/PlatformWindows/WindowsStrategy.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c#/GeneralUpdate.Core/Pipelines/Pipeline/IPipelineBuilder.cs b/src/c#/GeneralUpdate.Core/Pipelines/Pipeline/IPipelineBuilder.cs index d7d1e92..11c0e49 100644 --- a/src/c#/GeneralUpdate.Core/Pipelines/Pipeline/IPipelineBuilder.cs +++ b/src/c#/GeneralUpdate.Core/Pipelines/Pipeline/IPipelineBuilder.cs @@ -16,6 +16,6 @@ namespace GeneralUpdate.Core.Pipelines.Pipeline /// start the pipeline. /// /// - Task Launch(); + Task Build(); } } \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Core/Pipelines/PipelineBuilder.cs b/src/c#/GeneralUpdate.Core/Pipelines/PipelineBuilder.cs index 188a412..2753195 100644 --- a/src/c#/GeneralUpdate.Core/Pipelines/PipelineBuilder.cs +++ b/src/c#/GeneralUpdate.Core/Pipelines/PipelineBuilder.cs @@ -37,7 +37,7 @@ namespace GeneralUpdate.Core.Pipelines /// /// /// - public async Task Launch() + public async Task Build() { if (nodes == null || nodes.Count == 0) throw new ArgumentNullException(nameof(nodes)); _components = new MiddlewareStack(nodes); diff --git a/src/c#/GeneralUpdate.Core/Strategys/PlatformWindows/WindowsStrategy.cs b/src/c#/GeneralUpdate.Core/Strategys/PlatformWindows/WindowsStrategy.cs index a04224c..0dcbd25 100644 --- a/src/c#/GeneralUpdate.Core/Strategys/PlatformWindows/WindowsStrategy.cs +++ b/src/c#/GeneralUpdate.Core/Strategys/PlatformWindows/WindowsStrategy.cs @@ -66,7 +66,7 @@ namespace GeneralUpdate.Core.Strategys.PlatformWindows UseMiddlewareIf(Packet.DriveEnabled). UseMiddlewareIf(Packet.WillMessageEnabled). UseMiddleware(); - await pipelineBuilder.Launch(); + await pipelineBuilder.Build(); } } Clear(); -- Gitee From ecdb94adb47dc725bf9f4d4f3b717356f2a522f9 Mon Sep 17 00:00:00 2001 From: Juster Zhu Date: Fri, 22 Dec 2023 00:34:36 +0800 Subject: [PATCH 2/2] Modify the MAUI sample client program to the console sample program --- .../GeneralUpdate.Api.csproj | 2 +- src/c#/GeneralUpdate.Client/App.xaml | 14 - src/c#/GeneralUpdate.Client/App.xaml.cs | 12 - src/c#/GeneralUpdate.Client/AppShell.xaml | 13 - .../GeneralUpdate.Client.csproj | 62 +-- src/c#/GeneralUpdate.Client/MainPage.xaml | 26 -- src/c#/GeneralUpdate.Client/MauiProgram.cs | 22 - .../{MainPage.xaml.cs => MySample.cs} | 39 +- .../Platforms/Android/AndroidManifest.xml | 6 - .../Platforms/Android/MainActivity.cs | 10 - .../Platforms/Android/MainApplication.cs | 16 - .../Android/Resources/values/colors.xml | 6 - .../Platforms/MacCatalyst/AppDelegate.cs | 10 - .../Platforms/MacCatalyst/Info.plist | 30 -- .../Platforms/MacCatalyst/Program.cs | 15 - .../Platforms/Tizen/Main.cs | 17 - .../Platforms/Tizen/tizen-manifest.xml | 15 - .../Platforms/Windows/App.xaml | 7 - .../Platforms/Windows/App.xaml.cs | 22 - .../Platforms/Windows/Package.appxmanifest | 43 -- .../Platforms/Windows/app.manifest | 15 - .../Platforms/iOS/AppDelegate.cs | 10 - .../Platforms/iOS/Info.plist | 32 -- .../Platforms/iOS/Program.cs | 15 - .../{AppShell.xaml.cs => Program.cs} | 8 +- .../Properties/launchSettings.json | 8 - .../Resources/AppIcon/appicon.svg | 4 - .../Resources/AppIcon/appiconfg.svg | 8 - .../Resources/Fonts/OpenSans-Regular.ttf | Bin 107152 -> 0 bytes .../Resources/Fonts/OpenSans-Semibold.ttf | Bin 111048 -> 0 bytes .../Resources/Images/dotnet_bot.svg | 93 ----- .../Resources/Raw/AboutAssets.txt | 15 - .../Resources/Splash/splash.svg | 8 - .../Resources/Styles/Colors.xaml | 43 -- .../Resources/Styles/Styles.xaml | 383 ------------------ .../Platforms/MacCatalyst/AppDelegate.cs | 10 - .../Platforms/MacCatalyst/Info.plist | 30 -- .../Platforms/MacCatalyst/Program.cs | 16 - .../Platforms/Tizen/Main.cs | 17 - .../Platforms/Tizen/tizen-manifest.xml | 15 - .../Platforms/Windows/App.xaml | 8 - .../Platforms/Windows/App.xaml.cs | 24 -- .../Platforms/Windows/Package.appxmanifest | 46 --- .../Platforms/Windows/app.manifest | 15 - .../Platforms/iOS/AppDelegate.cs | 10 - .../Platforms/iOS/Info.plist | 32 -- .../Platforms/iOS/Program.cs | 16 - .../GeneralUpdate.Upgrad.csproj | 2 +- src/c#/GeneralUpdate.sln | 18 +- 49 files changed, 39 insertions(+), 1249 deletions(-) delete mode 100644 src/c#/GeneralUpdate.Client/App.xaml delete mode 100644 src/c#/GeneralUpdate.Client/App.xaml.cs delete mode 100644 src/c#/GeneralUpdate.Client/AppShell.xaml delete mode 100644 src/c#/GeneralUpdate.Client/MainPage.xaml delete mode 100644 src/c#/GeneralUpdate.Client/MauiProgram.cs rename src/c#/GeneralUpdate.Client/{MainPage.xaml.cs => MySample.cs} (89%) delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Android/AndroidManifest.xml delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Android/MainActivity.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Android/MainApplication.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Android/Resources/values/colors.xml delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/MacCatalyst/AppDelegate.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/MacCatalyst/Info.plist delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/MacCatalyst/Program.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Tizen/Main.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Tizen/tizen-manifest.xml delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Windows/App.xaml delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Windows/App.xaml.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Windows/Package.appxmanifest delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/Windows/app.manifest delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/iOS/AppDelegate.cs delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/iOS/Info.plist delete mode 100644 src/c#/GeneralUpdate.Client/Platforms/iOS/Program.cs rename src/c#/GeneralUpdate.Client/{AppShell.xaml.cs => Program.cs} (36%) delete mode 100644 src/c#/GeneralUpdate.Client/Properties/launchSettings.json delete mode 100644 src/c#/GeneralUpdate.Client/Resources/AppIcon/appicon.svg delete mode 100644 src/c#/GeneralUpdate.Client/Resources/AppIcon/appiconfg.svg delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Fonts/OpenSans-Regular.ttf delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Fonts/OpenSans-Semibold.ttf delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Images/dotnet_bot.svg delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Raw/AboutAssets.txt delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Splash/splash.svg delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Styles/Colors.xaml delete mode 100644 src/c#/GeneralUpdate.Client/Resources/Styles/Styles.xaml delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/MacCatalyst/AppDelegate.cs delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/MacCatalyst/Info.plist delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/MacCatalyst/Program.cs delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Tizen/Main.cs delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Tizen/tizen-manifest.xml delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Windows/App.xaml delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Windows/App.xaml.cs delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Windows/Package.appxmanifest delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/Windows/app.manifest delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/iOS/AppDelegate.cs delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/iOS/Info.plist delete mode 100644 src/c#/GeneralUpdate.OSSClient/Platforms/iOS/Program.cs diff --git a/src/c#/GeneralUpdate.Api/GeneralUpdate.Api.csproj b/src/c#/GeneralUpdate.Api/GeneralUpdate.Api.csproj index aeca3fd..fd8c7c4 100644 --- a/src/c#/GeneralUpdate.Api/GeneralUpdate.Api.csproj +++ b/src/c#/GeneralUpdate.Api/GeneralUpdate.Api.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable enable diff --git a/src/c#/GeneralUpdate.Client/App.xaml b/src/c#/GeneralUpdate.Client/App.xaml deleted file mode 100644 index 927dd00..0000000 --- a/src/c#/GeneralUpdate.Client/App.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Client/App.xaml.cs b/src/c#/GeneralUpdate.Client/App.xaml.cs deleted file mode 100644 index 258e289..0000000 --- a/src/c#/GeneralUpdate.Client/App.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace GeneralUpdate.Client -{ - public partial class App : Application - { - public App() - { - InitializeComponent(); - - MainPage = new AppShell(); - } - } -} \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Client/AppShell.xaml b/src/c#/GeneralUpdate.Client/AppShell.xaml deleted file mode 100644 index dde2849..0000000 --- a/src/c#/GeneralUpdate.Client/AppShell.xaml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj b/src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj index 6f527c5..02b2970 100644 --- a/src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj +++ b/src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj @@ -1,56 +1,14 @@  - - net8.0-android - Exe - GeneralUpdate.Client - true - true - enable - - - - - - GeneralUpdate.Client - - - com.companyname.generalupdate.client - 087ae871-7525-4fc1-9f19-bf75ffaf73c6 - - - 1.0 - 1 - - 11.0 - 13.1 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - - - - - - - - - - - - - - - - - - - - - - - + + Exe + net8.0 + enable + enable + + + + + diff --git a/src/c#/GeneralUpdate.Client/MainPage.xaml b/src/c#/GeneralUpdate.Client/MainPage.xaml deleted file mode 100644 index 0d15cea..0000000 --- a/src/c#/GeneralUpdate.Client/MainPage.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -