diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props index 83b66693a1..a077981829 100644 --- a/GVFS/GVFS.Build/GVFS.props +++ b/GVFS/GVFS.Build/GVFS.props @@ -3,7 +3,7 @@ 0.2.173.2 - 2.20200420.2 + 2.20200514.1 diff --git a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs index ce3967c075..96880f455c 100644 --- a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs +++ b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs @@ -1094,7 +1094,7 @@ private void CommitChangesSwitchBranch(Action fileSystemAction, [CallerMemberNam fileSystemAction(); this.ValidateGitCommand("status"); this.ValidateGitCommand("add ."); - this.RunGitCommand("commit -m \"Change for {0}\"", test); + this.RunGitCommand($"commit -m \"Change for {test}\""); } private void CommitChangesSwitchBranchSwitchBack(Action fileSystemAction, [CallerMemberName]string test = GitCommandsTests.UnknownTestName) @@ -1104,7 +1104,7 @@ private void CommitChangesSwitchBranchSwitchBack(Action fileSystemAction, [Calle fileSystemAction(); this.ValidateGitCommand("status"); this.ValidateGitCommand("add ."); - this.RunGitCommand("commit -m \"Change for {0}\"", branch); + this.RunGitCommand($"commit -m \"Change for {branch}\""); this.ValidateGitCommand("checkout " + this.ControlGitRepo.Commitish); this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem) .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, withinPrefixes: this.pathPrefixes); diff --git a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs index f864b16696..ace3a649eb 100644 --- a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs +++ b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs @@ -226,11 +226,6 @@ protected void CheckHeadCommitTree() this.ValidateGitCommand("ls-tree HEAD"); } - protected void RunGitCommand(string command, params object[] args) - { - this.RunGitCommand(string.Format(command, args)); - } - /* We are using the following method for these scenarios * 1. Some commands compute a new commit sha, which is dependent on time and therefore * won't match what is in the control repo. For those commands, we just ensure that diff --git a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs index 2d1e727a8a..106bd24ea5 100644 --- a/GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs +++ b/GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs @@ -78,19 +78,6 @@ public void ResetMixedThenCheckoutWithConflicts() this.FilesShouldMatchCheckoutOfTargetBranch(); } - [TestCase] - public void ResetMixedOnlyAddedThenCheckoutWithConflicts() - { - this.ValidateGitCommand("checkout " + GitRepoTests.ConflictTargetBranch); - this.ValidateGitCommand("reset --mixed HEAD~1"); - - // This will reset all the files except the files that were added - // and are untracked to make sure we error out with those using sparse-checkout - this.ValidateGitCommand("checkout -f"); - this.ValidateGitCommand("checkout " + GitRepoTests.ConflictSourceBranch); - this.FilesShouldMatchCheckoutOfTargetBranch(); - } - [TestCase] public void ResetMixedAndCheckoutFile() {