Skip to content

Commit 22a5728

Browse files
Merge pull request #11992 from dotnet/main
Merge main into live
2 parents 26cbc02 + 5524c68 commit 22a5728

File tree

5 files changed

+75
-79
lines changed

5 files changed

+75
-79
lines changed

snippets/csharp/System.Diagnostics/FileVersionInfo/Overview/source.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ class Class1
99
public static void Main(string[] args)
1010
{
1111
// Get the file version for the notepad.
12-
// Use either of the two following commands.
13-
FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"));
14-
FileVersionInfo myFileVersionInfo = FileVersionInfo.GetVersionInfo(Environment.SystemDirectory + "\\Notepad.exe");
12+
FileVersionInfo myFileVersionInfo = FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"));
1513

1614
// Print the file name and version number.
17-
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + '\n' +
15+
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + Environment.NewLine +
1816
"Version number: " + myFileVersionInfo.FileVersion);
1917
}
2018
}

snippets/csharp/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static void Main()
1919

2020
// Change the current directory.
2121
Environment.CurrentDirectory = (target);
22-
if (path.Equals(Directory.GetCurrentDirectory()))
22+
if (target.Equals(Directory.GetCurrentDirectory()))
2323
{
2424
Console.WriteLine("You are in the temp directory.");
2525
}
@@ -34,4 +34,4 @@ public static void Main()
3434
}
3535
}
3636
}
37-
// </Snippet1>
37+
// </Snippet1>

snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ Class Class1
88

99
Public Shared Sub Main(ByVal args() As String)
1010
' Get the file version for the notepad.
11-
' Use either of the following two commands.
12-
FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"))
13-
Dim myFileVersionInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(Environment.SystemDirectory + "\Notepad.exe")
11+
Dim myFileVersionInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"))
1412

1513

1614
' Print the file name and version number.
17-
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + vbLf + "Version number: " + myFileVersionInfo.FileVersion)
15+
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + Environment.NewLine + "Version number: " + myFileVersionInfo.FileVersion)
1816

1917
End Sub
2018
End Class
2119

22-
' </Snippet1>
20+
' </Snippet1>

0 commit comments

Comments
 (0)