@@ -146,27 +146,25 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
146146 using var fixture = new EmptyRepositoryFixture ( ) ;
147147 var remoteRepositoryPath = FileSystemHelper . Path . GetRepositoryTempPath ( ) ;
148148 RepositoryFixtureBase . Init ( remoteRepositoryPath ) ;
149- using ( var remoteRepository = new Repository ( remoteRepositoryPath ) )
150- {
151- remoteRepository . Config . Set ( "user.name" , "Test" ) ;
152- remoteRepository . Config . Set ( "user.email" , "[email protected] " ) ; 153- fixture . Repository . Network . Remotes . Add ( "origin" , remoteRepositoryPath ) ;
154- Console . WriteLine ( "Created git repository at {0}" , remoteRepositoryPath ) ;
155- remoteRepository . MakeATaggedCommit ( "1.0.3" ) ;
156-
157- var branch = remoteRepository . CreateBranch ( "FeatureBranch" ) ;
158- Commands . Checkout ( remoteRepository , branch ) ;
159- remoteRepository . MakeCommits ( 2 ) ;
160- Commands . Checkout ( remoteRepository , remoteRepository . Head . Tip . Sha ) ;
161- //Emulate merge commit
162- var mergeCommitSha = remoteRepository . MakeACommit ( ) . Sha ;
163- Commands . Checkout ( remoteRepository , TestBase . MainBranch ) ; // HEAD cannot be pointing at the merge commit
164- remoteRepository . Refs . Add ( pullRequestRef , new ObjectId ( mergeCommitSha ) ) ;
165-
166- // Checkout PR commit
167- Commands . Fetch ( fixture . Repository , "origin" , [ ] , new FetchOptions ( ) , null ) ;
168- Commands . Checkout ( fixture . Repository , mergeCommitSha ) ;
169- }
149+ using var remoteRepository = new Repository ( remoteRepositoryPath ) ;
150+ remoteRepository . Config . Set ( "user.name" , "Test" ) ;
151+ remoteRepository . Config . Set ( "user.email" , "[email protected] " ) ; 152+ fixture . Repository . Network . Remotes . Add ( "origin" , remoteRepositoryPath ) ;
153+ Console . WriteLine ( "Created git repository at {0}" , remoteRepositoryPath ) ;
154+ remoteRepository . MakeATaggedCommit ( "1.0.3" ) ;
155+
156+ var branch = remoteRepository . CreateBranch ( "FeatureBranch" ) ;
157+ Commands . Checkout ( remoteRepository , branch ) ;
158+ remoteRepository . MakeCommits ( 2 ) ;
159+ Commands . Checkout ( remoteRepository , remoteRepository . Head . Tip . Sha ) ;
160+ //Emulate merge commit
161+ var mergeCommitSha = remoteRepository . MakeACommit ( ) . Sha ;
162+ Commands . Checkout ( remoteRepository , TestBase . MainBranch ) ; // HEAD cannot be pointing at the merge commit
163+ remoteRepository . Refs . Add ( pullRequestRef , new ObjectId ( mergeCommitSha ) ) ;
164+
165+ // Checkout PR commit
166+ Commands . Fetch ( fixture . Repository , "origin" , [ ] , new FetchOptions ( ) , null ) ;
167+ Commands . Checkout ( fixture . Repository , mergeCommitSha ) ;
170168
171169 var programFixture = new ProgramFixture ( fixture . RepositoryPath ) ;
172170 programFixture . WithOverrides ( services =>
@@ -199,12 +197,12 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
199197 public void VerifyPullRequestInput ( string pullRequestRef , string friendly , bool isBranch , bool isPullRequest , bool isRemote )
200198 {
201199 var refName = new ReferenceName ( pullRequestRef ) ;
202- Assert . Multiple ( ( ) =>
200+ using ( Assert . EnterMultipleScope ( ) )
203201 {
204202 Assert . That ( refName . Friendly , Is . EqualTo ( friendly ) ) ;
205203 Assert . That ( refName . IsLocalBranch , Is . EqualTo ( isBranch ) ) ;
206204 Assert . That ( refName . IsPullRequest , Is . EqualTo ( isPullRequest ) ) ;
207205 Assert . That ( refName . IsRemoteBranch , Is . EqualTo ( isRemote ) ) ;
208- } ) ;
206+ }
209207 }
210208}
0 commit comments