Correggi visualizzazione a capo editor Okuma

TrasferimentoProgrammiOkuma.App/Form1.vb

@@ -443,24 +443,26 @@ Public Class Form1
 
     Private Shared Function ToVisibleControlText(content As String) As String
         Dim builder As New StringBuilder(content.Length)
-        For Each ch In content
+        Dim i = 0
+        While i < content.Length
+            Dim ch = content(i)
             Select Case AscW(ch)
-                Case &H0
-                    builder.Append("[NUL]")
                 Case &HA
-                    builder.Append("[LF]")
+                    builder.Append(Environment.NewLine)
                 Case &HD
-                    builder.Append("[CR]")
+                    If i + 1 < content.Length AndAlso content(i + 1) = ControlChars.Lf Then
+                        i += 1
+                    End If
+                    builder.Append(Environment.NewLine)
                 Case &H12
                     builder.Append("[DC2]")
                 Case &H14
                     builder.Append("[DC4]")
-                Case 1 To 8, 11, 12, 14 To 17, 19, 21 To 31
-                    builder.Append($"[0x{AscW(ch):X2}]")
                 Case Else
                     builder.Append(ch)
             End Select
-        Next
+            i += 1
+        End While
         Return builder.ToString()
     End Function
 
@@ -489,15 +491,6 @@ Public Class Form1
 
     Private Shared Function TryParseControlToken(token As String, ByRef controlChar As Char) As Boolean
         Select Case token.Trim().ToUpperInvariant()
-            Case "NUL"
-                controlChar = ChrW(&H0)
-                Return True
-            Case "LF"
-                controlChar = ControlChars.Lf
-                Return True
-            Case "CR"
-                controlChar = ControlChars.Cr
-                Return True
             Case "DC2"
                 controlChar = ChrW(&H12)
                 Return True
@@ -506,14 +499,6 @@ Public Class Form1
                 Return True
         End Select
 
-        If token.StartsWith("0x", StringComparison.OrdinalIgnoreCase) Then
-            Dim value As Integer
-            If Integer.TryParse(token.Substring(2), Globalization.NumberStyles.HexNumber, Globalization.CultureInfo.InvariantCulture, value) AndAlso value >= 0 AndAlso value <= 31 Then
-                controlChar = ChrW(value)
-                Return True
-            End If
-        End If
-
         controlChar = ControlChars.NullChar
         Return False
     End Function

TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml

@@ -16,9 +16,9 @@
     <ProductName>LMEMoxaTransfer</ProductName>
     <PublisherName>Compomac SPA</PublisherName>
     <SuiteName>Compomac SPA</SuiteName>
-    <ApplicationVersion>1.0.6.0</ApplicationVersion>
+    <ApplicationVersion>1.0.8.0</ApplicationVersion>
     <UpdateRequired>true</UpdateRequired>
-    <MinimumRequiredVersion>1.0.6.0</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.8.0</MinimumRequiredVersion>
     <GenerateManifests>true</GenerateManifests>
     <PublishSingleFile>false</PublishSingleFile>
     <SelfContained>true</SelfContained>

TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj

@@ -9,7 +9,7 @@
     <AssemblyTitle>LMEMoxaTransfer</AssemblyTitle>
     <Company>Compomac SPA</Company>
     <Authors>Livio Merola</Authors>
-    <Version>1.0.6.0</Version>
+    <Version>1.0.8.0</Version>
     <ApplicationIcon>Assets\app-icon.ico</ApplicationIcon>
     <StartupObject>Sub Main</StartupObject>
     <UseWindowsForms>true</UseWindowsForms>

clickonce/LMEMoxaTransfer.application

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="LMEMoxaTransfer.application" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="LMEMoxaTransfer.application" version="1.0.8.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="Compomac SPA" co.v1:suiteName="Compomac SPA" asmv2:product="LMEMoxaTransfer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" minimumRequiredVersion="1.0.6.0">
+  <deployment install="true" minimumRequiredVersion="1.0.8.0">
     <subscription>
       <update>
         <beforeApplicationStartup />
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="LMEMoxaTransfer.dll.manifest" size="108976">
-      <assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.8.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>mJjUvvN5hw6/tcW5g2EyJiI9EO8sPmyPuPztuzjUPCY=</dsig:DigestValue>
+        <dsig:DigestValue>Fidy9u1Ujs2fMtjGwGqvz3rbytRiCYEh3+PS7AZIbek=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

clickonce/LMEMoxaTransfer.deps.json

@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v8.0": {},
     ".NETCoreApp,Version=v8.0/win-x64": {
-      "LMEMoxaTransfer/1.0.6.0": {
+      "LMEMoxaTransfer/1.0.8.0": {
         "dependencies": {
           "runtimepack.Microsoft.NETCore.App.Runtime.win-x64": "8.0.29",
           "runtimepack.Microsoft.WindowsDesktop.App.Runtime.win-x64": "8.0.29"
@@ -964,7 +964,7 @@
     }
   },
   "libraries": {
-    "LMEMoxaTransfer/1.0.6.0": {
+    "LMEMoxaTransfer/1.0.8.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

clickonce/LMEMoxaTransfer.dll.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.6.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="LMEMoxaTransfer.exe" version="1.0.8.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="Assets\app-icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
@@ -315,13 +315,13 @@
       <dsig:DigestValue>yJ3y5ECYB7uvuObMawI53X3eO2J8qP27QuUvy6Mqb6Q=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="LMEMoxaTransfer.dll" size="75264">
+  <file name="LMEMoxaTransfer.dll" size="74752">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>Q4QNVVMnrboRK/nE1I5KSdH9xm9grdRJVviEAibZY2w=</dsig:DigestValue>
+      <dsig:DigestValue>42Tg6zl7VMQeCsxBQQIMhnEUhJn13gRs7tPhL8ZmSYw=</dsig:DigestValue>
     </hash>
   </file>
   <file name="LMEMoxaTransfer.exe" size="161280">
@@ -330,7 +330,7 @@
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>dYrmcUD4rU7mO+e5LuUU1AXv/vbrRbxUUcjUqJvJ5XU=</dsig:DigestValue>
+      <dsig:DigestValue>TmtVByT1uHFnxBhwAZoFFVrPF0+ODWJnZ+20pIlEkWg=</dsig:DigestValue>
     </hash>
   </file>
   <file name="Microsoft.CSharp.dll" size="1005352">