Merge pull request #17718 from jasonmalinowski/repoutil-tweaks

RepoUtil tweaks

src/Tools/RepoUtil/VerifyCommand.cs

@@ -104,7 +104,7 @@ private bool VerifyGeneratedFiles(TextWriter writer, RepoData repoData)
                 var fileName = new FileName(_generateDirectory, data.RelativeFilePath);
                 var actualContent = File.ReadAllText(fileName.FullPath, GenerateUtil.Encoding);
                 var expectedContent = GenerateUtil.GenerateMSBuildContent(packages);
-                if (actualContent != expectedContent)
+                if (actualContent.Trim() != expectedContent.Trim())
                 {
                     writer.WriteLine($"{fileName.RelativePath} does not have the expected contents");
                     allGood = false;
@@ -112,7 +112,7 @@ private bool VerifyGeneratedFiles(TextWriter writer, RepoData repoData)
 
                 if (!allGood)
                 {
-                    writer.WriteLine($@"Generated contents out of date. Run ""RepoUtil.change"" to correct");
+                    writer.WriteLine($@"Generated contents out of date. Run ""RepoUtil change"" to correct");
                     return false;
                 }