Merge pull request #25 from 10people/master

Fix in string 'steam'

Author: Cenmrev

V2RayW/Program.cs

@@ -338,10 +338,12 @@ public static bool generateConfigJson()
             json.outbound.settings.vnext[0].users[0].security = (new string[] { "aes-128-cfb", "aes-128-gcm", "chacha20-poly1305" })[profiles[selectedServerIndex].security % 3];
 
             var ts = JObject.Parse(Properties.Settings.Default.transportSettings);
-            //json.outbound.streamSettings.tcpSettings = ts["tcpSettings"];
-            //json.outbound.streamSettings.kcpSettings = ts["kcpSettings"];
-            //json.outbound.streamSettings.wsSettings = ts["wsSettings"];
-            json.outbound.streamSettings = ts;
+            json.outbound.streamSettings.security = ts["security"];
+            json.outbound.streamSettings.tlsSettings = ts["tlsSettings"];
+            json.outbound.streamSettings.tcpSettings = ts["tcpSettings"];
+            json.outbound.streamSettings.kcpSettings = ts["kcpSettings"];
+            json.outbound.streamSettings.wsSettings = ts["wsSettings"];
+            //json.outbound.streamSettings = ts;
             json.outbound.streamSettings.network = (new string[] { "tcp", "kcp", "ws" })[profiles[selectedServerIndex].network % 3];
 
             json.outbound.mux = JObject.Parse(Properties.Settings.Default.mux);

V2RayW/V2RayW.csproj

@@ -56,18 +56,6 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\vw256.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>C703DBF0FD6FDFEEAFBC3E20CAF1244B469CEBBD</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>V2RayW_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>false</SignManifests>
-  </PropertyGroup>
   <ItemGroup>
     <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>