Skip to content

Update framework to 4.8, fix DedicatedServerSettings.ini append bug, … #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roozbehghazavi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update framework to 4.8, fix DedicatedServerSettings.ini append bug, … #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CoJ/CoJ.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -11,7 +11,7 @@
<AssemblyName>CoJ2Controller</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publicar\</PublishUrl>
<Install>true</Install>
Expand All @@ -27,6 +27,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -37,6 +38,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>CoJ2Controller.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -47,6 +49,7 @@
<OutputPath>bin\Release\</OutputPath>
<DocumentationFile>CoJ2Controller.xml</DocumentationFile>
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<OptionExplicit>On</OptionExplicit>
Expand Down Expand Up @@ -171,6 +174,7 @@
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
Expand Down
22 changes: 14 additions & 8 deletions CoJ/My Project/Application.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions CoJ/My Project/Resources.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions CoJ/My Project/Settings.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions CoJ/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.diagnostics>
<sources>
Expand All @@ -12,14 +12,12 @@
</source>
</sources>
<switches>
<add name="DefaultSwitch" value="Information" />
<add name="DefaultSwitch" value="Information"/>
</switches>
<sharedListeners>
<add name="FileLog"
type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
initializeData="FileLogWriter"/>
<add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
<!-- Quite los comentarios de la sección posterior y reemplace APPLICATION_NAME con el nombre de su aplicación para escribir en el registro de eventos de la aplicación -->
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
</sharedListeners>
</system.diagnostics>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
4 changes: 1 addition & 3 deletions CoJ/frmConsola.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,9 +2167,7 @@ Public Class frmConsola
readerConfig.Close()

'**************Volvemos a escribir DedicatedServerSetting con otro orden de mapas***************
My.Computer.FileSystem.DeleteFile(ruta & "\CoJ2\DedicatedServerSettings.ini")

writer = File.AppendText(ruta & "\CoJ2\DedicatedServerSettings.ini")
writer = File.CreateText(ruta & "\CoJ2\DedicatedServerSettings.ini")

For i = 0 To NumLineas
writer.WriteLine(arrLineaLeida(i))
Expand Down
10 changes: 5 additions & 5 deletions CoJ/frmServerConfig.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,14 +466,14 @@ Public Class frmServerConfig
End If

For i = 0 To dgAdmins.Rows.Count - 2
If dgAdmins.Rows(i).Cells(0).Value IsNot Nothing And dgAdmins.Rows(i).Cells(1).Value IsNot Nothing And dgAdmins.Rows(i).Cells(2).Value IsNot Nothing Then
If dgAdmins.Rows(i).Cells(0).Value IsNot Nothing And dgAdmins.Rows(i).Cells(2).Value IsNot Nothing Then
adminsUserConfig = adminsUserConfig & dgAdmins.Rows(i).Cells(0).Value.ToString.Trim & ";;"
adminPassConfig = adminPassConfig & dgAdmins.Rows(i).Cells(1).Value.ToString.Trim & ";;"
adminPassConfig = adminPassConfig & If(dgAdmins.Rows(i).Cells(1).Value IsNot Nothing, dgAdmins.Rows(i).Cells(1).Value.ToString.Trim, "") & ";;"
adminLevelConfig = adminLevelConfig & dgAdmins.Rows(i).Cells(2).Value.ToString.Trim & ";;"
End If
Next

writer = File.AppendText(rutaAppData & "\Config\ServerAdmins.ini")
writer = File.CreateText(rutaAppData & "\Config\ServerAdmins.ini")

writer.WriteLine("//Next line was created by Mods CoJ. Do not modify!")
writer.WriteLine("//" & adminsUserConfig & "##" & adminPassConfig & "##" & adminLevelConfig & "##")
Expand All @@ -490,9 +490,9 @@ Public Class frmServerConfig
writer.WriteLine("")

For i = 0 To dgAdmins.Rows.Count - 2
If dgAdmins.Rows(i).Cells(0).Value IsNot Nothing And dgAdmins.Rows(i).Cells(1).Value IsNot Nothing And dgAdmins.Rows(i).Cells(2).Value IsNot Nothing Then
If dgAdmins.Rows(i).Cells(0).Value IsNot Nothing And dgAdmins.Rows(i).Cells(2).Value IsNot Nothing Then
adminsUserConfig = dgAdmins.Rows(i).Cells(0).Value.ToString.Trim
adminPassConfig = dgAdmins.Rows(i).Cells(1).Value.ToString.Trim
adminPassConfig = If(dgAdmins.Rows(i).Cells(1).Value IsNot Nothing, dgAdmins.Rows(i).Cells(1).Value.ToString.Trim, "")
adminLevelConfig = dgAdmins.Rows(i).Cells(2).Value.ToString.Trim

If adminLevelConfig = "Standard" Then
Expand Down