diff --git a/MDriveSync.sln b/MDriveSync.sln index 9e0047b..be40cef 100644 --- a/MDriveSync.sln +++ b/MDriveSync.sln @@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3CE27DBE EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MDriveSync.Client.WinFormAPI", "src\MDriveSync.Client.WinFormAPI\MDriveSync.Client.WinFormAPI.csproj", "{585E1ED7-B1D9-4EEE-AF65-32853A05FA9E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MDriveSync.Client.App", "src\MDriveSync.Client.App\MDriveSync.Client.App.csproj", "{F648E4A2-E525-426F-A12C-F9ADAF8E211D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -67,6 +69,10 @@ Global {585E1ED7-B1D9-4EEE-AF65-32853A05FA9E}.Debug|Any CPU.Build.0 = Debug|Any CPU {585E1ED7-B1D9-4EEE-AF65-32853A05FA9E}.Release|Any CPU.ActiveCfg = Release|Any CPU {585E1ED7-B1D9-4EEE-AF65-32853A05FA9E}.Release|Any CPU.Build.0 = Release|Any CPU + {F648E4A2-E525-426F-A12C-F9ADAF8E211D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F648E4A2-E525-426F-A12C-F9ADAF8E211D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F648E4A2-E525-426F-A12C-F9ADAF8E211D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F648E4A2-E525-426F-A12C-F9ADAF8E211D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/MDriveSync.Client.API/MDriveSync.Client.API.csproj b/src/MDriveSync.Client.API/MDriveSync.Client.API.csproj index 1498eba..49554d2 100644 --- a/src/MDriveSync.Client.API/MDriveSync.Client.API.csproj +++ b/src/MDriveSync.Client.API/MDriveSync.Client.API.csproj @@ -15,6 +15,7 @@ + diff --git a/src/MDriveSync.Client.API/Program.cs b/src/MDriveSync.Client.API/Program.cs index 27c7521..58f3f23 100644 --- a/src/MDriveSync.Client.API/Program.cs +++ b/src/MDriveSync.Client.API/Program.cs @@ -1,3 +1,4 @@ +using MDriveSync.Client.App; using MDriveSync.Infrastructure; using Quartz.Logging; using Serilog; diff --git a/src/MDriveSync.Client.API/Controllers/AliyunStorageController.cs b/src/MDriveSync.Client.App/Controllers/AliyunStorageController.cs similarity index 99% rename from src/MDriveSync.Client.API/Controllers/AliyunStorageController.cs rename to src/MDriveSync.Client.App/Controllers/AliyunStorageController.cs index 40997e8..5d1b9bc 100644 --- a/src/MDriveSync.Client.API/Controllers/AliyunStorageController.cs +++ b/src/MDriveSync.Client.App/Controllers/AliyunStorageController.cs @@ -6,12 +6,13 @@ using MDriveSync.Core.ViewModels; using MDriveSync.Infrastructure; using MDriveSync.Security; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; using Newtonsoft.Json; using System.Text; -namespace MDriveSync.Client.API.Controllers +namespace MDriveSync.Client.App.Controllers { /// /// 阿里云盘存储控制器 diff --git a/src/MDriveSync.Client.API/Controllers/LocalStorageController.cs b/src/MDriveSync.Client.App/Controllers/LocalStorageController.cs similarity index 99% rename from src/MDriveSync.Client.API/Controllers/LocalStorageController.cs rename to src/MDriveSync.Client.App/Controllers/LocalStorageController.cs index b3983ee..2bd26e0 100644 --- a/src/MDriveSync.Client.API/Controllers/LocalStorageController.cs +++ b/src/MDriveSync.Client.App/Controllers/LocalStorageController.cs @@ -5,7 +5,7 @@ using MDriveSync.Infrastructure; using Microsoft.AspNetCore.Mvc; -namespace MDriveSync.Client.API.Controllers +namespace MDriveSync.Client.App.Controllers { /// /// 本地存储控制器 diff --git a/src/MDriveSync.Client.App/MDriveSync.Client.App.csproj b/src/MDriveSync.Client.App/MDriveSync.Client.App.csproj new file mode 100644 index 0000000..646a3ca --- /dev/null +++ b/src/MDriveSync.Client.App/MDriveSync.Client.App.csproj @@ -0,0 +1,12 @@ + + + + net8.0 + enable + + + + + + + diff --git a/src/MDriveSync.Client.API/Startup.cs b/src/MDriveSync.Client.App/Startup.cs similarity index 94% rename from src/MDriveSync.Client.API/Startup.cs rename to src/MDriveSync.Client.App/Startup.cs index 8cd0f16..2273cff 100644 --- a/src/MDriveSync.Client.API/Startup.cs +++ b/src/MDriveSync.Client.App/Startup.cs @@ -4,10 +4,14 @@ using MDriveSync.Core.Filters; using MDriveSync.Core.Middlewares; using MDriveSync.Infrastructure; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Serilog; -namespace MDriveSync.Client.API +namespace MDriveSync.Client.App { public class Startup { @@ -49,7 +53,7 @@ public void ConfigureServices(IServiceCollection services) services.AddHostedService(provider => provider.GetRequiredService()); } - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { diff --git a/src/MDriveSync.Client.WinFormAPI/MDriveSync.Client.WinFormAPI.csproj b/src/MDriveSync.Client.WinFormAPI/MDriveSync.Client.WinFormAPI.csproj index 14739b8..3a27eae 100644 --- a/src/MDriveSync.Client.WinFormAPI/MDriveSync.Client.WinFormAPI.csproj +++ b/src/MDriveSync.Client.WinFormAPI/MDriveSync.Client.WinFormAPI.csproj @@ -5,6 +5,9 @@ net8.0-windows true enable + zh + true + true @@ -12,15 +15,11 @@ - - - - - - Always - Always + + + true @@ -28,15 +27,23 @@ wwwroot\%(RecursiveDir)%(Filename)%(Extension) PreserveNewest + PreserveNewest + + + true - + + + + + - + \ No newline at end of file diff --git a/src/MDriveSync.Client.WinFormAPI/Program.cs b/src/MDriveSync.Client.WinFormAPI/Program.cs index e907a04..fd29cb3 100644 --- a/src/MDriveSync.Client.WinFormAPI/Program.cs +++ b/src/MDriveSync.Client.WinFormAPI/Program.cs @@ -39,7 +39,7 @@ public static IHostBuilder CreateHostBuilder() => }) .ConfigureWebHostDefaults(webBuilder => { - webBuilder.UseStartup(); + webBuilder.UseStartup(); }) .UseSerilog((context, services, configuration) => { diff --git a/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x64.pubxml b/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x64.pubxml new file mode 100644 index 0000000..a8b90ce --- /dev/null +++ b/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x64.pubxml @@ -0,0 +1,18 @@ + + + + + Release + Any CPU + bin\Release\net8.0-windows\publish\win-x64\ + FileSystem + <_TargetId>Folder + net8.0-windows + true + win-x64 + true + false + + diff --git a/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x86.pubxml b/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x86.pubxml new file mode 100644 index 0000000..dd610f4 --- /dev/null +++ b/src/MDriveSync.Client.WinFormAPI/Properties/PublishProfiles/Client.Publish.SelfContained.win.gui.x86.pubxml @@ -0,0 +1,18 @@ + + + + + Release + Any CPU + bin\Release\net8.0-windows\publish\win-x86\ + FileSystem + <_TargetId>Folder + net8.0-windows + true + win-x86 + true + false + + \ No newline at end of file