Skip to content

Commit

Permalink
升级Remoting
Browse files Browse the repository at this point in the history
  • Loading branch information
nnhy committed Jul 28, 2024
1 parent 07f5a08 commit d25440a
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Plugins/MySqlAgent/MySqlAgent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.14.2024.710-beta0410" />
<PackageReference Include="NewLife.XCode" Version="11.14.2024.727-beta1047" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/TestA/TestA.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Samples/TestB/TestB.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Stardust.Data/Stardust.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.14.2024.710-beta0410" />
<PackageReference Include="NewLife.XCode" Version="11.14.2024.727-beta1047" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Stardust.Server/Stardust.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<ItemGroup>
<PackageReference Include="NewLife.IP" Version="2.1.2024.407" />
<PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.710-beta1226" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.728-beta0156" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Stardust.Web/Stardust.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.710-beta0954" />
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.727-beta0301" />
<PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.710-beta1226" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.728-beta0156" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions Stardust/StarHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public static StarFactory AddStardust(this IObjectContainer services, String? se
return star;
}

#if NET40
/// <summary>安全退出进程,目标进程还有机会执行退出代码</summary>
/// <param name="process"></param>
/// <param name="times"></param>
Expand Down Expand Up @@ -139,6 +140,7 @@ public static Boolean GetHasExited(this Process process)
// return false;
//}
}
#endif

private static ICache _cache = new MemoryCache();
/// <summary>获取进程名。dotnet/java进程取文件名</summary>
Expand Down
4 changes: 2 additions & 2 deletions Stardust/Stardust.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewLife.Remoting" Version="3.0.2024.717-beta0605" />
<PackageReference Include="NewLife.Remoting" Version="3.0.2024.728-beta0156" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net40'">
<PackageReference Include="NewLife.Core" Version="10.10.2024.0718-beta0517" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.0723-beta1414" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="NewLife.Core" Version="10.10.2024.0701-net40" />
Expand Down
2 changes: 1 addition & 1 deletion Test/Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.718-beta0517" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
</ItemGroup>

Expand Down

0 comments on commit d25440a

Please sign in to comment.