Skip to content

Commit d7dbd17

Browse files
lekhmanruslekhmanrus
authored
Upgrade dependencies and release v2.0.6 (#76)
1 parent bfce212 commit d7dbd17

14 files changed

Lines changed: 223 additions & 246 deletions

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<PropertyGroup>
1818
<UseWindowsForms>true</UseWindowsForms>
1919
<TargetFramework>net6.0-windows7.0</TargetFramework>
20-
<VersionPrefix>2.0.5</VersionPrefix>
20+
<VersionPrefix>2.0.6</VersionPrefix>
2121
</PropertyGroup>
2222
</Project>

‎Directory.Packages.props‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
<!-- Do not use XML namespaces here (<Project xmlns="...">), because it would break patching of version numbers during builds on AppVeyor (https://github.com/appveyor/website/pull/409) -->
2-
<Project>
3-
<PropertyGroup>
4-
<EnablePackageVersionOverride>false</EnablePackageVersionOverride>
5-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<PackageVersion Include="GitExtensions.Extensibility" Version="0.3.0.57" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
11-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
12-
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.2.41" />
13-
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.4.27" />
14-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
15-
<PackageVersion Include="NUnit" Version="3.13.3" />
16-
<PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
17-
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
18-
</ItemGroup>
19-
</Project>
1+
<!-- Do not use XML namespaces here (<Project xmlns="...">), because it would break patching of version numbers during builds on AppVeyor (https://github.com/appveyor/website/pull/409) -->
2+
<Project>
3+
<PropertyGroup>
4+
<EnablePackageVersionOverride>false</EnablePackageVersionOverride>
5+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageVersion Include="GitExtensions.Extensibility" Version="0.3.0.57" />
9+
<PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
11+
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.2.41" />
12+
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.4.27" />
13+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
14+
<PackageVersion Include="NUnit" Version="3.13.3" />
15+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
16+
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
17+
</ItemGroup>
18+
</Project>

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GitExtensions.GerritPlugin is a plugin for GitExtensions to work with a [Gerrit]
1111
## Usage
1212

1313
The cloned repository requires a `.gitreview` file, which is in use for the plugin to identify the gerrit server.
14-
This file must be located in root foilder of the repository.
14+
This file must be located in root folder of the repository.
1515
Get more information about this file [here](https://docs.openstack.org/infra/git-review/installation.html#gitreview-file-format)
1616

1717
### Revision link
@@ -30,8 +30,8 @@ Use the following pattern to link revision data to Gerrit:
3030
| v <= 3.5.x | v <= 1.3.2 |
3131
| 3.5.x < v <= 4.0.0 | 2.0.0 <= v <= 2.0.1 |
3232
| 4.0.1 <= v <= 4.0.2 | 2.0.5 |
33-
| 4.1 <= v | master-branch |
33+
| 4.1.x <= v | 2.0.6 <= v |
3434

3535
## GitExtensions Plugin Template information
3636

37-
The [GitExtensions Plugin Template](https://github.com/gitextensions/gitextensions.plugintemplate) gives additional information about the pluign development.
37+
The [GitExtensions Plugin Template](https://github.com/gitextensions/gitextensions.plugintemplate) gives additional information about the plugin development.

‎UnitTests/GitExtensions.GerritPlugin.Tests/GerritUtilTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void TestPublishedGerritChangeUriParsing(string commandPromptFileName, bo
1717
Assert.That(GerritUtil.HadNewChange(commandPrompt, out var changeUri), Is.EqualTo(hadNewChange));
1818

1919
var expectedChangeUri = hadNewChange ? "https://my.domain.test/c/MyProjectPath/MyProject/+/2664" : null;
20-
Assert.That(changeUri, Is.EqualTo(expectedChangeUri), "We ddidn't get the right change URI from remote command output");
20+
Assert.That(changeUri, Is.EqualTo(expectedChangeUri), "We didn't get the right change URI from remote command output");
2121
}
2222
}
2323
}

‎UnitTests/GitExtensions.GerritPlugin.Tests/Server/CommandBuilderWithDraftSupportTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ public class CommandBuilderWithDraftSupportTests
1313
[TestCase("q", "fix-7521", ExpectedResult = "refs/for/fix-7521%r=q")]
1414
[TestCase("", "fix-7521", ExpectedResult = "refs/for/fix-7521")]
1515
[TestCase(null, "fix-7521", ExpectedResult = "refs/for/fix-7521")]
16-
public string Build_WithReviewers_splits_reviewrs_and_builds_expected_command(string reviewer, string branch)
16+
public string Build_WithReviewers_splits_reviewers_and_builds_expected_command(string reviewer, string branch)
1717
{
1818
var sut = new CommandBuilderWithDraftSupport();
1919
return sut.WithReviewers(reviewer).Build(branch);
2020
}
2121

2222
[Test(ExpectedResult = "refs/drafts/master%r=a")]
23-
public string Build_when_publishtype_is_drafts_builds_expected_command()
23+
public string Build_when_publish_type_is_drafts_builds_expected_command()
2424
{
2525
var sut = new CommandBuilderWithDraftSupport();
2626
return sut.WithReviewers("a").WithPublishType("drafts").Build("master");

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#---------------------------------#
44

55
# version format
6-
version: 2.0.5.{build}
6+
version: 2.0.6.{build}
77

88
# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
99
environment:

‎src/GitExtensions.GerritPlugin/FormGerritDownload.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ private async Task<bool> DownloadChangeAsync(IWin32Window owner)
124124
var checkoutCommand = UiCommands.CreateRemoteCommand();
125125

126126
checkoutCommand.CommandText = GitCommandHelpers.BranchCmd(branchName, "FETCH_HEAD", true);
127-
checkoutCommand.Completed += (s, e) =>
127+
checkoutCommand.Completed += (_, e) =>
128128
{
129-
if (e.IsError && e.Command.CommandText.Contains("already exists"))
129+
if (e.IsError && e.Command.CommandText != null && e.Command.CommandText.Contains("already exists"))
130130
{
131131
// Recycle the current review branch.
132132

@@ -197,11 +197,7 @@ private async Task<JObject> LoadReviewInfoAsync(int? patchSet = null)
197197
.RunGerritCommandAsync(
198198
this,
199199
Module,
200-
string.Format(
201-
"gerrit query --format=JSON project:{0} {1} change:{2}",
202-
projectName,
203-
patchSet == null ? "--current-patch-set" : "--patch-sets",
204-
_NO_TRANSLATE_Change.Text),
200+
$"gerrit query --format=JSON project:{projectName} {(patchSet == null ? "--current-patch-set" : "--patch-sets")} change:{_NO_TRANSLATE_Change.Text}",
205201
fetchUrl,
206202
_currentBranchRemote,
207203
null)

‎src/GitExtensions.GerritPlugin/FormGerritPublish.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using GitUIPluginInterfaces;
1111
using JetBrains.Annotations;
1212
using ResourceManager;
13-
using System.Text.RegularExpressions;
1413

1514
namespace GitExtensions.GerritPlugin
1615
{

‎src/GitExtensions.GerritPlugin/FormGitReview.Designer.cs‎

Lines changed: 81 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)