Remove dependency on System.ValueTuple

mlaily · Jun 10, 2018 · c466911 · c466911
1 parent 339ad6c
commit c466911
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/MovieBarCodeGenerator/CLI/CLIUtils.cs b/MovieBarCodeGenerator/CLI/CLIUtils.cs
@@ -10,6 +10,11 @@ namespace MovieBarCodeGenerator.CLI
 {
     public static class CLIUtils
     {
+        private class WildCardInput
+        {
+            public string PathPartWithoutWildcards { get; set; }
+            public string FilePattern { get; set; }
+        }
         /// <summary>
         /// the accepted input can be:
         /// - a simple file path
@@ -26,8 +31,8 @@ public static IEnumerable<string> GetExpandedAndValidatedFilePaths(IEnumerable<s
                 return Enumerable.Empty<string>();
             }
 
-            List<(string PathPartWithoutWildcards, string FilePattern)> allInputFiles
-                = new List<(string PathPartWithoutWildcards, string FilePattern)>();
+            List<WildCardInput> allInputFiles
+                = new List<WildCardInput>();
             // At this point, the input files list might contain wildcards needing to be expanded.
             // To do that, we either keep just the file path,
             // or, if the path contains a wildcard, we split the directory path and the file pattern:
@@ -44,7 +49,7 @@ public static IEnumerable<string> GetExpandedAndValidatedFilePaths(IEnumerable<s
                     }
                     inputPattern = Path.GetFileName(item);
                 }
-                allInputFiles.Add((rawInputWithoutWildCards, inputPattern));
+                allInputFiles.Add(new WildCardInput { PathPartWithoutWildcards = rawInputWithoutWildCards, FilePattern = inputPattern });
             }
 
             IEnumerable<string> LazyEnumeration()

diff --git a/MovieBarCodeGenerator/MovieBarCodeGenerator.csproj b/MovieBarCodeGenerator/MovieBarCodeGenerator.csproj
@@ -39,9 +39,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />