修改发布脚本

This commit is contained in:
Gui.H 2022-06-30 14:59:47 +08:00
parent 3a3712aae9
commit dc7311ca3c
6 changed files with 44 additions and 53 deletions

View File

@ -16,5 +16,4 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" /> <ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,36 +1,36 @@
<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="7.0.0-preview.3.22175.4" /> <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.Extensions.Hosting" Version="5.0.0-dev-00095" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.2-dev-00890" /> <PackageReference Include="Serilog.Sinks.Console" Version="4.0.2-dev-00890" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" /> <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" /> <ProjectReference Include="..\FastTunnel.Core\FastTunnel.Core.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="appsettings.json"> <None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="install.bat"> <None Update="install.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="uninstall.bat"> <None Update="uninstall.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties appsettings_1json__JsonSchema="" /> <UserProperties appsettings_1json__JsonSchema="" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks> <TargetFrameworks>net6.0</TargetFrameworks>
<Version>2.1.0</Version> <Version>2.1.1</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>

View File

@ -1,13 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>DEBUG</DefineConstants>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
rm -rf publish/*
projects=("FastTunnel.Client" "FastTunnel.Server") 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 for project in ${projects[*]}; do
echo echo
echo "=========开始发布:${project} =========" echo "=========开始发布:${project} ========="
@ -9,12 +8,14 @@ for project in ${projects[*]}; do
for plate in ${plates[*]}; do for plate in ${plates[*]}; do
echo "plate=${plate}" echo "plate=${plate}"
echo src/$project/$project.csproj 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 "=========开始打包 =========" 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 ../ cd ../
# rm -rf publish/$project.$plate # rm -rf publish/$project.$plate
done done
done done

View File

@ -1,20 +1,17 @@
#!/bin/bash #!/bin/bash
rm -rf publish/* rm -rf publish/*
projects=("FastTunnel.Client" "FastTunnel.Server") 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 for project in ${projects[*]}; do
echo echo
echo "=========开始发布:${project} =========" echo "=========开始发布:${project} ========="
echo echo
for plate in ${plates[*]}; do rm -rf publish/$project/*
echo "plate=${plate}" echo src/$project/$project.csproj
echo src/$project/$project.csproj dotnet publish $project/$project.csproj -o=publish/$project -c=release --nologo
dotnet publish $project/$project.csproj -o=publish/$project.$plate -r=$plate -c=release --nologo #-p:PublishTrimmed=true echo
echo echo "=========开始打包 ========="
echo "=========开始打包 =========" echo
echo cd publish && tar -zcvf $project.tar.gz $project
cd publish && tar -zcvf $project.$plate.tar.gz $project.$plate cd ../
cd ../
# rm -rf publish/$project.$plate
done
done done