Skip to content

Commit

Permalink
Merge pull request #19 from dmitryvhf/bug/issue-18
Browse files Browse the repository at this point in the history
Issue #18 resolved; MultiSellEditor crash problem; update TargetFrame…
  • Loading branch information
dmitryvhf authored Jan 27, 2020
2 parents 9725694 + cd8e7f7 commit 8d31ad3
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 13 deletions.
10 changes: 7 additions & 3 deletions L2ScriptMaker/L2ScriptMaker.vbproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -23,7 +23,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
<OptionInfer>On</OptionInfer>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
Expand All @@ -44,6 +44,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -60,6 +61,7 @@
<RunCodeAnalysis>false</RunCodeAnalysis>
<WarningLevel>1</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
Expand All @@ -73,6 +75,7 @@
<DebugSymbols>false</DebugSymbols>
<WarningLevel>1</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
Expand Down Expand Up @@ -946,6 +949,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>
Expand Down Expand Up @@ -999,7 +1003,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties Reactor_Output="[output_dir]L2ScriptMaker_Secure\L2ScriptMaker.exe" Reactor_Project="" Reactor_Commands="" Reactor_Automatic="1" Reactor_Lib="0" Reactor_Enabled="0" />
<UserProperties Reactor_Enabled="0" Reactor_Lib="0" Reactor_Automatic="1" Reactor_Commands="" Reactor_Project="" Reactor_Output="[output_dir]L2ScriptMaker_Secure\L2ScriptMaker.exe" />
</VisualStudio>
</ProjectExtensions>
</Project>
9 changes: 8 additions & 1 deletion L2ScriptMaker/L2ScriptMakerLibraries.vb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Public Class Libraries

End Function

Shared Function GetCommentaryFromStr(ByVal SourceStr As String) As String
Private Shared Function GetCommentaryFromStr(ByVal SourceStr As String) As String

GetCommentaryFromStr = Nothing
Dim sTempCommentary As String = ""
Expand All @@ -21,6 +21,7 @@ Public Class Libraries
Return GetCommentaryFromStr

End Function

Shared Function SetNeedParamToStr(ByVal SourceStr As String, ByVal Param As String, ByVal Value As String) As String

Dim sTemp As String
Expand Down Expand Up @@ -73,6 +74,12 @@ Public Class Libraries

FirstPos = InStr(1, SourceStr, " " & MaskStr & "=") ' + 1
If FirstPos = Nothing Then 'Or FirstPos = 0

If SourceStr.StartsWith(MaskStr) Then
GetNeedParamFromStr = SourceStr.Remove(0, MaskStr.Length + 1).Trim()
Exit Function
End If

GetNeedParamFromStr = ""
Exit Function
End If
Expand Down
2 changes: 1 addition & 1 deletion L2ScriptMaker/My Project/Application.Designer.vb

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

6 changes: 3 additions & 3 deletions L2ScriptMaker/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Imports System.Runtime.InteropServices

' Review the values of the assembly attributes

<Assembly: AssemblyTitle("L2ScriptMaker (C4 Support)")>
<Assembly: AssemblyDescription("Tool for generate Lineage II server configuraion files. Contact: mailto:[email protected] Subject: L2ScriptMaker. Official site: http://l2scriptmaker.spaces.live.com/ Donation page: http://dragon.ur.ru/l2sm")>
<Assembly: AssemblyTitle("L2ScriptMaker (C4 Support)")>
<Assembly: AssemblyDescription("Tool for generate Lineage II server configuraion files")>
<Assembly: AssemblyCompany("HellFire Lair")>
<Assembly: AssemblyProduct("L2ScriptMaker")>
<Assembly: AssemblyCopyright("Copyright © HellFire '2005")>
Expand All @@ -34,4 +34,4 @@ Imports System.Runtime.InteropServices
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("4.0.53.*")>
<Assembly: AssemblyFileVersion("4.0.53.2")>
<Assembly: AssemblyFileVersion("4.0.53.3")>
22 changes: 20 additions & 2 deletions L2ScriptMaker/My Project/Resources.Designer.vb

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

6 changes: 3 additions & 3 deletions L2ScriptMaker/My Project/Settings.Designer.vb

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

23 changes: 23 additions & 0 deletions L2ScriptMaker/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.diagnostics>
<sources>
<!-- This section defines the logging configuration for My.Application.Log -->
<source name="DefaultSource" switchName="DefaultSwitch">
<listeners>
<add name="FileLog"/>
<!-- Uncomment the below section to write to the Application Event Log -->
<!--<add name="EventLog"/>-->
</listeners>
</source>
</sources>
<switches>
<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"/>
<!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
</sharedListeners>
</system.diagnostics>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

0 comments on commit 8d31ad3

Please sign in to comment.