Skip to content

Commit

Permalink
[fix]升级核心库,解决对GetProcessName2的依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
nnhy committed Aug 29, 2024
1 parent 6355e23 commit f6478eb
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 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.15.2024.809-beta0608" />
<PackageReference Include="NewLife.XCode" Version="11.15.2024.826-beta0849" />
</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.803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.825-beta0722" />
</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.803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.825-beta0722" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions StarAgent/StarAgent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="10.9.2024.801" />
<PackageReference Include="NewLife.Remoting" Version="3.0.2024.806-beta0146" />
<PackageReference Include="NewLife.Agent" Version="10.9.2024.811-beta0602" />
<PackageReference Include="NewLife.Remoting" Version="3.0.2024.812-beta0813" />
</ItemGroup>

<ItemGroup>
Expand All @@ -52,43 +52,43 @@

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="NewLife.Core">
<Version>10.10.2024.809-beta0600</Version>
<Version>10.10.2024.825-beta0722</Version>
</PackageReference>
</ItemGroup>

Expand Down
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.15.2024.809-beta0608" />
<PackageReference Include="NewLife.XCode" Version="11.15.2024.826-beta0849" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="NewLife.IP" Version="2.2.2024.810" />
<PackageReference Include="NewLife.IP" Version="2.2.2024.824-beta0205" />
<PackageReference Include="NewLife.Redis" Version="5.7.2024.801" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.805" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.812-beta0813" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.815" />
<PackageReference Include="NewLife.IP" Version="2.2.2024.810" />
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.826-beta0721" />
<PackageReference Include="NewLife.IP" Version="2.2.2024.824-beta0205" />
<PackageReference Include="NewLife.Redis" Version="5.7.2024.801" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.805" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.0.2024.812-beta0813" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Stardust/Models/AppInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public AppInfo(Process process)
try
{
Id = process.Id;
Name = process.GetProcessName2();
Name = process.GetProcessName();
//StartTime = process.StartTime;
//ProcessorTime = (Int64)process.TotalProcessorTime.TotalMilliseconds;

Expand Down
2 changes: 1 addition & 1 deletion Stardust/StarClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public override IPingRequest BuildPingRequest()
{
if (Runtime.Linux && item.SessionId == 0) continue;

var name = item.GetProcessName2();
var name = item.GetProcessName();
if (name.EqualIgnoreCase(_excludes) || exs.Any(e => e.IsMatch(name))) continue;

if (!pcs.Contains(name)) pcs.Add(name);
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.805" />
<PackageReference Include="NewLife.Remoting" Version="3.0.2024.812-beta0813" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net40'">
<PackageReference Include="NewLife.Core" Version="10.10.2024.0803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.0825-beta0722" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="NewLife.Core" Version="10.10.2024.0801-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.803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.825-beta0722" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
</ItemGroup>

Expand Down

0 comments on commit f6478eb

Please sign in to comment.