downgrade to .net 6.0 fix trimmed problem

tmoonlight · Aug 18, 2024 · fbe8013 · fbe8013
1 parent adcbbdb
commit fbe8013
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 27 deletions.
diff --git a/src/NSmartProxy.ClientRouter/NSmartProxy.ClientRouter.csproj b/src/NSmartProxy.ClientRouter/NSmartProxy.ClientRouter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NSmartProxy.Data/NSmartProxy.Data.csproj b/src/NSmartProxy.Data/NSmartProxy.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NSmartProxy.Infrastructure/NSmartProxy.Infrastructure.csproj b/src/NSmartProxy.Infrastructure/NSmartProxy.Infrastructure.csproj
@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyCompressor.Snappier" Version="2.0.2" />
     <PackageReference Include="NewtonSoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />

diff --git a/src/NSmartProxy.Infrastructure/Shared/NSPVersion.cs b/src/NSmartProxy.Infrastructure/Shared/NSPVersion.cs
@@ -2,6 +2,6 @@
 public sealed class NSPVersion
 {
         public const string NO_TOKEN_STRING = "notoken";
-        public const string NSmartProxyClientName = "NSmartProxy Client v1.3.7231.7118";
-        public const string NSmartProxyServerName = "NSmartProxy Server v1.3.7231.7118";
+        public const string NSmartProxyClientName = "NSmartProxy Client v1.4.8596.1967";
+        public const string NSmartProxyServerName = "NSmartProxy Server v1.4.8596.1967";
 }
diff --git a/src/NSmartProxy.Infrastructure/Shared/NSPVersion.tt b/src/NSmartProxy.Infrastructure/Shared/NSPVersion.tt
@@ -11,6 +11,6 @@
 public sealed class NSPVersion
 {
         public const string NO_TOKEN_STRING = "notoken";
-        public const string NSmartProxyClientName = "NSmartProxy Client v1.3.<#=v1#>.<#=v2#>";
-        public const string NSmartProxyServerName = "NSmartProxy Server v1.3.<#=v1#>.<#=v2#>";
+        public const string NSmartProxyClientName = "NSmartProxy Client v1.4.<#=v1#>.<#=v2#>";
+        public const string NSmartProxyServerName = "NSmartProxy Server v1.4.<#=v1#>.<#=v2#>";
 }
diff --git a/src/NSmartProxy.Infrastructure/StringUtil.cs b/src/NSmartProxy.Infrastructure/StringUtil.cs
@@ -7,7 +7,6 @@
 using System.Text;
 using NSmartProxy.Data;
 using NSmartProxy.Infrastructure;
-using EasyCompressor;
 using System.Threading;
 using System.Threading.Tasks;
 using Snappy.Sharp;
@@ -16,10 +15,6 @@ namespace NSmartProxy
 {
     public static class StringUtil
     {
-        //Lazy初始化一个snappier
-        private static Lazy<SnappierCompressor> _snappyCompressor = new Lazy<SnappierCompressor>(() => SnappierCompressor.Shared);
-
-
         /// <summary>
         /// 整型转双字节
         /// </summary>

diff --git a/src/NSmartProxy.ServerHost/Dockerfile b/src/NSmartProxy.ServerHost/Dockerfile
@@ -16,7 +16,7 @@
 #ENTRYPOINT ["dotnet", "NSmartProxy.ServerHost.dll"]
 
 #need combile 1st.
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS runtime
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime
 WORKDIR /app
 COPY / /app/
 EXPOSE 12300-22300

diff --git a/src/NSmartProxy.ServerHost/NSmartProxy.ServerHost.csproj b/src/NSmartProxy.ServerHost/NSmartProxy.ServerHost.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <PublishTrimmed>True</PublishTrimmed>
+    <TargetFramework>net6.0</TargetFramework>
+
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NSmartProxy/NSmartProxy.csproj b/src/NSmartProxy/NSmartProxy.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>

diff --git a/src/NSmartProxyClient/Dockerfile b/src/NSmartProxyClient/Dockerfile
@@ -1,6 +1,6 @@
 
 #need combile 1st.
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS runtime
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS runtime
 WORKDIR /app
 COPY / /app/
 ENTRYPOINT ["dotnet", "NSmartProxyClient.dll"]
diff --git a/src/NSmartProxyClient/NSmartProxyClient.csproj b/src/NSmartProxyClient/NSmartProxyClient.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <PublishTrimmed>True</PublishTrimmed>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,6 +19,7 @@
     <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="PeterKottas.DotNetCore.WindowsService" Version="2.0.12" />
+
 
   </ItemGroup>
 

diff --git a/src/TestBed/NSmartProxy.ConsoleTest/NSmartProxy.ConsoleTest.csproj b/src/TestBed/NSmartProxy.ConsoleTest/NSmartProxy.ConsoleTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/build.cmd b/src/build.cmd
@@ -1,12 +1,12 @@
 rem windows only
-rem NSP v1.4.0
+rem NSP v1.4.1
 @ECHO on
 
-set Ver=v1.4.0
+set Ver=v1.4.1
 set BuildPath=%~dp0../build
 
-set nsp_client_path=%BuildPath%/nspclient_%Ver%
-set nsp_server_path=%BuildPath%/nspserver_%Ver%
+set nsp_client_path=%BuildPath%/nspclient_unity_%Ver%
+set nsp_server_path=%BuildPath%/nspserver_unity_%Ver%
 
 set nsp_client_scd_linux_path=%BuildPath%/nspclient_scd_linux_%Ver%
 set nsp_client_scd_win_path=%BuildPath%/nspclient_scd_win_x86_%Ver%
@@ -25,10 +25,10 @@ set nsp_client_winfform_path=%BuildPath%/nspclient_winform_%Ver%
 
 rem del %~dp0/../build/*.*
 rem NSPClient
-dotnet publish .\NSmartProxyClient\NSmartProxyClient.csproj -c release -o %nsp_client_path%
+dotnet publish .\NSmartProxyClient\NSmartProxyClient.csproj -c release -o %nsp_client_path%  /p:PublishTrimmed=false
 
 rem NSPServer
-dotnet publish .\NSmartProxy.ServerHost\NSmartProxy.ServerHost.csproj -c release -o %nsp_server_path%
+dotnet publish .\NSmartProxy.ServerHost\NSmartProxy.ServerHost.csproj -c release -o %nsp_server_path%  /p:PublishTrimmed=false
 
 rem NSPClient_SCD
 dotnet publish .\NSmartProxyClient\NSmartProxyClient.csproj -r linux-x64 -c Release /p:PublishSingleFile=true   -o %nsp_client_scd_linux_path%