2.16.3

AirVPN · Aug 10, 2018 · 1f44b42 · 1f44b42
1 parent cbec8e5
commit 1f44b42
Show file tree

Hide file tree

Showing 29 changed files with 603 additions and 108 deletions.
diff --git a/repository/Deploy.exe b/repository/Deploy.exe
diff --git a/repository/src/Deploy/Constants.cs b/repository/src/Deploy/Constants.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Eddie.Deploy

diff --git a/repository/src/Deploy/Engine.cs b/repository/src/Deploy/Engine.cs
@@ -98,7 +98,7 @@ Detect Platform
 			PathBaseSigning = new DirectoryInfo(PathBase + "/repository/signing").FullName;
 
 			string versionString3 = ExtractBetween(ReadTextFile(PathBase + "/src/Lib.Common/Constants.cs"), "public static string VersionDesc = \"", "\"");
-			
+
 			/* --------------------------------------------------------------
 			   Checking environment, required
 			-------------------------------------------------------------- */
@@ -134,7 +134,7 @@ Detect Platform
 					return;
 				}
 
-				if( (IsOfficial()) && (Shell("which dpkg-sig").Trim() == "") )
+				if ((IsOfficial()) && (Shell("which dpkg-sig").Trim() == ""))
 				{
 					Console.WriteLine("dpkg-sig required.");
 					return;
@@ -197,7 +197,7 @@ Detect Platform
 			if (IsSigning())
 			{
 				string[] dirs = Directory.GetDirectories(PathBaseDeploy, SO + "*");
-				foreach(string dir in dirs)
+				foreach (string dir in dirs)
 				{
 					SignPath(SO, "", dir);
 				}
@@ -214,10 +214,10 @@ Build packages list
 				{
 					foreach (string arch in new string[] { "x64", "x86" })
 					{
-						foreach (string ui in new string[] { "cli", "ui" })
-						{
+						foreach (string ui in new string[] { "ui", "cli" })
+						{							
 							foreach (string format in new string[] { "portable", "installer" })
-							{
+							{								
 								foreach (string os in new string[] { "windows-10", "windows-7", "windows-vista", "windows-xp" })
 								{
 									string netFramework = "4.0";
@@ -1050,7 +1050,7 @@ Generate Man pages
 					WriteTextFile(PathBaseRepository + "/manual.man", Shell(pathExe + " -help -help.format=man"));
 				}
 			}
-			
+
 			Log("------------------------------");
 			if (Errors == 0)
 				Log("Done");
@@ -1079,7 +1079,7 @@ static bool IsVerbose()
 		{
 			return Engine.Arguments.Contains("verbose");
 		}
-		
+
 		static bool IsSigning()
 		{
 			return Engine.Arguments.Contains("signing");
@@ -1097,7 +1097,7 @@ static bool Compile(string so, string architecture, string netFramework)
 			string pathCompiler = "";
 			if (Environment.OSVersion.VersionString.IndexOf("Windows") != -1)
 			{
-				pathCompiler = "c:\\Program Files (x86)\\MSBuild\\14.0\\Bin\\msbuild.exe";
+				pathCompiler = "c:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe";
 			}
 			else
 			{
@@ -1116,7 +1116,7 @@ static bool Compile(string so, string architecture, string netFramework)
 			else if (so == "linux")
 				pathProject = PathBase + "/src/eddie2.linux.sln";
 
-			string arguments = "/p:Configuration=Release /p:Platform=" + architecture + " /p:TargetFrameworkVersion=\"v" + netFramework + "\" /t:Rebuild \"" + pathProject + "\"";
+			string arguments = " /property:CodeAnalysisRuleSet=\"" + PathBase + "/tools/ruleset/norules.ruleset\"  /p:Configuration=Release /p:Platform=" + architecture + " /p:TargetFrameworkVersion=\"v" + netFramework + "\" /t:Rebuild \"" + pathProject + "\"";
 
 			if (Environment.OSVersion.VersionString.IndexOf("Windows") != -1)
 			{
@@ -1332,7 +1332,7 @@ static void SignFile(string platform, string format, string path)
 				if ((File.Exists(pathPfx)) && (File.Exists(pathPfxPwd)))
 				{
 					for (int t = 0; ; t++)
-					{						
+					{
 						{
 							string cmd = "";
 							cmd += PathBaseTools + "/windows/signtool.exe";
@@ -1465,6 +1465,8 @@ static void CopyAll(string from, string to)
 					continue;
 				if (di.Name == "ui")
 					continue;
+				if (di.Name == "webui")
+					continue;
 
 				Directory.CreateDirectory(to + "/" + di.Name);
 

diff --git a/repository/src/Deploy/IBuilder.cs b/repository/src/Deploy/IBuilder.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Eddie.Deploy

diff --git a/repository/src/Deploy/Package.cs b/repository/src/Deploy/Package.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Eddie.Deploy

diff --git a/src/App.CLI.Linux/App.CLI.Linux.csproj b/src/App.CLI.Linux/App.CLI.Linux.csproj
@@ -54,8 +54,7 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <ErrorReport>prompt</ErrorReport>    
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
     <Prefer32Bit>false</Prefer32Bit>
@@ -70,8 +69,7 @@
     <Optimize>true</Optimize>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <ErrorReport>prompt</ErrorReport>    
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <CustomCommands>

diff --git a/src/App.CLI.Windows/App.CLI.Windows.csproj b/src/App.CLI.Windows/App.CLI.Windows.csproj
@@ -22,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\tools\ruleset\idisposable.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -44,7 +43,6 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
@@ -53,6 +51,7 @@
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -64,7 +63,6 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>

diff --git a/src/App.Cocoa.MacOS/MainWindow.xib b/src/App.Cocoa.MacOS/MainWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -135,7 +135,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="554" height="311"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <box autoresizesSubviews="NO" boxType="custom" borderType="bezel" titlePosition="noTitle" id="CcO-sU-ril">
+                                                            <box autoresizesSubviews="NO" boxType="custom" borderType="bezel" titlePosition="noTitle" transparent="YES" id="CcO-sU-ril">
                                                                 <rect key="frame" x="20" y="23" width="514" height="263"/>
                                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                 <view key="contentView" id="cGk-W8-VNK">
@@ -264,8 +264,6 @@
                                                                         </textField>
                                                                     </subviews>
                                                                 </view>
-                                                                <color key="borderColor" red="0.54969853940217384" green="0.54969853940217384" blue="0.54969853940217384" alpha="0.41999999999999998" colorSpace="calibratedRGB"/>
-                                                                <color key="fillColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </box>
                                                         </subviews>
                                                     </view>
@@ -1101,7 +1099,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" id="kHg-Cn-N3x">
                                                 <rect key="frame" x="1" y="0.0" width="512" height="295"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <autoresizingMask key="autoresizingMask"/>
                                                 <subviews>
                                                     <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowHeight="14" headerView="TIO-PH-Oac" id="q0u-aS-DHq">
                                                         <rect key="frame" x="0.0" y="0.0" width="1179" height="278"/>

diff --git a/src/App.Forms.Linux/App.Forms.Linux.csproj b/src/App.Forms.Linux/App.Forms.Linux.csproj
@@ -60,7 +60,7 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
@@ -86,8 +86,7 @@
     <CodeAnalysisLogFile>bin\Release\UI.Linux.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <ErrorReport>prompt</ErrorReport>    
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>

diff --git a/src/App.Forms.Windows/App.Forms.Windows.csproj b/src/App.Forms.Windows/App.Forms.Windows.csproj
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\tools\ruleset\idisposable.ruleset</CodeAnalysisRuleSet>
+
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -44,7 +44,6 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <WarningLevel>4</WarningLevel>
@@ -61,7 +60,7 @@
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+
     <CodeAnalysisRuleSetDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;$(DevEnvDir)\..\..\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <WarningLevel>4</WarningLevel>

diff --git a/src/App.Forms.Windows/Program.cs b/src/App.Forms.Windows/Program.cs
@@ -43,7 +43,6 @@ static void Main()
 				if (Environment.OSVersion.Version.Major >= 6)
 					NativeMethods.SetProcessDPIAware();
 
-
 				//Application.EnableVisualStyles();
 				Application.SetCompatibleTextRenderingDefault(false);