NewLife/X

Revert "[NewLife.Core] dev 自动提交"

This reverts commit 7b4511ca60cdd9d776652d62f82efc1e6447b4e2.
石头 authored at 2025-07-07 10:32:40
0507e5c
Tree
1 Parent(s) 7b4511c
Summary: 3 changed files with 9 additions and 28 deletions.
Modified +8 -19
Modified +1 -1
Modified +0 -8
Modified +8 -19
diff --git a/NewLife.Core/Net/NetHelper.cs b/NewLife.Core/Net/NetHelper.cs
index 0756988..2b164b3 100644
--- a/NewLife.Core/Net/NetHelper.cs
+++ b/NewLife.Core/Net/NetHelper.cs
@@ -23,16 +23,9 @@ public static class NetHelper
     {
         if (!Runtime.Unity)
         {
-            try
-            {
-                // 网络有变化时,清空所有缓存
-                NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAddressChanged;
-                //NetworkChange.NetworkAvailabilityChanged += NetworkChange_NetworkAvailabilityChanged;
-            }
-            catch (Exception ex)
-            {
-                XTrace.WriteLine(ex.Message);
-            }
+            // 网络有变化时,清空所有缓存
+            NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAddressChanged;
+            NetworkChange.NetworkAvailabilityChanged += NetworkChange_NetworkAvailabilityChanged;
         }
     }
 
@@ -287,14 +280,6 @@ public static class NetHelper
     /// <returns></returns>
     public static IEnumerable<IPInterfaceProperties> GetActiveInterfaces()
     {
-        var os = Environment.OSVersion;
-        if (os.Platform == PlatformID.Win32NT && os.Version.Major < 6)
-        {
-#if DEBUG
-            XTrace.WriteLine("Windows XP及以下版本不支持多网卡IP地址获取");
-#endif
-            yield break;
-        }
         foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
         {
             if (item.OperationalStatus != OperationalStatus.Up) continue;
@@ -383,8 +368,12 @@ public static class NetHelper
     public static IEnumerable<IPAddress> GetIPs()
     {
         var dic = new Dictionary<UnicastIPAddressInformation, Int32>();
-        foreach (var ipp in GetActiveInterfaces())
+        foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
         {
+            if (item.OperationalStatus != OperationalStatus.Up) continue;
+            if (item.NetworkInterfaceType is NetworkInterfaceType.Loopback or NetworkInterfaceType.Tunnel or NetworkInterfaceType.Unknown) continue;
+
+            var ipp = item.GetIPProperties();
             if (ipp != null && ipp.UnicastAddresses.Count > 0)
             {
                 var gw = 0;
Modified +1 -1
diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
index 1b9b370..9b4e6ab 100644
--- a/NewLife.Core/NewLife.Core.csproj
+++ b/NewLife.Core/NewLife.Core.csproj
@@ -11,7 +11,7 @@
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>
-    <AssemblyVersion>$(VersionPrefix).2025.0601</AssemblyVersion>
+    <AssemblyVersion>$(VersionPrefix).$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</AssemblyVersion>
     <OutputPath>..\Bin</OutputPath>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <LangVersion>latest</LangVersion>
Modified +0 -8
diff --git a/Test/Program.cs b/Test/Program.cs
index d864b41..28a0f13 100644
--- a/Test/Program.cs
+++ b/Test/Program.cs
@@ -102,14 +102,6 @@ public class Program
         var type = Type.GetType("UnityEngine.Application, UnityEngine");
         XTrace.WriteLine("UnityEngine:{0}", type?.FullName);
 
-        XTrace.WriteLine("OS: {0}", Environment.OSVersion);
-
-        var ips = NetHelper.GetIPs().ToList();
-        XTrace.WriteLine(ips.Join());
-
-        var ns = NetHelper.GetDns().ToList();
-        XTrace.WriteLine(ns.Join());
-
         var pool = Pool.Shared;
         var buf = pool.Rent(1000);