Infrastructure Preparation 280

Taiizor · Jun 9, 2024 · 9ff5a30 · 9ff5a30
1 parent c5876e4
commit 9ff5a30
Show file tree

Hide file tree

Showing 37 changed files with 78 additions and 38 deletions.
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoBrowser/ConsoleDemoBrowser/ConsoleDemoBrowser.csproj b/demo/Skylark.Console.Demo/ConsoleDemoBrowser/ConsoleDemoBrowser/ConsoleDemoBrowser.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Skylark" Version="3.1.4.3" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
     </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoColor/ConsoleDemoColor/ConsoleDemoColor.csproj b/demo/Skylark.Console.Demo/ConsoleDemoColor/ConsoleDemoColor/ConsoleDemoColor.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/....Console.Demo/ConsoleDemoCompression/ConsoleDemoCompression/ConsoleDemoCompression.csproj b/....Console.Demo/ConsoleDemoCompression/ConsoleDemoCompression/ConsoleDemoCompression.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Skylark" Version="3.1.4.3" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
     </ItemGroup>
 
 </Project>
diff --git a/...ark.Console.Demo/ConsoleDemoCryptology/ConsoleDemoCryptology/ConsoleDemoCryptology.csproj b/...ark.Console.Demo/ConsoleDemoCryptology/ConsoleDemoCryptology/ConsoleDemoCryptology.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoCss/ConsoleDemoCss/ConsoleDemoCss.csproj b/demo/Skylark.Console.Demo/ConsoleDemoCss/ConsoleDemoCss/ConsoleDemoCss.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/...le.Demo/ConsoleDemoDecompression/ConsoleDemoDecompression/ConsoleDemoDecompression.csproj b/...le.Demo/ConsoleDemoDecompression/ConsoleDemoDecompression/ConsoleDemoDecompression.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Skylark" Version="3.1.4.3" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
     </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoHash/ConsoleDemoHash/ConsoleDemoHash.csproj b/demo/Skylark.Console.Demo/ConsoleDemoHash/ConsoleDemoHash/ConsoleDemoHash.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoHelper/ConsoleDemoHelper/ConsoleDemoHelper.csproj b/demo/Skylark.Console.Demo/ConsoleDemoHelper/ConsoleDemoHelper/ConsoleDemoHelper.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoHtml/ConsoleDemoHtml/ConsoleDemoHtml.csproj b/demo/Skylark.Console.Demo/ConsoleDemoHtml/ConsoleDemoHtml/ConsoleDemoHtml.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoJs/ConsoleDemoJs/ConsoleDemoJs.csproj b/demo/Skylark.Console.Demo/ConsoleDemoJs/ConsoleDemoJs/ConsoleDemoJs.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoJson/ConsoleDemoJson/ConsoleDemoJson.csproj b/demo/Skylark.Console.Demo/ConsoleDemoJson/ConsoleDemoJson/ConsoleDemoJson.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoLottery/ConsoleDemoLottery/ConsoleDemoLottery.csproj b/demo/Skylark.Console.Demo/ConsoleDemoLottery/ConsoleDemoLottery/ConsoleDemoLottery.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoPassword/ConsoleDemoPassword/ConsoleDemoPassword.csproj b/demo/Skylark.Console.Demo/ConsoleDemoPassword/ConsoleDemoPassword/ConsoleDemoPassword.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoPing/ConsoleDemoPing/ConsoleDemoPing.csproj b/demo/Skylark.Console.Demo/ConsoleDemoPing/ConsoleDemoPing/ConsoleDemoPing.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoPort/ConsoleDemoPort/ConsoleDemoPort.csproj b/demo/Skylark.Console.Demo/ConsoleDemoPort/ConsoleDemoPort/ConsoleDemoPort.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoSpeed/ConsoleDemoSpeed/ConsoleDemoSpeed.csproj b/demo/Skylark.Console.Demo/ConsoleDemoSpeed/ConsoleDemoSpeed/ConsoleDemoSpeed.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoStorage/ConsoleDemoStorage/ConsoleDemoStorage.csproj b/demo/Skylark.Console.Demo/ConsoleDemoStorage/ConsoleDemoStorage/ConsoleDemoStorage.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoTax/ConsoleDemoTax/ConsoleDemoTax.csproj b/demo/Skylark.Console.Demo/ConsoleDemoTax/ConsoleDemoTax/ConsoleDemoTax.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/....Console.Demo/ConsoleDemoTemperature/ConsoleDemoTemperature/ConsoleDemoTemperature.csproj b/....Console.Demo/ConsoleDemoTemperature/ConsoleDemoTemperature/ConsoleDemoTemperature.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoText/ConsoleDemoText/ConsoleDemoText.csproj b/demo/Skylark.Console.Demo/ConsoleDemoText/ConsoleDemoText/ConsoleDemoText.csproj
@@ -9,7 +9,7 @@
 
  <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-   <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+   <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoTime/ConsoleDemoTime/ConsoleDemoTime.csproj b/demo/Skylark.Console.Demo/ConsoleDemoTime/ConsoleDemoTime/ConsoleDemoTime.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/...ark.Console.Demo/ConsoleDemoTypography/ConsoleDemoTypography/ConsoleDemoTypography.csproj b/...ark.Console.Demo/ConsoleDemoTypography/ConsoleDemoTypography/ConsoleDemoTypography.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoUnicode/ConsoleDemoUnicode/ConsoleDemoUnicode.csproj b/demo/Skylark.Console.Demo/ConsoleDemoUnicode/ConsoleDemoUnicode/ConsoleDemoUnicode.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoUrl/ConsoleDemoUrl/ConsoleDemoUrl.csproj b/demo/Skylark.Console.Demo/ConsoleDemoUrl/ConsoleDemoUrl/ConsoleDemoUrl.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoWeb/ConsoleDemoWeb/ConsoleDemoWeb.csproj b/demo/Skylark.Console.Demo/ConsoleDemoWeb/ConsoleDemoWeb/ConsoleDemoWeb.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoWord/ConsoleDemoWord/ConsoleDemoWord.csproj b/demo/Skylark.Console.Demo/ConsoleDemoWord/ConsoleDemoWord/ConsoleDemoWord.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoXhtml/ConsoleDemoXhtml/ConsoleDemoXhtml.csproj b/demo/Skylark.Console.Demo/ConsoleDemoXhtml/ConsoleDemoXhtml/ConsoleDemoXhtml.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.Console.Demo/ConsoleDemoXml/ConsoleDemoXml/ConsoleDemoXml.csproj b/demo/Skylark.Console.Demo/ConsoleDemoXml/ConsoleDemoXml/ConsoleDemoXml.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/Skylark.WinForms.Demo/Skylark.UI/Skylark.UI/Skylark.UI.csproj b/demo/Skylark.WinForms.Demo/Skylark.UI/Skylark.UI/Skylark.UI.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Skylark" Version="3.1.4.3" />
-    <PackageReference Include="Skylark.Standard" Version="3.1.5.8" />
+    <PackageReference Include="Skylark.Standard" Version="3.1.5.9" />
     <PackageReference Include="Skylark.Clipboard" Version="3.1.3.6" />
   </ItemGroup>
 </Project>
diff --git a/src/Jessica/Program.cs b/src/Jessica/Program.cs
@@ -11,7 +11,7 @@ public static async Task Main()
         {
             Console.Write("Enter Address: ");
 
-            string Address = Console.ReadLine();
+            string Address = Console.ReadLine() ?? string.Empty;
 
             Uptimer Uptiming = new(Address);
 

diff --git a/src/Skylark.Standard/Extension/Ping/PingExtension.cs b/src/Skylark.Standard/Extension/Ping/PingExtension.cs
@@ -1,11 +1,11 @@
 using System.Net.NetworkInformation;
 using SE = Skylark.Exception;
 using SHL = Skylark.Helper.Length;
-using SSMPPM = Skylark.Standard.Manage.Ping.PingManage;
-using SSPPSS = Skylark.Struct.Ping.PingSendStruct;
 using SNNIP = System.Net.NetworkInformation.Ping;
 using SNNIPO = System.Net.NetworkInformation.PingOptions;
 using SSHPPH = Skylark.Standard.Helper.Ping.PingHelper;
+using SSMPPM = Skylark.Standard.Manage.Ping.PingManage;
+using SSPPSS = Skylark.Struct.Ping.PingSendStruct;
 
 namespace Skylark.Standard.Extension.Ping
 {

diff --git a/src/Skylark.Standard/Extension/Port/PortExtension.cs b/src/Skylark.Standard/Extension/Port/PortExtension.cs
@@ -2,6 +2,7 @@
 using SE = Skylark.Exception;
 using SEPT = Skylark.Enum.PortType;
 using SHL = Skylark.Helper.Length;
+using SSHPPH = Skylark.Standard.Helper.Port.PortHelper;
 using SSMPPM = Skylark.Standard.Manage.Port.PortManage;
 
 namespace Skylark.Standard.Extension.Port
@@ -106,6 +107,7 @@ public static SEPT Scan(string Address = SSMPPM.Address, int Port = SSMPPM.Port,
         {
             try
             {
+                Address = SSHPPH.GetAddress(Address);
                 Address = SHL.Parameter(Address, SSMPPM.Address);
                 Port = SHL.Clamp(Port, SSMPPM.MinPort, SSMPPM.MaxPort);
                 Timeout = SHL.Clamp(Timeout, SSMPPM.MinTimeout, SSMPPM.MaxTimeout);

diff --git a/src/Skylark.Standard/Helper/Port/PortHelper.cs b/src/Skylark.Standard/Helper/Port/PortHelper.cs
@@ -0,0 +1,28 @@
+namespace Skylark.Standard.Helper.Port
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    internal static class PortHelper
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="Address"></param>
+        /// <returns></returns>
+        public static string GetAddress(string Address)
+        {
+            if (Address.Contains("https://"))
+            {
+                Address = Address.Replace("https://", "");
+            }
+
+            if (Address.Contains("http://"))
+            {
+                Address = Address.Replace("http://", "");
+            }
+
+            return Address;
+        }
+    }
+}
diff --git a/src/Skylark.Standard/Skylark.Standard.csproj b/src/Skylark.Standard/Skylark.Standard.csproj
@@ -10,7 +10,7 @@
 
     <PropertyGroup>
         <ApplicationIcon>Resources\Skylark.Standard.ico</ApplicationIcon>
-        <Version>3.1.5.9</Version>
+        <Version>3.1.6.1</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>Skylark.Standard</Title>

diff --git a/src/Skylark.Uptime/Skylark.Uptime.cs b/src/Skylark.Uptime/Skylark.Uptime.cs
@@ -19,7 +19,7 @@
 //     Website: www.Vegalya.com
 //     Created: 27.Feb.2023
 //     Changed: 10.Jun.2024
-//     Version: 3.1.4.5
+//     Version: 3.1.4.6
 //
 // |---------DO-NOT-REMOVE---------|
 
@@ -57,6 +57,16 @@ public async Task<SSCCS> Certificate()
                     ReceiveTimeout = Timeout,
                 };
 
+                if (Address.Contains("https://"))
+                {
+                    Address = Address.Replace("https://", "");
+                }
+
+                if (Address.Contains("http://"))
+                {
+                    Address = Address.Replace("http://", "");
+                }
+
                 await Client.ConnectAsync(Address, 443);
 
                 using NetworkStream Network = Client.GetStream();