Skip to content

Commit d26ef58

Browse files
committed
Changed to .net6.
Fixed bug where whitespace breaks subfolder creation.
1 parent a6354c3 commit d26ef58

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

Split-FANUC-Program-Backup/Program.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ private static string BuildDate
2626
{
2727
buildDateTime = new DateTime(2000, 1, 1).AddDays(version.Build).AddSeconds(version.Revision * 2);
2828
}
29-
29+
3030
return buildDateTime.ToString("o");
3131
}
3232
}
3333

3434
private const string cncProgramFileExtension = ".CNC";
3535
private const string defaultCNCprogramName = "Unknown";
3636
private const char programDelimiter = '%';
37+
private static readonly char[] subFolderTrim = { ' ', '/' };
3738
private const int minimumProgramSize = 7;
3839

3940
/// <summary>
@@ -150,7 +151,7 @@ private static string GetProgramNameFromHeader(string cncProgramText)
150151
}
151152

152153
// Strip out the directory flag and slashes to get just the folder name.
153-
subFolder = Regex.Replace(line, directoryFlag, string.Empty).Trim('/');
154+
subFolder = Regex.Replace(line, directoryFlag, string.Empty).Trim(subFolderTrim);
154155
Directory.CreateDirectory(Path.Combine(outputFolder, subFolder));
155156

156157
// Don't append notation to next program

Split-FANUC-Program-Backup/Split-FANUC-Program-Backup.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<RootNamespace>SplitFANUCProgramBackup</RootNamespace>
77
<StartupObject></StartupObject>
88
<Deterministic>False</Deterministic>

0 commit comments

Comments
 (0)