Merge branch 'removeupdatecode'

cyanfish · Oct 28, 2016 · 6e05aa7 · 6e05aa7
2 parents 18b79ae + d697999
commit 6e05aa7
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 601 deletions.
diff --git a/NAPS2.Console/NAPS2.Console.csproj b/NAPS2.Console/NAPS2.Console.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerEXE|x86'">
     <OutputPath>bin\InstallerEXE\</OutputPath>
     <DefineConstants>TRACE;INSTALLER INSTALLER_EXE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>

diff --git a/NAPS2.Console/Program.cs b/NAPS2.Console/Program.cs
@@ -30,7 +30,7 @@ static class Program
         [STAThread]
         static void Main(string[] args)
         {
-            ConsoleEntryPoint.Run(args);
+            typeof(ConsoleEntryPoint).GetMethod("Run").Invoke(null, new object[] { args });
         }
     }
 }
diff --git a/NAPS2.Core/Config/AppConfig.cs b/NAPS2.Core/Config/AppConfig.cs
@@ -23,7 +23,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 using System.Linq;
 using System.Windows.Forms;
 using NAPS2.Scan;
-using NAPS2.Update;
 
 namespace NAPS2.Config
 {
@@ -43,8 +42,6 @@ public class AppConfig
 
         public ScanProfile DefaultProfileSettings { get; set; }
 
-        public AutoUpdateStatus AutoUpdate { get; set; }
-
         public SaveButtonDefaultAction SaveButtonDefaultAction { get; set; }
 
         public bool HideEmailButton { get; set; }

diff --git a/NAPS2.Core/Config/UserConfig.cs b/NAPS2.Core/Config/UserConfig.cs
@@ -28,7 +28,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 using NAPS2.Scan;
 using NAPS2.Scan.Batch;
 using NAPS2.Scan.Images;
-using NAPS2.Update;
 
 namespace NAPS2.Config
 {
@@ -49,8 +48,6 @@ public UserConfig()
 
         public List<FormState> FormStates { get; set; }
 
-        public AutoUpdateStatus AutoUpdate { get; set; }
-
         public DateTime? LastUpdateCheckDate { get; set; }
 
         public bool EnableOcr { get; set; }

diff --git a/NAPS2.Core/NAPS2.Core.csproj b/NAPS2.Core/NAPS2.Core.csproj
@@ -287,24 +287,6 @@
     <Compile Include="Util\Unmanaged.cs" />
     <Compile Include="Util\UnmanagedArray.cs" />
     <Compile Include="Util\UnmanagedBase.cs" />
-    <Compile Include="Update\AutoUpdater.cs" />
-    <Compile Include="Update\AutoUpdaterUI.cs" />
-    <Compile Include="Update\AutoUpdateStatus.cs" />
-    <Compile Include="Update\CurrentVersionSource.cs" />
-    <Compile Include="Update\Edition.cs" />
-    <Compile Include="Update\IAutoUpdater.cs" />
-    <Compile Include="Update\IAutoUpdaterClient.cs" />
-    <Compile Include="Update\ICurrentVersionSource.cs" />
-    <Compile Include="Update\ILatestVersionSource.cs" />
-    <Compile Include="Update\IUrlFileDownloader.cs" />
-    <Compile Include="Update\IUrlStreamReader.cs" />
-    <Compile Include="Update\IUrlTextReader.cs" />
-    <Compile Include="Update\LatestVersionSource.cs" />
-    <Compile Include="Update\UpdateInfo.cs" />
-    <Compile Include="Update\UrlFileDownloader.cs" />
-    <Compile Include="Update\UrlStreamReader.cs" />
-    <Compile Include="Update\UrlTextReader.cs" />
-    <Compile Include="Update\VersionInfo.cs" />
     <Compile Include="Host\X86HostManager.cs" />
     <Compile Include="Util\Win32.cs" />
     <Compile Include="WinForms\DialogHelper.cs">

diff --git a/NAPS2.Core/Update/AutoUpdateStatus.cs b/NAPS2.Core/Update/AutoUpdateStatus.cs
diff --git a/NAPS2.Core/Update/AutoUpdater.cs b/NAPS2.Core/Update/AutoUpdater.cs
diff --git a/NAPS2.Core/Update/AutoUpdaterUI.cs b/NAPS2.Core/Update/AutoUpdaterUI.cs
diff --git a/NAPS2.Core/Update/CurrentVersionSource.cs b/NAPS2.Core/Update/CurrentVersionSource.cs
diff --git a/NAPS2.Core/Update/Edition.cs b/NAPS2.Core/Update/Edition.cs
diff --git a/NAPS2.Core/Update/IAutoUpdater.cs b/NAPS2.Core/Update/IAutoUpdater.cs
diff --git a/NAPS2.Core/Update/IAutoUpdaterClient.cs b/NAPS2.Core/Update/IAutoUpdaterClient.cs