Update dependencies.

Wrap text fix. LINQPad 5 files enumeration works the same as for LINQPad 6. LPRun 6.14.10
i2van · Jul 19, 2021 · fc8626d · fc8626d
1 parent 439306b
commit fc8626d
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 61 deletions.
diff --git a/Deploy/buildlpx.cmd b/Deploy/buildlpx.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set version=6.14.0
+set version=6.14.1
 set fileName=CsvLINQPadDriver.%version%.lpx
 
 set zip="%ProgramFiles%\7-Zip\7z.exe"

diff --git a/Src/CsvLINQPadDriver/Bcl/Extensions/DirectoryExtensions.cs b/Src/CsvLINQPadDriver/Bcl/Extensions/DirectoryExtensions.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using CsvLINQPadDriver.Extensions;
+
+namespace CsvLINQPadDriver.Bcl.Extensions
+{
+    internal static class DirectoryExtensions
+    {
+        public static IEnumerable<string> EnumerateFiles(this ICollection<Exception>? exceptions, string path, string searchPattern, SearchOption searchOption)
+        {
+            var directories = new Queue<string>(new[] { path });
+
+            while (directories.Any())
+            {
+                var currentDirectory = directories.Dequeue();
+
+                if (searchOption == SearchOption.AllDirectories)
+                {
+                    try
+                    {
+                        foreach (var directory in Directory.EnumerateDirectories(currentDirectory))
+                        {
+                            directories.Enqueue(directory);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        exceptions?.Add(e);
+                        continue;
+                    }
+                }
+
+                foreach (var file in Directory.EnumerateFiles(currentDirectory, searchPattern).SkipExceptions(exceptions))
+                {
+                    yield return file;
+                }
+            }
+        }
+    }
+}
diff --git a/...iver/Microsoft.Bcl/ImmutableExtensions.cs → ...ver/Bcl/Extensions/ImmutableExtensions.cs b/...iver/Microsoft.Bcl/ImmutableExtensions.cs → ...ver/Bcl/Extensions/ImmutableExtensions.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace CsvLINQPadDriver.Microsoft.Bcl
+namespace CsvLINQPadDriver.Bcl.Extensions
 {
     internal static class ImmutableExtensions
     {

diff --git a/...cl/System.Private.CoreLib/System/Index.cs → ...ft/System.Private.CoreLib/System/Index.cs b/...cl/System.Private.CoreLib/System/Index.cs → ...ft/System.Private.CoreLib/System/Index.cs
diff --git a/...cl/System.Private.CoreLib/System/Range.cs → ...ft/System.Private.CoreLib/System/Range.cs b/...cl/System.Private.CoreLib/System/Range.cs → ...ft/System.Private.CoreLib/System/Range.cs
@@ -1,4 +1,4 @@
-// https://raw.githubusercontent.com/dotnet/runtime/main/src/libraries/System.Private.CoreLib/src/System/Range.cs
+// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Range.cs
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.

diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs b/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
@@ -17,7 +17,7 @@
 #if NETCOREAPP
 using System.Collections.Immutable;
 #else
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver.CodeGen

diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml b/Src/CsvLINQPadDriver/ConnectionDialog.xaml
@@ -220,11 +220,11 @@
                                 <TextBlock>
                                     <TextBlock.Style>
                                         <Style TargetType="{x:Type TextBlock}">
-                                            <Setter Property="Text" Value="⮨"/>
+                                            <Setter Property="Text" Value="{x:Static this:ConnectionDialog.WrapText}"/>
                                             <Setter Property="ToolTip" Value="Turn on word wrap (Ctrl+W)"/>
                                             <Style.Triggers>
                                                 <DataTrigger Binding="{Binding TextWrapping, ElementName=FilesTextBox}" Value="Wrap">
-                                                    <Setter Property="Text" Value="➞"/>
+                                                    <Setter Property="Text" Value="{x:Static this:ConnectionDialog.UnwrapText}"/>
                                                     <Setter Property="ToolTip" Value="Turn off word wrap (Ctrl+W)"/>
                                                 </DataTrigger>
                                             </Style.Triggers>

diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs b/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
@@ -38,6 +38,12 @@ internal partial class ConnectionDialog
         public static readonly RoutedUICommand PasteWithFolderAndItsSubfoldersCommand = new();
         public static readonly RoutedUICommand WrapFilesTextCommand = new();
 
+        private static T IfWin10<T>(T ifTrue, T ifFalse) =>
+            Environment.OSVersion.Version.Major >= 10 ? ifTrue : ifFalse;
+
+        public static readonly string WrapText   = IfWin10("⭹", "Wrap");
+        public static readonly string UnwrapText = IfWin10("⭲", "Unwrap");
+
         public static readonly string WildcardsToolTip = $"Type one file/folder per line. Wildcards ? and * are supported; {FileExtensions.DefaultRecursiveMask} searches in folder and its sub-folders";
 
         private bool _addFolderAndItsSubfoldersDialogOpened;

diff --git a/Src/CsvLINQPadDriver/CsvDataContextDriver.cs b/Src/CsvLINQPadDriver/CsvDataContextDriver.cs
@@ -13,7 +13,7 @@
 #if NETCOREAPP
 using System.Collections.Immutable;
 #else
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver

diff --git a/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj b/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Microsoft.Bcl\**" />
+    <Compile Remove="Bcl\**" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs b/Src/CsvLINQPadDriver/DataDisplay/CsvRowMemberProvider.cs
@@ -12,7 +12,7 @@
 #if NETCOREAPP
 using System.Collections.Immutable;
 #else
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver.DataDisplay

diff --git a/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs b/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
@@ -10,7 +10,7 @@
 #if NETCOREAPP
 using System.Collections.Immutable;
 #else
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver.DataModel

diff --git a/Src/CsvLINQPadDriver/Directory.Build.props b/Src/CsvLINQPadDriver/Directory.Build.props
@@ -1,8 +1,7 @@
 <Project>
   <PropertyGroup>
-    <Version>6.14.0</Version>
-    <PackageReleaseNotes>Added use record type option.
-Generation string comparison can be used for comparing interned strings.</PackageReleaseNotes>
+    <Version>6.14.1</Version>
+    <PackageReleaseNotes>Bugfixes.</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -40,7 +39,7 @@ Generation string comparison can be used for comparing interned strings.</Packag
     </PackageReference>
     <PackageReference Include="LINQPad.Reference" Version="1.1.0" />
     <PackageReference Include="Microsoft-WindowsAPICodePack-Core" Version="1.1.4" />
-    <PackageReference Include="UnicodeCharsetDetector.Standard" Version="1.0.1" />
+    <PackageReference Include="UnicodeCharsetDetector.Standard" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Src/CsvLINQPadDriver/Extensions/EnumerableExtensions.cs b/Src/CsvLINQPadDriver/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace CsvLINQPadDriver.Extensions
+{
+    internal static class EnumerableExtensions
+    {
+        public static IEnumerable<T> SkipExceptions<T>(this IEnumerable<T> source, ICollection<Exception>? exceptions = null)
+        {
+            using var enumerator = source.GetEnumerator();
+
+            while (true)
+            {
+                try
+                {
+                    if (!enumerator.MoveNext())
+                    {
+                        break;
+                    }
+                }
+                catch (Exception exception)
+                {
+                    exceptions?.Add(exception);
+                    continue;
+                }
+
+                yield return enumerator.Current;
+            }
+        }
+    }
+}
diff --git a/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs b/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs
@@ -19,7 +19,7 @@
 #if NETCOREAPP
 using System.Collections.Immutable;
 #else
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver.Extensions
@@ -414,14 +414,17 @@ private static IEnumerable<string> EnumFiles(string path, ICollection<Exception>
                     baseDir = Path.GetDirectoryName(path) ?? string.Empty;
                 }
 
-                return !Directory.Exists(baseDir)
-                        ? Enumerable.Empty<string>()
-                        : Directory
-                            .EnumerateFiles(baseDir, fileOrMask,
-                                Path.GetFileNameWithoutExtension(fileOrMask).Contains(RecursiveMaskMarker)
-                                    ? SearchOption.AllDirectories
-                                    : SearchOption.TopDirectoryOnly)
-                            .SafeWalk(exceptions);
+                return
+#if NETCOREAPP
+                    Directory
+#else
+                    exceptions
+#endif
+                        .EnumerateFiles(baseDir, fileOrMask,
+                            Path.GetFileNameWithoutExtension(fileOrMask).Contains(RecursiveMaskMarker)
+                                ? SearchOption.AllDirectories
+                                : SearchOption.TopDirectoryOnly)
+                        .SkipExceptions(exceptions);
             }
             catch (Exception exception)
             {
@@ -431,31 +434,6 @@ private static IEnumerable<string> EnumFiles(string path, ICollection<Exception>
             }
         }
 
-        private static IEnumerable<T> SafeWalk<T>(this IEnumerable<T> source, ICollection<Exception>? exceptions = null)
-        {
-            using var enumerator = source.GetEnumerator();
-
-            bool? hasCurrent;
-
-            do
-            {
-                try
-                {
-                    hasCurrent = enumerator.MoveNext();
-                }
-                catch (Exception exception)
-                {
-                    exceptions?.Add(exception);
-                    hasCurrent = null;
-                }
-
-                if (hasCurrent is true)
-                {
-                    yield return enumerator.Current;
-                }
-            } while (hasCurrent ?? true);
-        }
-
         private static IEnumerable<string[]> CsvReadRows(
             string fileName,
             char? csvSeparator,

diff --git a/Src/CsvLINQPadDriver/SchemaBuilder.cs b/Src/CsvLINQPadDriver/SchemaBuilder.cs
@@ -18,7 +18,7 @@
 using System.IO;
 using Microsoft.CSharp;
 
-using CsvLINQPadDriver.Microsoft.Bcl;
+using CsvLINQPadDriver.Bcl.Extensions;
 #endif
 
 namespace CsvLINQPadDriver

diff --git a/Src/CsvLINQPadDriver/app.manifest b/Src/CsvLINQPadDriver/app.manifest
@@ -8,7 +8,7 @@
 
     <assemblyIdentity
         name="CsvLINQPadDriver"
-        version="6.14.0.0"
+        version="6.14.1.0"
         type="win32"
     />
 

diff --git a/Src/LPRun/Context.cs b/Src/LPRun/Context.cs
@@ -10,14 +10,16 @@ namespace LPRun
     public static class Context
     {
         private static readonly string BaseDir = GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath)!;
+
         private static readonly string LpRunDir = GetFullPath("LPRun");
+        private static readonly string LpRunExe = $"LPRun6{(Environment.Is64BitProcess ? string.Empty : "-x86")}.exe";
 
         private static readonly string ExeDir = GetLpRunFullPath("Bin");
         private static readonly string TemplatesDir = GetLpRunFullPath("Templates");
         private static readonly string DataDir = GetLpRunFullPath("Data");
 
         public static string FilesDir { get; } = GetLpRunFullPath("Files");
-        public static string Exe { get; } = Combine(ExeDir, GetLpRunExe());
+        public static string Exe { get; } = Combine(ExeDir, LpRunExe);
 
         public static string GetExeFullPath(string path) =>
             Combine(ExeDir, path);
@@ -36,10 +38,5 @@ public static string GetFullPath(string path) =>
 
         private static string GetLpRunFullPath(string path) =>
             Combine(LpRunDir, path);
-
-        private static string GetLpRunExe() =>
-            Environment.Is64BitProcess
-                ? "LPRun6.exe"
-                : "LPRun6-x86.exe";
     }
 }
diff --git a/Src/LPRun/Directory.Build.props b/Src/LPRun/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <Version>6.14.10</Version>
+    <PackageReleaseNotes>LPRun 6.14.10</PackageReleaseNotes>
+  </PropertyGroup>
+</Project>
diff --git a/Src/LPRun/LPRun.csproj b/Src/LPRun/LPRun.csproj
@@ -17,11 +17,7 @@
     <Description>LINQPad driver LPRun unit/integration tests runner.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/i2van/CsvLINQPadDriver</RepositoryUrl>
-    <PackageReleaseNotes>LPRun 6.13.13 NuGet fixes.</PackageReleaseNotes>
     <Copyright>Copyright © 2021 Ivan Ivon, LINQPad/LPRun by Joseph Albahari</Copyright>
-    <AssemblyVersion>6.13.14.0</AssemblyVersion>
-    <FileVersion>6.13.14.0</FileVersion>
-    <Version>6.13.14</Version>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 

diff --git a/Src/LPRun/LPRun/Bin/LINQPad.Runtime.dll b/Src/LPRun/LPRun/Bin/LINQPad.Runtime.dll
diff --git a/Src/LPRun/LPRun/Bin/LPRun6-x86.exe b/Src/LPRun/LPRun/Bin/LPRun6-x86.exe
diff --git a/Src/LPRun/LPRun/Bin/LPRun6.exe b/Src/LPRun/LPRun/Bin/LPRun6.exe
diff --git a/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj b/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
@@ -66,7 +66,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="LPRun" Version="6.13.14" />
+    <PackageReference Include="LPRun" Version="6.14.10" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="NUnit" Version="3.13.2" />