diff --git a/FastTunnel.Api/FastTunnel.Api.csproj b/FastTunnel.Api/FastTunnel.Api.csproj index b59cfa9..827c384 100644 --- a/FastTunnel.Api/FastTunnel.Api.csproj +++ b/FastTunnel.Api/FastTunnel.Api.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 1.1.0 https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api diff --git a/FastTunnel.Client/FastTunnel.Client.csproj b/FastTunnel.Client/FastTunnel.Client.csproj index 71f2df0..0b2ddf2 100644 --- a/FastTunnel.Client/FastTunnel.Client.csproj +++ b/FastTunnel.Client/FastTunnel.Client.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 Exe diff --git a/FastTunnel.Core/FastTunnel.Core.csproj b/FastTunnel.Core/FastTunnel.Core.csproj index edbc1a6..0da9f0e 100644 --- a/FastTunnel.Core/FastTunnel.Core.csproj +++ b/FastTunnel.Core/FastTunnel.Core.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 2.1.1 https://github.com/SpringHgui/FastTunnel MIT @@ -17,6 +17,7 @@ FastTunnel.Core true FastTunnel.Core + Preview diff --git a/FastTunnel.Server/FastTunnel.Server.csproj b/FastTunnel.Server/FastTunnel.Server.csproj index c7bd9ba..b5935ff 100644 --- a/FastTunnel.Server/FastTunnel.Server.csproj +++ b/FastTunnel.Server/FastTunnel.Server.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/FastTunnel.Server/Program.cs b/FastTunnel.Server/Program.cs index 8a5c61a..ce41f81 100644 --- a/FastTunnel.Server/Program.cs +++ b/FastTunnel.Server/Program.cs @@ -19,8 +19,9 @@ public class Program CreateHostBuilder(args).Build().Run(); } - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) + public static IHostBuilder CreateHostBuilder(string[] args) + { + return Host.CreateDefaultBuilder(args) .UseSerilog((context, services, configuration) => configuration .ReadFrom.Configuration(context.Configuration) .ReadFrom.Services(services) @@ -43,4 +44,5 @@ public class Program { webBuilder.UseStartup(); }); + } } diff --git a/FastTunnel.Server/Properties/launchSettings.json b/FastTunnel.Server/Properties/launchSettings.json index 33355cb..86dc5a8 100644 --- a/FastTunnel.Server/Properties/launchSettings.json +++ b/FastTunnel.Server/Properties/launchSettings.json @@ -13,24 +13,10 @@ "commandName": "Project", "launchBrowser": true, "launchUrl": "http://localhost:1270/swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - //"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "FastTunnel.Api;FastTunnel.Core" - }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" - }, - "IIS Express": { - "commandName": "IISExpress", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Docker": { - "commandName": "Docker", - "launchBrowser": true, - "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", - "publishAllPorts": true, - "useSSL": true + }, + "applicationUrl": "http://localhost:1270" } } }