diff --git a/TrasferimentoProgrammiOkuma.App/Form1.vb b/TrasferimentoProgrammiOkuma.App/Form1.vb
index cbef23c..6f608dc 100644
--- a/TrasferimentoProgrammiOkuma.App/Form1.vb
+++ b/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
diff --git a/TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml b/TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml
index 56f1fba..14e90a0 100644
--- a/TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml
+++ b/TrasferimentoProgrammiOkuma.App/Properties/PublishProfiles/GiteaClickOnce.pubxml
@@ -16,9 +16,9 @@
LMEMoxaTransfer
Compomac SPA
Compomac SPA
- 1.0.6.0
+ 1.0.8.0
true
- 1.0.6.0
+ 1.0.8.0
true
false
true
diff --git a/TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj b/TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj
index 3335767..fc5f3d2 100644
--- a/TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj
+++ b/TrasferimentoProgrammiOkuma.App/TrasferimentoProgrammiOkuma.App.vbproj
@@ -9,7 +9,7 @@
LMEMoxaTransfer
Compomac SPA
Livio Merola
- 1.0.6.0
+ 1.0.8.0
Assets\app-icon.ico
Sub Main
true
diff --git a/clickonce/LMEMoxaTransfer.application b/clickonce/LMEMoxaTransfer.application
index c797a9a..e72b238 100644
--- a/clickonce/LMEMoxaTransfer.application
+++ b/clickonce/LMEMoxaTransfer.application
@@ -1,8 +1,8 @@
-
+
-
+
@@ -15,13 +15,13 @@
-
+
- mJjUvvN5hw6/tcW5g2EyJiI9EO8sPmyPuPztuzjUPCY=
+ Fidy9u1Ujs2fMtjGwGqvz3rbytRiCYEh3+PS7AZIbek=
diff --git a/clickonce/LMEMoxaTransfer.deps.json b/clickonce/LMEMoxaTransfer.deps.json
index 298ca6b..d4363d6 100644
--- a/clickonce/LMEMoxaTransfer.deps.json
+++ b/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": ""
diff --git a/clickonce/LMEMoxaTransfer.dll b/clickonce/LMEMoxaTransfer.dll
index cf329e1..2c71a0b 100644
Binary files a/clickonce/LMEMoxaTransfer.dll and b/clickonce/LMEMoxaTransfer.dll differ
diff --git a/clickonce/LMEMoxaTransfer.dll.manifest b/clickonce/LMEMoxaTransfer.dll.manifest
index 6b07c3d..9c6358b 100644
--- a/clickonce/LMEMoxaTransfer.dll.manifest
+++ b/clickonce/LMEMoxaTransfer.dll.manifest
@@ -1,6 +1,6 @@
-
+
@@ -315,13 +315,13 @@
yJ3y5ECYB7uvuObMawI53X3eO2J8qP27QuUvy6Mqb6Q=
-
+
- Q4QNVVMnrboRK/nE1I5KSdH9xm9grdRJVviEAibZY2w=
+ 42Tg6zl7VMQeCsxBQQIMhnEUhJn13gRs7tPhL8ZmSYw=
@@ -330,7 +330,7 @@
- dYrmcUD4rU7mO+e5LuUU1AXv/vbrRbxUUcjUqJvJ5XU=
+ TmtVByT1uHFnxBhwAZoFFVrPF0+ODWJnZ+20pIlEkWg=
diff --git a/clickonce/LMEMoxaTransfer.exe b/clickonce/LMEMoxaTransfer.exe
index 30ef9ed..0dbc006 100644
Binary files a/clickonce/LMEMoxaTransfer.exe and b/clickonce/LMEMoxaTransfer.exe differ
diff --git a/clickonce/LMEMoxaTransfer.pdb b/clickonce/LMEMoxaTransfer.pdb
index 67f7cb1..bd7ce81 100644
Binary files a/clickonce/LMEMoxaTransfer.pdb and b/clickonce/LMEMoxaTransfer.pdb differ