King_Tech/FastTunnel
King_Tech/FastTunnel
2
0
Fork 0
mirror of https://github.com/FastTunnel/FastTunnel.git synced 2024-09-20 23:48:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

升级依赖

Browse Source
This commit is contained in:
Gui.H 2022-04-25 14:21:39 +08:00
parent 620e24c084
commit f352be9004
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FastTunnel.Api/FastTunnel.Api.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>1.0.1</Version> <Version>1.1.0</Version>
<PackageProjectUrl>https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api</PackageProjectUrl> <PackageProjectUrl>https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api</PackageProjectUrl>
<RepositoryUrl>https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api</RepositoryUrl> <RepositoryUrl>https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api</RepositoryUrl>
</PropertyGroup> </PropertyGroup>
@ -9,8 +9,8 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.15.0" /> <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.17.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
FastTunnel.Client/FastTunnel.Client.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
FastTunnel.Core/FastTunnel.Core.csproj
View File

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFrameworks>net6.0</TargetFrameworks>
<Version>2.0.4</Version> <Version>2.1.0</Version>
<PackageProjectUrl>https://github.com/SpringHgui/FastTunnel</PackageProjectUrl> <PackageProjectUrl>https://github.com/SpringHgui/FastTunnel</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>FastTunnel</Copyright> <Copyright>FastTunnel</Copyright>
@ -20,9 +20,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Yarp.ReverseProxy" Version="1.0.0" /> <PackageReference Include="Yarp.ReverseProxy" Version="1.1.0-rc.1.22211.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

54
FastTunnel.Core/TunnelResource.Designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,12 +13,12 @@ namespace FastTunnel.Core {
/// <summary> /// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc. /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio. // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// To add or remove a member, edit your .ResX file then rerun ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// with the /str option, or rebuild your VS project. // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@ -33,7 +33,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Returns the cached ResourceManager instance used by this class. /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Resources.ResourceManager ResourceManager { public static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Overrides the current thread's CurrentUICulture property for all /// 重写当前线程的 CurrentUICulture 属性，对
/// resource lookups using this strongly typed resource class. /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
public static global::System.Globalization.CultureInfo Culture { public static global::System.Globalization.CultureInfo Culture {
@ -61,7 +61,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to 服务端禁用了Forward. /// 查找类似 服务端禁用了Forward 的本地化字符串。
/// </summary> /// </summary>
public static string ForwardDisabled { public static string ForwardDisabled {
get { get {
@ -70,7 +70,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to 您尚未创建任何隧道，请登录https://suidao.io 创建后重试。. /// 查找类似 您尚未创建任何隧道，请登录https://suidao.io 创建后重试。 的本地化字符串。
/// </summary> /// </summary>
public static string NoTunnel { public static string NoTunnel {
get { get {
@ -79,7 +79,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &lt;!DOCTYPE html&gt; /// 查找类似 &lt;!DOCTYPE html&gt;
///&lt;html lang=&quot;en&quot;&gt; ///&lt;html lang=&quot;en&quot;&gt;
/// ///
///&lt;head&gt; ///&lt;head&gt;
@ -99,7 +99,7 @@ namespace FastTunnel.Core {
/// ///
/// .btn-primary { /// .btn-primary {
/// color: #fff; /// color: #fff;
/// background-color [rest of string was truncated]&quot;;. /// background-color [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Page_HostRequired { public static string Page_HostRequired {
get { get {
@ -108,7 +108,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &lt;!DOCTYPE html&gt; /// 查找类似 &lt;!DOCTYPE html&gt;
///&lt;html lang=&quot;en&quot;&gt; ///&lt;html lang=&quot;en&quot;&gt;
///&lt;head&gt; ///&lt;head&gt;
/// &lt;meta charset=&quot;utf-8&quot; /&gt; /// &lt;meta charset=&quot;utf-8&quot; /&gt;
@ -127,7 +127,7 @@ namespace FastTunnel.Core {
/// ///
/// .btn-primary { /// .btn-primary {
/// color: #fff; /// color: #fff;
/// background-color: [rest of string was truncated]&quot;;. /// background-color: [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Page_NoSite { public static string Page_NoSite {
get { get {
@ -136,7 +136,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &lt;!DOCTYPE html&gt; /// 查找类似 &lt;!DOCTYPE html&gt;
///&lt;html lang=&quot;en&quot;&gt; ///&lt;html lang=&quot;en&quot;&gt;
/// ///
///&lt;head&gt; ///&lt;head&gt;
@ -156,7 +156,7 @@ namespace FastTunnel.Core {
/// ///
/// .btn-primary { /// .btn-primary {
/// color: #fff; /// color: #fff;
/// background-color [rest of string was truncated]&quot;;. /// background-color [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Page_NotAccessIps { public static string Page_NotAccessIps {
get { get {
@ -165,7 +165,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &lt;!DOCTYPE html&gt; /// 查找类似 &lt;!DOCTYPE html&gt;
///&lt;html lang=&quot;en&quot;&gt; ///&lt;html lang=&quot;en&quot;&gt;
/// ///
///&lt;head&gt; ///&lt;head&gt;
@ -185,7 +185,7 @@ namespace FastTunnel.Core {
/// ///
/// .btn-primary { /// .btn-primary {
/// color: #fff; /// color: #fff;
/// background-color [rest of string was truncated]&quot;;. /// background-color [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Page_NotFound { public static string Page_NotFound {
get { get {
@ -194,7 +194,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &lt;!DOCTYPE html&gt; /// 查找类似 &lt;!DOCTYPE html&gt;
///&lt;html lang=&quot;en&quot;&gt; ///&lt;html lang=&quot;en&quot;&gt;
/// ///
///&lt;head&gt; ///&lt;head&gt;
@ -214,7 +214,7 @@ namespace FastTunnel.Core {
/// ///
/// .btn-primary { /// .btn-primary {
/// color: #fff; /// color: #fff;
/// background-color [rest of string was truncated]&quot;;. /// background-color [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Page_Offline { public static string Page_Offline {
get { get {
@ -223,7 +223,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to HTTP/1.1 200 OK /// 查找类似 HTTP/1.1 200 OK
///Date: Sat, 21 Aug 2021 15:14:17 GMT ///Date: Sat, 21 Aug 2021 15:14:17 GMT
///Content-Type: text/html; charset=utf-8 ///Content-Type: text/html; charset=utf-8
///Server: Microsoft-IIS/10.0 ///Server: Microsoft-IIS/10.0
@ -240,7 +240,7 @@ namespace FastTunnel.Core {
/// &lt;link rel=&quot;stylesheet&quot; href=&quot;/css/site.css&quot; /&gt; /// &lt;link rel=&quot;stylesheet&quot; href=&quot;/css/site.css&quot; /&gt;
///&lt;/head&gt; ///&lt;/head&gt;
///&lt;body&gt; ///&lt;body&gt;
/// &lt;head [rest of string was truncated]&quot;;. /// &lt;head [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary> /// </summary>
public static string Test { public static string Test {
get { get {
@ -249,7 +249,7 @@ namespace FastTunnel.Core {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to \n=====隧道已建立成功，现在可以通过以下方式访问您的内网服务了=====\n{0}\n. /// 查找类似 \n=====隧道已建立成功，现在可以通过以下方式访问您的内网服务了=====\n{0}\n 的本地化字符串。
/// </summary> /// </summary>
public static string TunnelLlist { public static string TunnelLlist {
get { get {

18
FastTunnel.Server/FastTunnel.Server.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>DEBUG</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
@ -18,17 +18,17 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-preview.3.22175.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Debug'"> <ItemGroup Condition="'$(Configuration)'=='Debug'">
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" /> <ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" />