From 76cc6933a9eef1128cccf1e2a16c4b69a22d6c53 Mon Sep 17 00:00:00 2001
From: "Gui.H" <springhgui@outlook.com>
Date: Wed, 11 May 2022 11:06:05 +0800
Subject: [PATCH] 1

---
 Dockerfile                                 |  2 +-
 FastTunnel.Server/FastTunnel.Server.csproj | 73 ++++++++++------------
 FastTunnel.sln                             |  1 +
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1fe6f53..08b6316 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ EXPOSE 443
 FROM mcr.microsoft.com/dotnet/sdk:6.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/"]
+COPY ["FastTunnel.Hosting/FastTunnel.Hosting.csproj", "FastTunnel.Hosting/"]
 RUN dotnet restore "FastTunnel.Server/FastTunnel.Server.csproj"
 COPY . .
 WORKDIR "/src/FastTunnel.Server"
diff --git a/FastTunnel.Server/FastTunnel.Server.csproj b/FastTunnel.Server/FastTunnel.Server.csproj
index d5604be..2ebe337 100644
--- a/FastTunnel.Server/FastTunnel.Server.csproj
+++ b/FastTunnel.Server/FastTunnel.Server.csproj
@@ -1,46 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+  </PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<DefineConstants>DEBUG</DefineConstants>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="logs\**" />
+    <Content Remove="logs\**" />
+    <EmbeddedResource Remove="logs\**" />
+    <None Remove="logs\**" />
+  </ItemGroup>
 
-	<PropertyGroup>
-		<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
-	</PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="FastTunnelConnectionMiddleware.cs" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<Compile Remove="logs\**" />
-		<Content Remove="logs\**" />
-		<EmbeddedResource Remove="logs\**" />
-		<None Remove="logs\**" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22175.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-preview.3.22175.4" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+  </ItemGroup>
 
-	<ItemGroup>
-	  <Compile Remove="FastTunnelConnectionMiddleware.cs" />
-	</ItemGroup>
+  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" />
+    <ProjectReference Include="..\FastTunnel.Hosting\FastTunnel.Hosting.csproj" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.3.22175.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0-preview.3.22175.4" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
-		<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(Configuration)'=='Debug'">
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\FastTunnel.Api\FastTunnel.Api.csproj" />
-		<ProjectReference Include="..\FastTunnel.Hosting\FastTunnel.Hosting.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Update="uninstall.bat">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
+  <ItemGroup>
+    <None Update="uninstall.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/FastTunnel.sln b/FastTunnel.sln
index 4dcbf63..ce45a58 100644
--- a/FastTunnel.sln
+++ b/FastTunnel.sln
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
+		Dockerfile = Dockerfile
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 	EndProjectSection
 EndProject