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 @@
-
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 @@
-
- net6.0
- Exe
-
+
+ net6.0
+ Exe
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
- Always
-
-
- Always
-
-
- Always
-
-
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
-
-
-
-
-
+
+
+
+
+
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 @@
net6.0
- 2.1.0
+ 2.1.1
https://github.com/SpringHgui/FastTunnel
MIT
FastTunnel
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 @@
-
- DEBUG
- enable
-
-
net6.0
- false
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