public override void Run(string[] args, MessageBoxErrorReporter reporter) { var parsedArguments = new Arguments(); reporter.CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()); if (Parser.ParseArguments(args, parsedArguments, reporter.Handler)) { if (parsedArguments.Solutions.Length < 2) { reporter.Handler("Two solution files should be provided, in order:\n Old.sln\n New.sln"); } var oldSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[0]), parsedArguments.IgnoreWarning); var newSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[1]), parsedArguments.IgnoreWarning); var difference = newSolution.CompareTo(oldSolution) ?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null); using (var form = new CompareSolutionsForm(difference)) { form.ShowDialog(); } } }
public override void Run(string[] args, MessageBoxErrorReporter reporter) { var parsedArguments = new Arguments(); reporter.CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()); if (Parser.ParseArguments(args, parsedArguments, reporter.Handler)) { if (parsedArguments.Solutions.Length < 2) { reporter.Handler("Two solution files should be provided, in order:\n Old.sln\n New.sln"); return; } var oldSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[0]), parsedArguments.IgnoreWarning); var newSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[1]), parsedArguments.IgnoreWarning); var difference = newSolution.CompareTo(oldSolution) ?? new NodeDifference(new ElementIdentifier("SolutionFile"), OperationOnParent.Modified, null); using (var form = new CompareSolutionsForm(difference)) { form.ShowDialog(); } } }
static void Main(string[] args) { //args = new string[] { "CompareSolutions", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Lors du Branch).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Branche WinFixFrs).sln" }; //args = new string[] { "MergeSolutions", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Lors du Branch).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Branche WinFixFrs).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Main).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\Results.sln" }; //args = new string[] { "CreateFilterFileFromSolution", @"C:\DevCodePlex\SLNTools\Main\SLNTools.sln" }; //args = new string[] { "OpenFilterFile", @"C:\DevCodePlex\SLNTools\Main\Test.slnfilter" }; //args = new string[] { "/?" }; //args = new string[] { "CreateFilterFileFromSolution", @"E:\SLNTools\SLNTools\Main\SLNTools.sln" }; //args = new string[] { "MergeSolutions" }; try { string[] commandName; string[] commandArguments; if (args.Length > 1) { commandName = new string[1]; Array.ConstrainedCopy(args, 0, commandName, 0, 1); commandArguments = new string[args.Length - 1]; Array.ConstrainedCopy(args, 1, commandArguments, 0, commandArguments.Length); } else { commandName = args; commandArguments = new string[0]; } var parsedArguments = new Arguments(); var reporter = new MessageBoxErrorReporter { CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()) }; if (Parser.ParseArguments(commandName, parsedArguments, reporter.Handler)) { Command command; switch (parsedArguments.Command) { case CommandList.CompareSolutions: command = new CompareSolutionsCommand(); break; case CommandList.MergeSolutions: command = new MergeSolutionsCommand(); break; case CommandList.CreateFilterFileFromSolution: command = new CreateFilterFileFromSolutionCommand(); break; case CommandList.OpenFilterFile: command = new OpenFilterFileCommand(); break; case CommandList.EditFilterFile: command = new EditFilterFileCommand(); break; case CommandList.CreateSolutionFromFilterFile: command = new CreateSolutionFromFilterFileCommand(); break; default: command = null; reporter.Handler("Invalid command name."); break; } if (command != null) { reporter.CommandName = parsedArguments.Command.ToString(); command.Run(commandArguments, reporter); } } } catch (Exception ex) { MessageBox.Show(ex.ToString()); } }
public override void Run(string[] args, MessageBoxErrorReporter reporter) { var parsedArguments = new Arguments(); reporter.CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()); if (Parser.ParseArguments(args, parsedArguments, reporter.Handler)) { if (parsedArguments.Solutions.Length < 4) { reporter.Handler("Four solution files should be provided, in order:\n SourceBranch.sln\n DestinationBranch.sln\n CommonAncestror.sln\n Result.sln"); } var solutionInSourceBranch = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[0]), parsedArguments.IgnoreWarning); var solutionInDestinationBranch = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[1]), parsedArguments.IgnoreWarning); var commonAncestrorSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[2]), parsedArguments.IgnoreWarning); var mergedSolutionName = parsedArguments.Solutions[3]; var elementInSourceBranch = solutionInSourceBranch.ToElement(); var elementInDestinationBranch = solutionInDestinationBranch.ToElement(); var commonAncestrorElement = commonAncestrorSolution.ToElement(); NodeDifference differenceInSourceBranch; NodeDifference differenceInDestinationBranch; var conflict = Conflict.Merge( commonAncestrorElement, elementInSourceBranch, elementInDestinationBranch, out differenceInSourceBranch, out differenceInDestinationBranch); using (var form = new MergeSolutionsForm( differenceInSourceBranch, differenceInDestinationBranch, conflict, delegate(ConflictContext context, Difference differenceTypeInSourceBranch, Difference differenceTypeInDestinationBranch) { var resolverForm = new OperationTypeConflictResolverForm( context, differenceTypeInSourceBranch, differenceTypeInDestinationBranch); resolverForm.ShowDialog(); return resolverForm.Result; }, delegate(ConflictContext context, string valueInSourceBranch, string valueInDestinationBranch) { var resolverForm = new ValueConflictResolverForm( context, valueInSourceBranch, valueInDestinationBranch); resolverForm.ShowDialog(); return resolverForm.Result; })) { if (form.ShowDialog() == System.Windows.Forms.DialogResult.OK) { var mergedElement = (NodeElement)commonAncestrorElement.Apply(form.Result); var mergedSolution = SolutionFile.FromElement(mergedElement); mergedSolution.SaveAs(mergedSolutionName); MergedHandled = true; } } } }
public override void Run(string[] args, MessageBoxErrorReporter reporter) { var parsedArguments = new Arguments(); reporter.CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()); if (Parser.ParseArguments(args, parsedArguments, reporter.Handler)) { if (parsedArguments.Solutions.Length < 4) { reporter.Handler("Four solution files should be provided, in order:\n SourceBranch.sln\n DestinationBranch.sln\n CommonAncestror.sln\n Result.sln"); return; } var solutionInSourceBranch = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[0]), parsedArguments.IgnoreWarning); var solutionInDestinationBranch = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[1]), parsedArguments.IgnoreWarning); var commonAncestrorSolution = CheckForWarnings(SolutionFile.FromFile(parsedArguments.Solutions[2]), parsedArguments.IgnoreWarning); var mergedSolutionName = parsedArguments.Solutions[3]; var elementInSourceBranch = solutionInSourceBranch.ToElement(); var elementInDestinationBranch = solutionInDestinationBranch.ToElement(); var commonAncestrorElement = commonAncestrorSolution.ToElement(); NodeDifference differenceInSourceBranch; NodeDifference differenceInDestinationBranch; var conflict = Conflict.Merge( commonAncestrorElement, elementInSourceBranch, elementInDestinationBranch, out differenceInSourceBranch, out differenceInDestinationBranch); using (var form = new MergeSolutionsForm( differenceInSourceBranch, differenceInDestinationBranch, conflict, delegate(ConflictContext context, Difference differenceTypeInSourceBranch, Difference differenceTypeInDestinationBranch) { var resolverForm = new OperationTypeConflictResolverForm( context, differenceTypeInSourceBranch, differenceTypeInDestinationBranch); resolverForm.ShowDialog(); return(resolverForm.Result); }, delegate(ConflictContext context, string valueInSourceBranch, string valueInDestinationBranch) { var resolverForm = new ValueConflictResolverForm( context, valueInSourceBranch, valueInDestinationBranch); resolverForm.ShowDialog(); return(resolverForm.Result); })) { if (form.ShowDialog() == System.Windows.Forms.DialogResult.OK) { var mergedElement = (NodeElement)commonAncestrorElement.Apply(form.Result); var mergedSolution = SolutionFile.FromElement(mergedElement); mergedSolution.SaveAs(mergedSolutionName); } } } }
static void Main(string[] args) { //args = new string[] { "CompareSolutions", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Lors du Branch).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Branche WinFixFrs).sln" }; //args = new string[] { "MergeSolutions", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Lors du Branch).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Branche WinFixFrs).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\All Projects (Latest Main).sln", @"C:\Dev\VSSolutionMerger.root\VSSolutionMerger\SLNTools.exe\Results.sln" }; //args = new string[] { "CreateFilterFileFromSolution", @"C:\DevCodePlex\SLNTools\Main\SLNTools.sln" }; //args = new string[] { "OpenFilterFile", @"C:\DevCodePlex\SLNTools\Main\Test.slnfilter" }; //args = new string[] { "/?" }; //args = new string[] { "CreateFilterFileFromSolution", @"E:\SLNTools\SLNTools\Main\SLNTools.sln" }; //args = new string[] { "MergeSolutions" }; try { string[] commandName; string[] commandArguments; if (args.Length > 1) { commandName = new string[1]; Array.ConstrainedCopy(args, 0, commandName, 0, 1); commandArguments = new string[args.Length - 1]; Array.ConstrainedCopy(args, 1, commandArguments, 0, commandArguments.Length); } else { commandName = args; commandArguments = new string[0]; } var parsedArguments = new Arguments(); var reporter = new MessageBoxErrorReporter { CommandUsage = Parser.ArgumentsUsage(parsedArguments.GetType()) }; if (Parser.ParseArguments(commandName, parsedArguments, reporter.Handler)) { Command command; switch (parsedArguments.Command) { case CommandList.CompareSolutions: command = new CompareSolutionsCommand(); break; case CommandList.MergeSolutions: command = new MergeSolutionsCommand(); break; case CommandList.CreateFilterFileFromSolution: command = new CreateFilterFileFromSolutionCommand(); break; case CommandList.OpenFilterFile: command = new OpenFilterFileCommand(); break; case CommandList.EditFilterFile: command = new EditFilterFileCommand(); break; default: command = null; reporter.Handler("Invalid command name."); break; } if (command != null) { reporter.CommandName = parsedArguments.Command.ToString(); command.Run(commandArguments, reporter); } } } catch (Exception ex) { MessageBox.Show(ex.ToString()); } }