DCF 2017-11-21

zhangzisu · Nov 21, 2017 · 6f51a67 · 6f51a67
1 parent b57f300
commit 6f51a67
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/shadowsocks-csharp-client/View/MenuViewController.cs b/shadowsocks-csharp-client/View/MenuViewController.cs
@@ -209,17 +209,15 @@ private void LoadMenu()
                 AutoStartupItem = CreateMenuItem("Start on Boot", new EventHandler(AutoStartupItem_Click)),
                 ShareOverLANItem = CreateMenuItem("Allow Clients from LAN", new EventHandler(ShareOverLANItem_Click)),
                 new MenuItem("-"),
-                CreateMenuGroup("Help", new MenuItem[] {
-                    CreateMenuItem("Show Logs...", new EventHandler(ShowLogItem_Click)),
-                    VerboseLoggingToggleItem = CreateMenuItem( "Verbose Logging", new EventHandler(VerboseLoggingToggleItem_Click) ),
-                    CreateMenuGroup("Updates...", new MenuItem[] {
-                        CreateMenuItem("Check for Updates...", new EventHandler(checkUpdatesItem_Click)),
-                        new MenuItem("-"),
-                        autoCheckUpdatesToggleItem = CreateMenuItem("Check for Updates at Startup", new EventHandler(autoCheckUpdatesToggleItem_Click)),
-                        checkPreReleaseToggleItem = CreateMenuItem("Check Pre-release Version", new EventHandler(checkPreReleaseToggleItem_Click)),
-                    }),
-                    CreateMenuItem("About...", new EventHandler(AboutItem_Click)),
+                CreateMenuItem("Show Logs...", new EventHandler(ShowLogItem_Click)),
+                VerboseLoggingToggleItem = CreateMenuItem( "Verbose Logging", new EventHandler(VerboseLoggingToggleItem_Click) ),
+                CreateMenuGroup("Updates...", new MenuItem[] {
+                    CreateMenuItem("Check for Updates...", new EventHandler(checkUpdatesItem_Click)),
+                    new MenuItem("-"),
+                    autoCheckUpdatesToggleItem = CreateMenuItem("Check for Updates at Startup", new EventHandler(autoCheckUpdatesToggleItem_Click)),
+                    checkPreReleaseToggleItem = CreateMenuItem("Check Pre-release Version", new EventHandler(checkPreReleaseToggleItem_Click)),
                 }),
+                CreateMenuItem("About...", new EventHandler(AboutItem_Click)),
                 new MenuItem("-"),
                 CreateMenuItem("Quit", new EventHandler(Quit_Click))
             });

diff --git a/shadowsocks-csharp-client/shadowsocks-csharp-client.csproj b/shadowsocks-csharp-client/shadowsocks-csharp-client.csproj
@@ -23,6 +23,8 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -33,12 +35,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/shadowsocks-csharp-client/shadowsocks-csharp-client.csproj.user b/shadowsocks-csharp-client/shadowsocks-csharp-client.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>