Migrate to VS2015 and release straight the executable (#7)

* Bump setup with new metadata * Add a title to the console * Migrate to VS2015 * Publish only release executable Fuck VS and setup.exe
RoxasShadow · Jan 15, 2017 · 27a3d9e · 27a3d9e
1 parent f6abf27
commit 27a3d9e
Show file tree

Hide file tree

Showing 73 changed files with 18,946 additions and 673 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+packages
diff --git a/.vs/SauceNao-Windows/v14/.suo b/.vs/SauceNao-Windows/v14/.suo
diff --git a/SauceNao-Windows.sln b/SauceNao-Windows.sln
@@ -1,20 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SauceNao-Windows", "SauceNao-Windows\SauceNao-Windows.csproj", "{476382C6-2647-49C8-AEC2-82225138E3D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SauceNao-Windows", "SauceNao-Windows\SauceNao-Windows.csproj", "{35489830-9B8D-4E37-9D8C-39B7B0425714}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{476382C6-2647-49C8-AEC2-82225138E3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{476382C6-2647-49C8-AEC2-82225138E3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{476382C6-2647-49C8-AEC2-82225138E3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{476382C6-2647-49C8-AEC2-82225138E3D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35489830-9B8D-4E37-9D8C-39B7B0425714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35489830-9B8D-4E37-9D8C-39B7B0425714}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35489830-9B8D-4E37-9D8C-39B7B0425714}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35489830-9B8D-4E37-9D8C-39B7B0425714}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/SauceNao-Windows.v12.suo b/SauceNao-Windows.v12.suo
diff --git a/SauceNao-Windows/App.config b/SauceNao-Windows/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
 </configuration>
diff --git a/SauceNao-Windows/Program.cs b/SauceNao-Windows/Program.cs
@@ -15,6 +15,8 @@ class Program {
 
 
     static void Main(string[] args) {
+      Console.Title = "SauceNAO for Windows";
+
       if (args.Length < 3) {
         Console.WriteLine("Usage: SauceNao-Windows.exe <SAUCENAO_API_KEY> <IMGUR_API_KEY> <IMAGE_PATH> [PROXY IP:PORT]");
         Console.ReadLine();

diff --git a/SauceNao-Windows/Properties/AssemblyInfo.cs b/SauceNao-Windows/Properties/AssemblyInfo.cs
@@ -2,35 +2,35 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// Le informazioni generali relative a un assembly sono controllate dal seguente 
-// set di attributi. Per modificare le informazioni associate a un assembly
-// occorre quindi modificare i valori di questi attributi.
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
 [assembly: AssemblyTitle("SauceNao-Windows")]
-[assembly: AssemblyDescription("Use SauceNao in Windows natively.")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SauceNao-Windows")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili 
-// ai componenti COM.  Se è necessario accedere a un tipo in questo assembly da 
-// COM, impostare su true l'attributo ComVisible per tale tipo.
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// Se il progetto viene esposto a COM, il GUID che segue verrà utilizzato per creare l'ID della libreria dei tipi
-[assembly: Guid("0ae2f383-231d-4a8c-b5e5-4a6c827be1fb")]
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("35489830-9b8d-4e37-9d8c-39b7b0425714")]
 
-// Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori:
+// Version information for an assembly consists of the following four values:
 //
-//      Numero di versione principale
-//      Numero di versione secondario 
-//      Numero build
-//      Revisione
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
 //
-// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build 
-// utilizzando l'asterisco (*) come descritto di seguito:
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SauceNao-Windows/Properties/app.manifest b/SauceNao-Windows/Properties/app.manifest
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <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">
-        <!-- Opzioni manifesto Controllo account utente
-            Se si desidera modificare il livello di Controllo account utente di Windows, sostituire il 
-            nodo requestedExecutionLevel con uno dei seguenti.
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
 
         <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
         <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
         <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
 
-            Se si specifica il nodo requestedExecutionLevel, la virtualizzazione dei file system e del Registro di sistema verrà disabilitata.
-            Se si desidera utilizzare la virtualizzazione dei file e del Registro di sistema per la 
-            compatibilità con le versioni precedenti, eliminare il nodo requestedExecutionLevel.
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
         -->
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
@@ -26,20 +26,35 @@
   </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Elenco di tutte le versioni di Windows con cui è possibile utilizzare l'applicazione. 
-     L'ambiente maggiormente compatibile verrà scelto automaticamente.-->
-      <!-- Se l'applicazione è progettata per l'uso con Windows Vista, rimuovere il commento dal seguente nodo supportedOS-->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
-      <!-- Se l'applicazione è progettata per l'uso con Windows 7, rimuovere il commento dal seguente nodo supportedOS-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-      <!-- Se l'applicazione è progettata per l'uso con Windows 8, rimuovere il commento dal seguente nodo supportedOS-->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
-      <!-- Se l'applicazione è progettata per l'uso con Windows 8.1, rimuovere il commento dal seguente nodo supportedOS-->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->
+      <!-- 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>
-  <!-- Abilita i temi per i controlli e le finestre di dialogo comuni di Windows (Windows XP e versioni successive) -->
-  <!-- <dependency>
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
     <dependentAssembly>
       <assemblyIdentity
           type="win32"
@@ -50,5 +65,6 @@
           language="*"
         />
     </dependentAssembly>
-  </dependency>-->
-</asmv1:assembly>
+  </dependency>
+  -->
+</assembly>
diff --git a/SauceNao-Windows/SauceNao-Windows.csproj b/SauceNao-Windows/SauceNao-Windows.csproj
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{476382C6-2647-49C8-AEC2-82225138E3D6}</ProjectGuid>
+    <ProjectGuid>{35489830-9B8D-4E37-9D8C-39B7B0425714}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SauceNao_Windows</RootNamespace>
     <AssemblyName>SauceNao-Windows</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -22,9 +23,12 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ErrorReportUrl>https://github.com/RoxasShadow/SauceNao-Windows/issues</ErrorReportUrl>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.1.5.0</ApplicationVersion>
+    <SupportUrl>https://github.com/RoxasShadow/SauceNao-Windows</SupportUrl>
+    <TargetCulture>en</TargetCulture>
+    <ProductName>SauceNao-Windows</ProductName>
+    <PublisherName>Roxas Shadow</PublisherName>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>0.1.6.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -49,10 +53,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>12CB0EB5A0F57991C2B21F8F54FB3CBE0106AE4D</ManifestCertificateThumbprint>
+    <StartupObject>SauceNao_Windows.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>SauceNao-Windows_ChiaveTemporanea.pfx</ManifestKeyFile>
+    <ManifestCertificateThumbprint>42CE06FB2D8808CF6F0BBD1ED6A9AE359A6DAFC9</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>SauceNao-Windows_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -64,44 +71,44 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Imgur.cs" />
+    <Compile Include="Sauces\Pixiv.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Response.cs" />
+    <Compile Include="Result.cs" />
     <Compile Include="Sauce.cs" />
     <Compile Include="SauceNao.cs" />
-    <Compile Include="Result.cs" />
-    <Compile Include="Sauces\Pixiv.cs" />
-    <Compile Include="Imgur.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
-    <None Include="SauceNao-Windows_ChiaveTemporanea.pfx" />
+    <None Include="SauceNao-Windows_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5 %28x86 e x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
       <Visible>False</Visible>
       <ProductName>.NET Framework 3.5 SP1</ProductName>

diff --git a/SauceNao-Windows/SauceNao-Windows.csproj.user b/SauceNao-Windows/SauceNao-Windows.csproj.user
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />
     <UpdateUrlHistory />
     <BootstrapperUrlHistory />
     <ErrorReportUrlHistory />
-    <FallbackCulture>it-IT</FallbackCulture>
+    <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
 </Project>
diff --git a/SauceNao-Windows/SauceNao-Windows_ChiaveTemporanea.pfx b/SauceNao-Windows/SauceNao-Windows_ChiaveTemporanea.pfx
diff --git a/SauceNao-Windows/SauceNao-Windows_TemporaryKey.pfx b/SauceNao-Windows/SauceNao-Windows_TemporaryKey.pfx
diff --git a/SauceNao-Windows/bin/Debug/Newtonsoft.Json.dll b/SauceNao-Windows/bin/Debug/Newtonsoft.Json.dll