From 8a47504210019596f9071b1397ecc30bc404abe8 Mon Sep 17 00:00:00 2001 From: Theano Petersen Date: Wed, 2 Jan 2019 11:36:09 -0800 Subject: [PATCH 1/3] replace paths with mydocs variable --- .../cs/program.cs | 6 +++++- .../cs/program.cs | 15 +++++++++------ .../cs/program.cs | 8 +++++--- .../system.io.enumdirs1/cs/program.cs | 5 +++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs index 0211a6c35ea..300f708d404 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs @@ -9,7 +9,11 @@ static void Main(string[] args) { try { - var files = from file in Directory.EnumerateFiles(@"c:\", "*.txt", SearchOption.AllDirectories) + // Set a variable to the My Documents path. + string mydocpath = + Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + + var files = from file in Directory.EnumerateFiles(@mydocpath, "*.txt", SearchOption.AllDirectories) from line in File.ReadLines(file) where line.Contains("Microsoft") select new diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs index 431680da14e..96966abffbc 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs @@ -1,4 +1,5 @@ -using System; +// +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,12 +11,14 @@ class Program { static void Main(string[] args) { -// -DirectoryInfo dirPrograms = new DirectoryInfo(@"c:\program files"); -DateTime StartOf2009 = new DateTime(2009, 01, 01); + // Set a variable to the My Documents path. + string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + + DirectoryInfo dirPrograms = new DirectoryInfo(@mydocpath); + DateTime StartOf2009 = new DateTime(2009, 01, 01); var dirs = from dir in dirPrograms.EnumerateDirectories() - where dir.CreationTimeUtc < StartOf2009 + where dir.CreationTimeUtc > StartOf2009 select new { ProgDir = dir, @@ -25,8 +28,8 @@ where dir.CreationTimeUtc < StartOf2009 { Console.WriteLine("{0}", di.ProgDir.Name); } -// } } } +// diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs index b05dd680830..5c0ce7e9422 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs @@ -6,7 +6,10 @@ class Program { static void Main(string[] args) { - DirectoryInfo diTop = new DirectoryInfo(@"d:\"); + // Set a variable to the My Documents path. + string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + + DirectoryInfo diTop = new DirectoryInfo(@mydocpath); try { foreach (var fi in diTop.EnumerateFiles()) @@ -65,5 +68,4 @@ static void Main(string[] args) } } } -// - +// \ No newline at end of file diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs index c19df54026a..d801cf21caa 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs @@ -10,9 +10,10 @@ private static void Main(string[] args) { try { - string dirPath = @"\\archives\2009\reports"; + // Set a variable to the My Documents path. + string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - List dirs = new List(Directory.EnumerateDirectories(dirPath)); + List dirs = new List(Directory.EnumerateDirectories(mydocpath)); foreach (var dir in dirs) { From 4008a66301248760543b6683937a5b09bbcb3802 Mon Sep 17 00:00:00 2001 From: Ron Petrusha Date: Fri, 4 Jan 2019 15:27:41 -0800 Subject: [PATCH 2/3] Apply suggestions from code review Co-Authored-By: v-thepet --- .../system.io.directory.enumeratefiles/cs/program.cs | 10 +++++----- .../system.io.directoryinfo.enumdirs/cs/program.cs | 2 +- .../cs/program.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs index 300f708d404..6bc79df2914 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs @@ -9,11 +9,11 @@ static void Main(string[] args) { try { - // Set a variable to the My Documents path. - string mydocpath = - Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + // Set a variable to the My Documents path. + string mydocpath = + Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - var files = from file in Directory.EnumerateFiles(@mydocpath, "*.txt", SearchOption.AllDirectories) + var files = from file in Directory.EnumerateFiles(mydocpath, "*.txt", SearchOption.AllDirectories) from line in File.ReadLines(file) where line.Contains("Microsoft") select new @@ -38,4 +38,4 @@ where line.Contains("Microsoft") } } } -// \ No newline at end of file +// diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs index 96966abffbc..5270df94139 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs @@ -14,7 +14,7 @@ static void Main(string[] args) // Set a variable to the My Documents path. string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - DirectoryInfo dirPrograms = new DirectoryInfo(@mydocpath); + DirectoryInfo dirPrograms = new DirectoryInfo(mydocpath); DateTime StartOf2009 = new DateTime(2009, 01, 01); var dirs = from dir in dirPrograms.EnumerateDirectories() diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs index 5c0ce7e9422..2fbca299144 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs @@ -9,7 +9,7 @@ static void Main(string[] args) // Set a variable to the My Documents path. string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - DirectoryInfo diTop = new DirectoryInfo(@mydocpath); + DirectoryInfo diTop = new DirectoryInfo(mydocpath); try { foreach (var fi in diTop.EnumerateFiles()) @@ -68,4 +68,4 @@ static void Main(string[] args) } } } -// \ No newline at end of file +// From 6c8557fdb08684cec8ebe39bf9769fe2d883a8e6 Mon Sep 17 00:00:00 2001 From: Theano Petersen Date: Fri, 4 Jan 2019 15:56:22 -0800 Subject: [PATCH 3/3] fixes per review --- .../cs/program.cs | 12 ++++---- .../cs/program.cs | 28 +++++++++---------- .../cs/program.cs | 6 ++-- .../system.io.enumdirs1/cs/program.cs | 4 +-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs index 300f708d404..46bdcb974c4 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs @@ -9,11 +9,11 @@ static void Main(string[] args) { try { - // Set a variable to the My Documents path. - string mydocpath = - Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + // Set a variable to the My Documents path. + string docPath = + Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - var files = from file in Directory.EnumerateFiles(@mydocpath, "*.txt", SearchOption.AllDirectories) + var files = from file in Directory.EnumerateFiles(docPath, "*.txt", SearchOption.AllDirectories) from line in File.ReadLines(file) where line.Contains("Microsoft") select new @@ -26,7 +26,7 @@ where line.Contains("Microsoft") { Console.WriteLine("{0}\t{1}", f.File, f.Line); } - Console.WriteLine("{0} files found.", files.Count().ToString()); + Console.WriteLine("{0} files found.", files.Count().ToString()); } catch (UnauthorizedAccessException UAEx) { @@ -38,4 +38,4 @@ where line.Contains("Microsoft") } } } -// \ No newline at end of file +// diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs index 96966abffbc..b667e1fe2b9 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs @@ -11,23 +11,23 @@ class Program { static void Main(string[] args) { - // Set a variable to the My Documents path. - string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + // Set a variable to the My Documents path. + string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - DirectoryInfo dirPrograms = new DirectoryInfo(@mydocpath); - DateTime StartOf2009 = new DateTime(2009, 01, 01); + DirectoryInfo dirPrograms = new DirectoryInfo(docPath); + DateTime StartOf2009 = new DateTime(2009, 01, 01); -var dirs = from dir in dirPrograms.EnumerateDirectories() - where dir.CreationTimeUtc > StartOf2009 - select new - { - ProgDir = dir, - }; + var dirs = from dir in dirPrograms.EnumerateDirectories() + where dir.CreationTimeUtc > StartOf2009 + select new + { + ProgDir = dir, + }; -foreach (var di in dirs) -{ - Console.WriteLine("{0}", di.ProgDir.Name); -} + foreach (var di in dirs) + { + Console.WriteLine("{0}", di.ProgDir.Name); + } } } diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs index 5c0ce7e9422..7436139784b 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs @@ -7,9 +7,9 @@ class Program static void Main(string[] args) { // Set a variable to the My Documents path. - string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - DirectoryInfo diTop = new DirectoryInfo(@mydocpath); + DirectoryInfo diTop = new DirectoryInfo(docPath); try { foreach (var fi in diTop.EnumerateFiles()) @@ -68,4 +68,4 @@ static void Main(string[] args) } } } -// \ No newline at end of file +// diff --git a/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs b/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs index d801cf21caa..2eac85214ed 100644 --- a/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs +++ b/snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs @@ -11,9 +11,9 @@ private static void Main(string[] args) try { // Set a variable to the My Documents path. - string mydocpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - List dirs = new List(Directory.EnumerateDirectories(mydocpath)); + List dirs = new List(Directory.EnumerateDirectories(docPath)); foreach (var dir in dirs) {