From dc7311ca3c9bf0b91d34478c0eb0318ca38ced3f Mon Sep 17 00:00:00 2001
From: "Gui.H" <springhgui@outlook.com>
Date: Thu, 30 Jun 2022 14:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FastTunnel.Api/FastTunnel.Api.csproj        |  1 -
 FastTunnel.Client/FastTunnel.Client.csproj  | 58 ++++++++++-----------
 FastTunnel.Core/FastTunnel.Core.csproj      |  2 +-
 FastTunnel.Server/FastTunnel.Server.csproj  |  6 ---
 publish-win.sh => publish-self-contained.sh |  9 ++--
 publish.sh                                  | 21 ++++----
 6 files changed, 44 insertions(+), 53 deletions(-)
 rename publish-win.sh => publish-self-contained.sh (70%)

diff --git a/FastTunnel.Api/FastTunnel.Api.csproj b/FastTunnel.Api/FastTunnel.Api.csproj
index b1b5bb0..5101981 100644
--- a/FastTunnel.Api/FastTunnel.Api.csproj
+++ b/FastTunnel.Api/FastTunnel.Api.csproj
@@ -16,5 +16,4 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" />
 	</ItemGroup>
-
 </Project>
diff --git a/FastTunnel.Client/FastTunnel.Client.csproj b/FastTunnel.Client/FastTunnel.Client.csproj
index d05c4df..60cbf9d 100644
--- a/FastTunnel.Client/FastTunnel.Client.csproj
+++ b/FastTunnel.Client/FastTunnel.Client.csproj
@@ -1,36 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<OutputType>Exe</OutputType>
-	</PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
-		<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.0-dev-00095" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.2-dev-00890" />
-		<PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0-preview.3.22175.4" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.0-dev-00095" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.2-dev-00890" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<None Update="appsettings.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="install.bat">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="uninstall.bat">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="install.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="uninstall.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-	<ProjectExtensions>
-		<VisualStudio>
-			<UserProperties appsettings_1json__JsonSchema="" />
-		</VisualStudio>
-	</ProjectExtensions>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties appsettings_1json__JsonSchema="" />
+    </VisualStudio>
+  </ProjectExtensions>
 
 </Project>
diff --git a/FastTunnel.Core/FastTunnel.Core.csproj b/FastTunnel.Core/FastTunnel.Core.csproj
index c232960..4cc8ab3 100644
--- a/FastTunnel.Core/FastTunnel.Core.csproj
+++ b/FastTunnel.Core/FastTunnel.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>2.1.0</Version>
+    <Version>2.1.1</Version>
     <PackageProjectUrl>https://github.com/SpringHgui/FastTunnel</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>FastTunnel</Copyright>
diff --git a/FastTunnel.Server/FastTunnel.Server.csproj b/FastTunnel.Server/FastTunnel.Server.csproj
index 9452eb2..b9a2a58 100644
--- a/FastTunnel.Server/FastTunnel.Server.csproj
+++ b/FastTunnel.Server/FastTunnel.Server.csproj
@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>DEBUG</DefineConstants>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/publish-win.sh b/publish-self-contained.sh
similarity index 70%
rename from publish-win.sh
rename to publish-self-contained.sh
index bd2044c..68fb517 100644
--- a/publish-win.sh
+++ b/publish-self-contained.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-rm -rf publish/*
 projects=("FastTunnel.Client" "FastTunnel.Server")
-plates=("win-x64")
+plates=("win-x64" "win-x86" "win-arm" "win-arm64" "linux-x64" "linux-musl-x64" "linux-arm" "linux-arm64" "osx-x64")
 for project in ${projects[*]}; do
     echo
     echo "=========开始发布：${project} ========="
@@ -9,12 +8,14 @@ for project in ${projects[*]}; do
     for plate in ${plates[*]}; do
         echo "plate=${plate}"
         echo src/$project/$project.csproj
-        dotnet publish $project/$project.csproj -o=publish/$project.$plate -c=release || exit 1 #-p:PublishTrimmed=true --nologo
+        rm -rf publish/$project.$plate/*
+        dotnet publish $project/$project.csproj -o=publish/$project.$plate -r=$plate -c=release --nologo  #-p:PublishTrimmed=true
         echo
         echo "=========开始打包 ========="
         echo
-        cd publish && tar -zcvf $project.$plate.tar.gz $project.$plate || exit 1 
+        cd publish && tar -zcvf $project.$plate.tar.gz $project.$plate
         cd ../
         # rm -rf publish/$project.$plate
     done
 done
+
diff --git a/publish.sh b/publish.sh
index 36fe228..bf87211 100644
--- a/publish.sh
+++ b/publish.sh
@@ -1,20 +1,17 @@
 #!/bin/bash
 rm -rf publish/*
 projects=("FastTunnel.Client" "FastTunnel.Server")
-plates=("win-x64" "win-x86" "win-arm" "win-arm64" "linux-x64" "linux-musl-x64" "linux-arm" "linux-arm64" "osx-x64")
+
 for project in ${projects[*]}; do
     echo
     echo "=========开始发布：${project} ========="
     echo
-    for plate in ${plates[*]}; do
-        echo "plate=${plate}"
-        echo src/$project/$project.csproj
-        dotnet publish $project/$project.csproj -o=publish/$project.$plate -r=$plate -c=release --nologo  #-p:PublishTrimmed=true
-        echo
-        echo "=========开始打包 ========="
-        echo
-        cd publish && tar -zcvf $project.$plate.tar.gz $project.$plate
-        cd ../
-        # rm -rf publish/$project.$plate
-    done
+    rm -rf publish/$project/*
+    echo src/$project/$project.csproj
+    dotnet publish $project/$project.csproj -o=publish/$project -c=release --nologo
+    echo
+    echo "=========开始打包 ========="
+    echo
+    cd publish && tar -zcvf $project.tar.gz $project
+    cd ../
 done