From 503e61db70aeef46b9b4e3b5c1dee79d0194ddc9 Mon Sep 17 00:00:00 2001 From: Mikkel Nylander Bundgaard Date: Wed, 24 Apr 2019 22:26:26 +0200 Subject: [PATCH 1/2] Correct typo and align the comment across languages (#848) --- .../System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp | 4 ++-- .../System.Windows.Forms.UserInputWalkthrough/CS/form1.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp b/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp index 64aeae3c951..ddebd119d3c 100644 --- a/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp +++ b/snippets/cpp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/cpp/form1.cpp @@ -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) { diff --git a/snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs b/snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs index f82aeea1d7a..9d1c797eb78 100644 --- a/snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs +++ b/snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.UserInputWalkthrough/CS/form1.cs @@ -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); @@ -696,4 +696,4 @@ private void LinkLabelDrag_GiveFeedback(object sender, } } } -// \ No newline at end of file +// From b136710ccdb454f8d471af71ae04bee56191cf69 Mon Sep 17 00:00:00 2001 From: Maira Wenzel Date: Wed, 24 Apr 2019 16:48:18 -0700 Subject: [PATCH 2/2] fix min DWORD value (#843) * fix min DWORD value * fix min DWORD value --- .../csharp/framework/migration-guide/versions-installed3.cs | 2 +- .../framework/migration-guide/versions-installed3.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snippets/csharp/framework/migration-guide/versions-installed3.cs b/snippets/csharp/framework/migration-guide/versions-installed3.cs index e5a77cc0f88..224639aa74d 100644 --- a/snippets/csharp/framework/migration-guide/versions-installed3.cs +++ b/snippets/csharp/framework/migration-guide/versions-installed3.cs @@ -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"; diff --git a/snippets/visualbasic/framework/migration-guide/versions-installed3.vb b/snippets/visualbasic/framework/migration-guide/versions-installed3.vb index 9d2e0b94eef..a3356e8e736 100644 --- a/snippets/visualbasic/framework/migration-guide/versions-installed3.vb +++ b/snippets/visualbasic/framework/migration-guide/versions-installed3.vb @@ -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"