Skip to content

Update live with current master #849

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 2 commits into from
Apr 25, 2019
Merged

Update live with current master #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
503e61d
Correct typo and align the comment across languages (#848)
mikkelbu Apr 24, 2019
b136710
fix min DWORD value (#843)
mairaw Apr 24, 2019
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
4 changes: 2 additions & 2 deletions snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ namespace UserInputWalkthrough
}
}

// All-purpose method for displaying a line of text in the
// text boxe.
// All-purpose method for displaying a line of text in one of the
// text boxes.
private:
void DisplayLine(String^ line)
{
Expand Down
6 changes: 3 additions & 3 deletions snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ private void CheckAllChildCheckBoxes(Control parent, bool value)
}
}

// All-purpose method for displaying a line of text in the
// text boxe.
// All-purpose method for displaying a line of text in one of the
// text boxes.
private void DisplayLine(string line)
{
TextBoxOutput.AppendText(line);
Expand Down Expand Up @@ -696,4 +696,4 @@ private void LinkLabelDrag_GiveFeedback(object sender,
}
}
}
// </Snippet0>
// </Snippet0>
2 changes: 1 addition & 1 deletion snippets/csharp/framework/migration-guide/versions-installed3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private static void Get45PlusFromRegistry()
// Checking the version using >= enables forward compatibility.
string CheckFor45PlusVersion(int releaseKey)
{
if (releaseKey >= 528049)
if (releaseKey >= 528040)
return "4.8 or later";
if (releaseKey >= 461808)
return "4.7.2";
Expand Down
2 changes: 1 addition & 1 deletion snippets/visualbasic/framework/migration-guide/versions-installed3.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Public Module GetDotNetVersion

' Checking the version using >= will enable forward compatibility.
Private Function CheckFor45PlusVersion(releaseKey As Integer) As String
If releaseKey >= 528049 Then
If releaseKey >= 528040 Then
Return "4.8 or later"
Else If releaseKey >= 461808 Then
Return "4.7.2"
Expand Down