11-2020 v1.3-beta

bitasuperactive · Aug 21, 2022 · e6e30d8 · e6e30d8
1 parent f23d4c7
commit e6e30d8
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 52 deletions.
diff --git a/BlockTheSpot/App.config b/BlockTheSpot/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>
+
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
+</configuration>
diff --git a/BlockTheSpot/BlockTheSpot.csproj b/BlockTheSpot/BlockTheSpot.csproj
@@ -15,8 +15,9 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
     <PublishUrl>C:\Users\PVita\Desktop\</PublishUrl>
-    <Install>true</Install>
+    <Install>false</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
@@ -25,8 +26,11 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
+    <SupportUrl>https://github.com/bitasuperactive/BlockTheSpot-C-Sharp/</SupportUrl>
+    <ProductName>BlockTheSpot-C-Sharp</ProductName>
+    <PublisherName>bitasuperactive</PublisherName>
     <ApplicationRevision>54</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.3.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>false</BootstrapperEnabled>
@@ -50,6 +54,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>5EB8FCDE5395635BFAC2E65E0A97BD1E80D3750E</ManifestCertificateThumbprint>
@@ -58,7 +63,7 @@
     <ManifestKeyFile>BlockTheSpot_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>

diff --git a/BlockTheSpot/Form1.cs b/BlockTheSpot/Form1.cs
@@ -52,6 +52,8 @@ private void CheckRequirements()
             }
             else
                 ResetButton.Enabled = false;
+
+            if (!File.Exists($@"{SpotifyDir}\Spotify.exe")) PatchButton.Text = "Instalar Spotify y" + Environment.NewLine + "Bloquear anuncios";
         }
 
         private bool DowngradeRequired()
@@ -67,7 +69,7 @@ private bool DowngradeRequired()
         #region Buttons
         private void PatchButton_Click(object sender, EventArgs e) => PatchButtonMethod();
         private void ResetButton_Click(object sender, EventArgs e) => ResetButtonMethod();
-        private void BlockTheSpot_HelpButtonClicked(object sender, System.ComponentModel.CancelEventArgs e) => Process.Start("https://github.com/bitasuperactive/BlockTheSpot-OneClick");
+        private void BlockTheSpot_HelpButtonClicked(object sender, System.ComponentModel.CancelEventArgs e) => Process.Start("https://github.com/bitasuperactive/BlockTheSpot-C-Sharp");
 
         private void PatchButtonMethod()
         {
@@ -144,11 +146,10 @@ private void SpotifyDowngrade()
                 if (DowngradeRequired())
                 {
                     Process.Start($"{Path.GetTempPath()}spotify_installer-1.1.4.197.g92d52c4f-13.exe").WaitForExit();
-                    //while (Process.GetProcessesByName("spotify_installer-1.1.4.197.g92d52c4f-13.exe").Length > 0) Thread.Sleep(100);
 
-                    try { File.Delete($"{Path.GetTempPath()}spotify_installer-1.1.4.197.g92d52c4f-13.exe"); } catch (Exception) { }  // Conflict?
+                    try { File.Delete($"{Path.GetTempPath()}spotify_installer-1.1.4.197.g92d52c4f-13.exe"); } catch (Exception) { }  // Conflict
 
-                    TerminateSpotify(); // Conflict, cannot open spotify warning message?
+                    TerminateSpotify();
                 }
             }
         }
@@ -219,9 +220,8 @@ private void UpdateSpotify()
                 using (WebClient client = new WebClient()) { client.DownloadFile("https://download.scdn.co/SpotifySetup.exe", $"{Path.GetTempPath()}spotify_installer-update.exe"); }
 
                 Process.Start($"{Path.GetTempPath()}spotify_installer-update.exe").WaitForExit();
-                //while (Process.GetProcessesByName("spotify_installer-update.exe").Length > 0) Thread.Sleep(100);
 
-                try { File.Delete($"{Path.GetTempPath()}spotify_installer-update.exe"); } catch (Exception) { }  // Conflict?
+                try { File.Delete($"{Path.GetTempPath()}spotify_installer-update.exe"); } catch (Exception) { }  // Conflict
             }
             catch (WebException)
             {

diff --git a/BlockTheSpot/Properties/AssemblyInfo.cs b/BlockTheSpot/Properties/AssemblyInfo.cs
@@ -1,23 +1,24 @@
-using System.Reflection;
+using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // La información general de un ensamblado se controla mediante el siguiente 
 // conjunto de atributos. Cambie estos valores de atributo para modificar la información
 // asociada con un ensamblado.
 [assembly: AssemblyTitle("BlockTheSpot")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("https://github.com/bitasuperactive/BlockTheSpot-C-Sharp")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BlockTheSpot")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyProduct("BlockTheSpot-C-Sharp")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // Si establece ComVisible en false, los tipos de este ensamblado no estarán visibles 
 // para los componentes COM.  Si es necesario obtener acceso a un tipo en este ensamblado desde 
 // COM, establezca el atributo ComVisible en true en este tipo.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(true)]
 
 // El siguiente GUID sirve como id. de typelib si este proyecto se expone a COM.
 [assembly: Guid("ab40bfc5-7da6-4c96-86b5-25be5742f8e7")]
@@ -32,5 +33,6 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión
 // utilizando el carácter "*", como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: NeutralResourcesLanguage("es-ES")]
diff --git a/BlockTheSpot/Properties/Resources.Designer.cs b/BlockTheSpot/Properties/Resources.Designer.cs
diff --git a/BlockTheSpot/Properties/Settings.Designer.cs b/BlockTheSpot/Properties/Settings.Designer.cs
diff --git a/BlockTheSpot/Properties/app.manifest b/BlockTheSpot/Properties/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -18,33 +18,29 @@
         -->
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
+      </applicationRequestMinimum>
     </security>
   </trustInfo>
-
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!-- Una lista de las versiones de Windows en la que se ha probado esta aplicación y
            con la que se ha diseñado para que trabaje. Quite la marca de comentario de los elementos adecuados y Windows seleccionará 
            automáticamente el entorno más compatible. -->
-
       <!-- Windows Vista -->
       <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
       <!-- Windows 7 -->
       <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
       <!-- Windows 8 -->
       <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
       <!-- Windows 8.1 -->
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
       <!-- Windows 10 -->
       <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
     </application>
   </compatibility>
-
   <!-- Indica que la aplicación tiene reconocimiento de PPP y Windows no la escalará de forma automática a
        PPP superiores. Las aplicaciones de Windows Presentation Foundation (WPF) tienen reconocimiento de PPP automático y no necesitan 
        participar. Las aplicaciones de Windows Forms que apuntan a .NET Framework 4.6 que participan en esta configuración, también 
@@ -56,7 +52,6 @@
     </windowsSettings>
   </application>
   -->
-
   <!-- Habilitar los temas para los controles y cuadros de diálogo comunes de Windows (Windows XP y versiones posteriores) -->
   <!--
   <dependency>
@@ -72,5 +67,4 @@
     </dependentAssembly>
   </dependency>
   -->
-
-</assembly>
+</assembly>
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 **Con un solo clic, no más anuncios en Spotify.**
 
-[Descargas y Notas de Publicación](https://github.com/bitasuperactive/BlockTheSpot-C-Sharp/releases) | [YouTube](https://www.youtube.com/c/bitasuperactive) | Basado en *[BlockTheSpot by @master131](https://github.com/master131/BlockTheSpot)*
+[Descargas y Notas de Publicación](https://github.com/bitasuperactive/BlockTheSpot-C-Sharp/releases) | *Basado en [BlockTheSpot by @master131](https://github.com/master131/BlockTheSpot)*
 
 ## Descripción
 **Estado:** Funcionando en 01/11/2020 :white_check_mark:
@@ -19,7 +19,7 @@ Mediante el botón secundario, BTS instala la última versión actualizada de Sp
 [Análisis antivírico realizado por VirusTotal.com](https://www.virustotal.com/gui/file/82e842b08a02d2ce9dbaa7050ca48886efd46c64876f55ffe973de8e98814572/detection)
 
 ## Características
-- Solo Windows (requerido [.NET Framework 4.5](https://www.microsoft.com/es-es/download/confirmation.aspx?id=30653) o superior).
+- Solo Windows (requerido [.NET Framework 4.7.2](https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net472-web-installer) o superior).
 - Bloquea todos los anuncios (banners, vídeos y audios).
 - Desbloquea la función "saltar" para cualquier canción.
 - Mantiene las funcionalidades de lista de amigos, vídeo vertical y rádio.