Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions XmlDocConflictResolver/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,20 @@ static async Task<int> Main(string[] args)

rootCommand.SetAction(parseResult =>
{
DirectoryInfo intelliSenseDir = parseResult.GetValue<DirectoryInfo>("--isenseDir");
DirectoryInfo ecmaxmlDir = parseResult.GetValue<DirectoryInfo>("--ecmaxmlDir");
DirectoryInfo? intelliSenseDir = parseResult.GetValue<DirectoryInfo>("--isenseDir");
DirectoryInfo? ecmaxmlDir = parseResult.GetValue<DirectoryInfo>("--ecmaxmlDir");

if (intelliSenseDir == null || !intelliSenseDir.Exists)
{
Log.Error("The IntelliSense XML directory path is invalid or does not exist.");
return;
}

if (ecmaxmlDir == null || !ecmaxmlDir.Exists)
{
Log.Error("The ECMAXML directory path is invalid or does not exist.");
return;
}

MergeAndAnnotate(intelliSenseDir, ecmaxmlDir);
});
Expand All @@ -34,7 +46,7 @@ static async Task<int> Main(string[] args)

static void MergeAndAnnotate(DirectoryInfo iXmlDir, DirectoryInfo ecmaxmlDir)
{
// Load all files
// Load all files.
// For each member in the IntelliSense XML, see if there's non-empty text in ECMAXML.
// If so, save both versions of the text in the IntelliSense XML object.
// After the for each loop, write new XML for any namespaces
Expand Down
1 change: 0 additions & 1 deletion XmlDocConflictResolver/XmlDocConflictResolver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
<ItemGroup>
<PackageReference Include="Cake.Powershell" />
<PackageReference Include="System.CommandLine" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions XmlDocConflictResolver/XmlHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static void SaveAsIs(XElement element, string newValue)

element.Value = string.Empty;

var attributes = element.Attributes();
IEnumerable<XAttribute> attributes = element.Attributes();

// Workaround: <x> will ensure XElement does not complain about having an invalid xml object inside. Those tags will be removed by replacing the nodes.
XElement parsedElement;
Expand All @@ -89,4 +89,4 @@ private static string RemoveUndesiredEndlines(string value)

return value.Trim();
}
}
}
11 changes: 6 additions & 5 deletions cleanrepo/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static async Task RunOptions(Options options)
case "FindOrphanedSnippets":
{
Console.WriteLine($"\nSearching the '{options.TargetDirectory}' directory recursively for orphaned snippet files.");
if (options.Subdirectory != null)
if (!string.IsNullOrEmpty(options.Subdirectory))
Console.WriteLine($"Only searching subdirectories with '{options.Subdirectory}' in their path.");

// Get all snippet files.
Expand Down Expand Up @@ -1180,10 +1180,11 @@ static bool IsArticleFile(FileInfo file) =>
!file.FullName.Contains($"{Path.DirectorySeparatorChar}includes{Path.DirectorySeparatorChar}") &&
!file.FullName.Contains($"{Path.DirectorySeparatorChar}misc{Path.DirectorySeparatorChar}") &&
!file.FullName.Contains($"{Path.DirectorySeparatorChar}mermaidjs{Path.DirectorySeparatorChar}") &&
string.Compare(file.Name, "toc.md", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "agents.md", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "index.md", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "toc.yml", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "index.yml", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "toc.md", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "toc.yml", StringComparison.InvariantCultureIgnoreCase) != 0 &&
string.Compare(file.Name, "zone-pivot-groups.yml", StringComparison.InvariantCultureIgnoreCase) != 0;

List<FileInfo> orphanedFiles = [];
Expand Down Expand Up @@ -1675,7 +1676,7 @@ public static List<FileInfo> GetRedirectionFiles(string directoryPath)
public static List<FileInfo> GetMarkdownFiles(string directoryPath, params string[] dirsToIgnore)
{
DirectoryInfo dir = new(directoryPath);
IEnumerable<FileInfo> files = dir.EnumerateFiles("*.md", SearchOption.AllDirectories).ToList();
IEnumerable<FileInfo> files = dir.EnumerateFiles("*.md", SearchOption.AllDirectories);

if (dirsToIgnore.Length > 0)
{
Expand All @@ -1695,7 +1696,7 @@ public static List<FileInfo> GetMarkdownFiles(string directoryPath, params strin
public static List<FileInfo> GetYAMLFiles(string directoryPath, params string[] dirsToIgnore)
{
DirectoryInfo dir = new(directoryPath);
IEnumerable<FileInfo> files = dir.EnumerateFiles("*.yml", SearchOption.AllDirectories).ToList();
IEnumerable<FileInfo> files = dir.EnumerateFiles("*.yml", SearchOption.AllDirectories);

if (dirsToIgnore.Length > 0)
{
Expand Down
Loading