Skip to content

Merge main into live #11992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 30, 2025
Merged

Merge main into live #11992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b459fc
fix build suggestions (#11985)
gewarren Oct 28, 2025
6d25720
Use Path.Combine and Environment.NewLine in GetVersionInfo examples (…
c0shea Oct 28, 2025
ccbfb85
GetCurrentDirectory example fix (#10710) (#11946)
kanilsz Oct 28, 2025
5524c68
Update Array.xml change ArgumentOutOfRangeException description for '…
Fast-Nick Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions snippets/csharp/System.Diagnostics/FileVersionInfo/Overview/source.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ class Class1
public static void Main(string[] args)
{
// Get the file version for the notepad.
// Use either of the two following commands.
FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"));
FileVersionInfo myFileVersionInfo = FileVersionInfo.GetVersionInfo(Environment.SystemDirectory + "\\Notepad.exe");
FileVersionInfo myFileVersionInfo = FileVersionInfo.GetVersionInfo(Path.Combine(Environment.SystemDirectory, "Notepad.exe"));

// Print the file name and version number.
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + '\n' +
Console.WriteLine("File: " + myFileVersionInfo.FileDescription + Environment.NewLine +
"Version number: " + myFileVersionInfo.FileVersion);
}
}
Expand Down
4 changes: 2 additions & 2 deletions snippets/csharp/System.IO/Directory/GetCurrentDirectory/dir_getcurdir.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static void Main()

// Change the current directory.
Environment.CurrentDirectory = (target);
if (path.Equals(Directory.GetCurrentDirectory()))
if (target.Equals(Directory.GetCurrentDirectory()))
{
Console.WriteLine("You are in the temp directory.");
}
Expand All @@ -34,4 +34,4 @@ public static void Main()
}
}
}
// </Snippet1>
// </Snippet1>
8 changes: 3 additions & 5 deletions snippets/visualbasic/System.Diagnostics/FileVersionInfo/Overview/source.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ Class Class1

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


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

End Sub
End Class

' </Snippet1>
' </Snippet1>
Loading