public LinkedFileDiffMergingSession(Solution oldSolution, Solution newSolution, SolutionChanges solutionChanges, bool logSessionInfo) { _oldSolution = oldSolution; _newSolution = newSolution; _solutionChanges = solutionChanges; _logSessionInfo = logSessionInfo; }
public LinkedFileDiffMergingSession( Solution oldSolution, Solution newSolution, SolutionChanges solutionChanges ) { _oldSolution = oldSolution; _newSolution = newSolution; _solutionChanges = solutionChanges; }
internal async Task<Solution> WithMergedLinkedFileChangesAsync( Solution oldSolution, SolutionChanges? solutionChanges = null, IMergeConflictHandler mergeConflictHandler = null, CancellationToken cancellationToken = default(CancellationToken)) { // we only log sessioninfo for actual changes committed to workspace which should exclude ones from preview var session = new LinkedFileDiffMergingSession(oldSolution, this, solutionChanges ?? this.GetChanges(oldSolution), logSessionInfo: solutionChanges != null); return (await session.MergeDiffsAsync(mergeConflictHandler, cancellationToken).ConfigureAwait(false)).MergedSolution; }
public LinkedFileDiffMergingSession(Solution oldSolution, Solution newSolution, SolutionChanges solutionChanges) { this.oldSolution = oldSolution; this.newSolution = newSolution; this.solutionChanges = solutionChanges; }
internal async Task<Solution> WithMergedLinkedFileChangesAsync(Solution oldSolution, SolutionChanges? solutionChanges = null, CancellationToken cancellationToken = default(CancellationToken)) { var session = new LinkedFileDiffMergingSession(oldSolution, this, solutionChanges ?? this.GetChanges(oldSolution)); return await session.MergeDiffsAsync(cancellationToken).ConfigureAwait(false); }
public LinkedFileDiffMergingSession(Solution oldSolution, Solution newSolution, SolutionChanges solutionChanges, bool logSessionInfo) { this.oldSolution = oldSolution; this.newSolution = newSolution; this.solutionChanges = solutionChanges; this.logSessionInfo = logSessionInfo; }