From cfaaf10295e09dfa4024f716b814b9c7f343c687 Mon Sep 17 00:00:00 2001
From: springhgui <740360381@qq.com>
Date: Sun, 14 Nov 2021 22:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Directory.Build.props | 6 --
Dockerfile | 1 +
FastTunnel.Api/FastTunnel.Api.csproj | 28 +++---
FastTunnel.Client/FastTunnel.Client.csproj | 59 ++++++-------
FastTunnel.Core/FastTunnel.Core.csproj | 99 +++++++++++-----------
FastTunnel.Server/FastTunnel.Server.csproj | 76 +++++++++--------
6 files changed, 135 insertions(+), 134 deletions(-)
delete mode 100644 Directory.Build.props
diff --git a/Directory.Build.props b/Directory.Build.props
deleted file mode 100644
index 84dcf61..0000000
--- a/Directory.Build.props
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- enable
- net5.0
-
-
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 52742e7..6206565 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
WORKDIR /src
COPY ["FastTunnel.Server/FastTunnel.Server.csproj", "FastTunnel.Server/"]
COPY ["FastTunnel.Core/FastTunnel.Core.csproj", "FastTunnel.Core/"]
+COPY ["FastTunnel.Api/FastTunnel.Api.csproj", "FastTunnel.Api/"]
RUN dotnet restore "FastTunnel.Server/FastTunnel.Server.csproj"
COPY . .
WORKDIR "/src/FastTunnel.Server"
diff --git a/FastTunnel.Api/FastTunnel.Api.csproj b/FastTunnel.Api/FastTunnel.Api.csproj
index cbebee6..2eebd58 100644
--- a/FastTunnel.Api/FastTunnel.Api.csproj
+++ b/FastTunnel.Api/FastTunnel.Api.csproj
@@ -1,19 +1,19 @@
+
+ net5.0
+ 1.0.1
+ https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api
+ https://github.com/FastTunnel/FastTunnel/tree/v2/FastTunnel.Api
+
-
- 1.0.1
- 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 737c978..d1372f0 100644
--- a/FastTunnel.Client/FastTunnel.Client.csproj
+++ b/FastTunnel.Client/FastTunnel.Client.csproj
@@ -1,36 +1,37 @@
-
- Exe
-
+
+ net5.0
+ Exe
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
-
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/FastTunnel.Core/FastTunnel.Core.csproj b/FastTunnel.Core/FastTunnel.Core.csproj
index 46a9a14..ab55505 100644
--- a/FastTunnel.Core/FastTunnel.Core.csproj
+++ b/FastTunnel.Core/FastTunnel.Core.csproj
@@ -1,57 +1,58 @@
-
- 2.0.4
- https://github.com/SpringHgui/FastTunnel
- MIT
- FastTunnel
- expose a local server behind a NAT or firewall to the internet like ngrok and frp
- SpringHgui
- FastTunnel
- FastTunnel
- false
- true
- https://github.com/SpringHgui/FastTunnel
- git
- FastTunnel.Core
- FastTunnel.Core
-
+
+ net5.0
+ 2.0.4
+ https://github.com/SpringHgui/FastTunnel
+ MIT
+ FastTunnel
+ expose a local server behind a NAT or firewall to the internet like ngrok and frp
+ SpringHgui
+ FastTunnel
+ FastTunnel
+ false
+ true
+ https://github.com/SpringHgui/FastTunnel
+ git
+ FastTunnel.Core
+ FastTunnel.Core
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
- True
- True
- TunnelResource.resx
-
-
+
+
+ True
+ True
+ TunnelResource.resx
+
+
-
-
- PublicResXFileCodeGenerator
- TunnelResource.Designer.cs
-
-
+
+
+ PublicResXFileCodeGenerator
+ TunnelResource.Designer.cs
+
+
diff --git a/FastTunnel.Server/FastTunnel.Server.csproj b/FastTunnel.Server/FastTunnel.Server.csproj
index b437374..2b60405 100644
--- a/FastTunnel.Server/FastTunnel.Server.csproj
+++ b/FastTunnel.Server/FastTunnel.Server.csproj
@@ -1,44 +1,48 @@
-
- DEBUG
- enable
-
+
+ DEBUG
+ enable
+
-
- false
-
+
+ net5.0
+ false
+ 421d8d0d-f934-45e6-9858-780312446b3b
+ Linux
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
- Always
-
-
- Always
-
-
+
+
+ Always
+
+
+ Always
+
+