2.02.6

dunvit · Oct 11, 2017 · 15c3050 · 15c3050 · botelapana · Oct 14, 2017
1 parent 2daaa7d
commit 15c3050
Show file tree

Hide file tree

Showing 47 changed files with 2,578 additions and 122,816 deletions.
diff --git a/Client/.vs/Client/v14/.suo b/Client/.vs/Client/v14/.suo
diff --git a/Client/Client.sln b/Client/Client.sln
@@ -1,14 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJima", "EvaJima\EveJima.csproj", "{B1FFBC3C-F71C-40B7-A04B-BE708AA024CC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaCore", "EvaJimaCore\EveJimaCore.csproj", "{C1410D27-425C-4C35-89E3-1281F95183E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaSettings", "EvaJimaSettings\EveJimaSettings.csproj", "{6ED83E00-E836-4395-9FBC-7A3878455274}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaBrowser", "EveJimaBrowser\EveJimaBrowser.csproj", "{FC30A198-4213-404F-8526-D7BE5D49E57D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaUniverse", "EveJimaUniverse\EveJimaUniverse.csproj", "{7CCC5A5F-14C3-4BA3-998B-D4177085BFEB}"
@@ -17,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EJTests", "EJTests\EJTests.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EveJimaServerMap", "..\Server\EveJimaServerMap\EveJimaServerMap.csproj", "{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "updater", "udater\updater.csproj", "{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "EveJimaInstaller", "EveJimaInstaller\EveJimaInstaller.vdproj", "{5686FF51-8DC6-41C9-8802-55F01876BAD4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,12 +37,6 @@ Global
 		{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|Any CPU.ActiveCfg = Release|x86
 		{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|Any CPU.Build.0 = Release|x86
 		{C1410D27-425C-4C35-89E3-1281F95183E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Debug|Any CPU.Build.0 = Debug|x86
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Debug|x86.ActiveCfg = Debug|x86
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Release|Any CPU.ActiveCfg = Release|x86
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Release|Any CPU.Build.0 = Release|x86
-		{6ED83E00-E836-4395-9FBC-7A3878455274}.Release|x86.ActiveCfg = Release|Any CPU
 		{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|Any CPU.Build.0 = Debug|x86
 		{FC30A198-4213-404F-8526-D7BE5D49E57D}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -73,16 +65,15 @@ Global
 		{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x86.ActiveCfg = Release|Any CPU
 		{E67AC071-4E51-4CF3-BA0E-2796BAFA47A5}.Release|x86.Build.0 = Release|Any CPU
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Debug|x86.ActiveCfg = Debug|x86
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Debug|x86.Build.0 = Debug|x86
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Release|x86.ActiveCfg = Release|x86
-		{7F0EF32C-6F14-4111-8C1D-64E0F34C9C23}.Release|x86.Build.0 = Release|x86
+		{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|Any CPU.ActiveCfg = Debug
+		{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Debug|x86.ActiveCfg = Debug
+		{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|Any CPU.ActiveCfg = Release
+		{5686FF51-8DC6-41C9-8802-55F01876BAD4}.Release|x86.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {227D28AF-BA13-4772-8D1F-A02CFD029392}
+	EndGlobalSection
 EndGlobal
diff --git a/Client/EvaJima/App.config b/Client/EvaJima/App.config
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net" />
   </configSections>
   <log4net>
     <appender name="All" type="log4net.Appender.RollingFileAppender">
       <file value="Logs/log.txt" />
       <appendToFile value="true" />
-      <param name="RollingStyle" value="Date"/>
-      <param name="DatePattern" value="yyyy-MM-dd.\tx\t"/>
+      <param name="RollingStyle" value="Date" />
+      <param name="DatePattern" value="yyyy-MM-dd.\tx\t" />
       <datePattern value="yyyyMMdd" />
-      <maximumFileSize value="10MB"/>
-      <maxSizeRollBackups value="-1"/>
+      <maximumFileSize value="10MB" />
+      <maxSizeRollBackups value="-1" />
       <layout type="log4net.Layout.PatternLayout">
         <param name="ConversionPattern" value="%date [%thread] %logger %-5level %message%newline" />
       </layout>
     </appender>
     <appender name="Commands" type="log4net.Appender.FileAppender">
       <file value="Logs/commands.txt" />
-      <staticLogFileName value="true"/>
-      <appendToFile value="true"/>
-      <param name="RollingStyle" value="Date"/>
-      <param name="DatePattern" value="yyyy-MM-dd.\tx\t"/>
-      <maximumFileSize value="10MB"/>
-      <maxSizeRollBackups value="-1"/>
+      <staticLogFileName value="true" />
+      <appendToFile value="true" />
+      <param name="RollingStyle" value="Date" />
+      <param name="DatePattern" value="yyyy-MM-dd.\tx\t" />
+      <maximumFileSize value="10MB" />
+      <maxSizeRollBackups value="-1" />
       <layout type="log4net.Layout.PatternLayout">
         <param name="ConversionPattern" value="%date [%thread] %logger %-5level %message%newline" />
       </layout>
     </appender>
     <appender name="CommandsMap" type="log4net.Appender.FileAppender">
       <file value="Logs/commandsMap.txt" />
-      <staticLogFileName value="true"/>
-      <appendToFile value="true"/>
-      <param name="RollingStyle" value="Date"/>
-      <param name="DatePattern" value="yyyy-MM-dd.\tx\t"/>
-      <maximumFileSize value="10MB"/>
-      <maxSizeRollBackups value="-1"/>
+      <staticLogFileName value="true" />
+      <appendToFile value="true" />
+      <param name="RollingStyle" value="Date" />
+      <param name="DatePattern" value="yyyy-MM-dd.\tx\t" />
+      <maximumFileSize value="10MB" />
+      <maxSizeRollBackups value="-1" />
       <layout type="log4net.Layout.PatternLayout">
         <param name="ConversionPattern" value="%date [%thread] %logger %-5level %message%newline" />
       </layout>
     </appender>
     <appender name="Errors" type="log4net.Appender.FileAppender">
       <file value="Logs/errors.txt" />
-      <staticLogFileName value="true"/>
-      <appendToFile value="true"/>
-      <param name="RollingStyle" value="Date"/>
-      <param name="DatePattern" value="yyyy-MM-dd.\tx\t"/>
-      <maximumFileSize value="10MB"/>
-      <maxSizeRollBackups value="-1"/>
+      <staticLogFileName value="true" />
+      <appendToFile value="true" />
+      <param name="RollingStyle" value="Date" />
+      <param name="DatePattern" value="yyyy-MM-dd.\tx\t" />
+      <maximumFileSize value="10MB" />
+      <maxSizeRollBackups value="-1" />
       <layout type="log4net.Layout.PatternLayout">
         <param name="ConversionPattern" value="%date [%thread] %logger %-5level %message%newline" />
       </layout>
     </appender>
     <appender name="ApiCalls" type="log4net.Appender.FileAppender">
       <file value="Logs/apiCalls.txt" />
-      <staticLogFileName value="true"/>
-      <appendToFile value="true"/>
-      <param name="RollingStyle" value="Date"/>
-      <param name="DatePattern" value="yyyy-MM-dd.\tx\t"/>
-      <maximumFileSize value="10MB"/>
-      <maxSizeRollBackups value="-1"/>
+      <staticLogFileName value="true" />
+      <appendToFile value="true" />
+      <param name="RollingStyle" value="Date" />
+      <param name="DatePattern" value="yyyy-MM-dd.\tx\t" />
+      <maximumFileSize value="10MB" />
+      <maxSizeRollBackups value="-1" />
       <layout type="log4net.Layout.PatternLayout">
         <param name="ConversionPattern" value="%date [%thread] %logger %-5level %message%newline" />
       </layout>
@@ -87,8 +87,21 @@
   </log4net>
   <appSettings>
     <add key="SolarSystemTTL" value="24" />
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
-    </startup>
-</configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/Client/EvaJima/EveJima.csproj b/Client/EvaJima/EveJima.csproj
@@ -68,7 +68,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\2.02.4\</OutputPath>
+    <OutputPath>bin\x86\2.02.5\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -99,13 +99,17 @@
     <ManifestKeyFile>EveJima_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
+    <StartupObject>EveJima.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>EveJima.Program</StartupObject>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CsvHelper, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
@@ -121,7 +125,9 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -134,6 +140,9 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Version.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -153,6 +162,7 @@
     <Content Include="Data\Wormholes.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="app.manifest" />
     <None Include="EvaJima.pfx" />
     <None Include="EveJima_TemporaryKey.pfx" />
     <None Include="packages.config" />
@@ -174,10 +184,6 @@
       <Project>{c1410d27-425c-4c35-89e3-1281f95183e2}</Project>
       <Name>EveJimaCore</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EvaJimaSettings\EveJimaSettings.csproj">
-      <Project>{6ed83e00-e836-4395-9fbc-7a3878455274}</Project>
-      <Name>EveJimaSettings</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Browser\dummy.txt">
@@ -186,12 +192,6 @@
     <Content Include="Data\Signatures\Dummy.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="EveJimaEnvironment.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="EveJimaSettings.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="Resources\book-with-bookmark.png" />
     <None Include="Resources\bookmark.png" />
     <None Include="Resources\browser_back.png" />
@@ -212,14 +212,6 @@
     <None Include="Resources\unpin.png" />
     <None Include="Resources\url.png" />
     <Content Include="screenW1.ico" />
-    <Content Include="SettingPreRelease.txt" />
-    <Content Include="settings.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <EmbeddedResource Include="teamdev.licenses" />
-    <Content Include="Version.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">

diff --git a/Client/EvaJima/EveJima.csproj.user b/Client/EvaJima/EveJima.csproj.user
@@ -11,4 +11,7 @@
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
     <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
 </Project>
diff --git a/Client/EvaJima/EveJimaEnvironment.txt b/Client/EvaJima/EveJimaEnvironment.txt
diff --git a/Client/EvaJima/EveJimaSettings.txt b/Client/EvaJima/EveJimaSettings.txt
diff --git a/Client/EvaJima/SettingPreRelease.txt b/Client/EvaJima/SettingPreRelease.txt
diff --git a/Client/EvaJima/Version.txt b/Client/EvaJima/Version.txt
@@ -1 +1 @@
-2.02
+1.38