Skip to content

Commit ce701ed

Browse files
lekhmanruslekhmanrus
authored
Merge pull request #67 from lekhmanrus/support-ge-4.0.x-and-4.1.x
Support GE 4.0.x and 4.1.x (#65)
2 parents 5c36046 + 8526b85 commit ce701ed

9 files changed

Lines changed: 59 additions & 32 deletions

File tree

‎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.3</VersionPrefix>
20+
<VersionPrefix>2.0.4</VersionPrefix>
2121
</PropertyGroup>
2222
</Project>

‎Directory.Packages.props‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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>

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ Use the following pattern to link revision data to Gerrit:
2929
|--------------------|---------------------|
3030
| v <= 3.5.x | v <= 1.3.2 |
3131
| 3.5.x < v <= 4.0.0 | 2.0.0 <= v <= 2.0.1 |
32-
| 4.0.1 <= v < 4.1.0 | v2.0.2 |
33-
| 4.1.0 <= v | 2.0.3 <= v |
32+
| 4.0.1 <= v | 2.0.4 <= v |
3433

3534
## GitExtensions Plugin Template infomration
3635

‎UnitTests/GitExtensions.GerritPlugin.Tests/GitExtensions.GerritPlugin.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<IsPackable>false</IsPackable>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
7-
<PackageReference Include="NUnit" Version="3.13.3" />
8-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
9-
<PackageReference Include="coverlet.collector" Version="3.2.0">
6+
<PackageReference Include="coverlet.collector">
107
<PrivateAssets>all</PrivateAssets>
118
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
129
</PackageReference>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="NUnit" />
12+
<PackageReference Include="NUnit3TestAdapter" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎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.3.{build}
6+
version: 2.0.4.{build}
77

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

‎src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,26 @@
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1">
7+
<PackageReference Include="GitExtensions.Extensibility" />
8+
<PackageReference Include="JetBrains.Annotations">
89
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
910
</PackageReference>
10-
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.2.41">
11+
<PackageReference Include="Microsoft.VisualStudio.Composition">
1112
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
1213
</PackageReference>
13-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.4.27">
14+
<PackageReference Include="Microsoft.VisualStudio.Threading">
1415
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
1516
</PackageReference>
16-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1">
17+
<PackageReference Include="Newtonsoft.Json">
1718
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
1819
</PackageReference>
19-
<PackageReference Include="NUnit" Version="3.13.3">
20-
<PrivateAssets>all</PrivateAssets>
20+
<PackageReference Include="NUnit">
21+
<PrivateAssets>all</PrivateAssets>
2122
</PackageReference>
2223
</ItemGroup>
2324

25+
<!-- References to Git Extensions' DLLs -->
2426
<ItemGroup>
25-
<PackageReference Include="GitExtensions.Extensibility" Version="0.3.0.57" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<!-- References to Git Extensions' DLLs -->
3027
<Reference Include="GitCommands">
3128
<HintPath>$(GitExtensionsPath)\GitCommands.dll</HintPath>
3229
</Reference>
@@ -45,17 +42,28 @@
4542
</ItemGroup>
4643

4744
<ItemGroup>
45+
<None Include="..\..\README.md">
46+
<Pack>True</Pack>
47+
<PackagePath>\</PackagePath>
48+
</None>
4849
<None Include="Resources\GerritDownload.png" />
4950
<None Include="Resources\GerritInstallHook.png" />
5051
<None Include="Resources\GerritPublish.png" />
51-
<None Include="Resources\IconGerrit.png" />
52+
<None Include="Resources\IconGerrit.png">
53+
<Pack>True</Pack>
54+
<PackagePath>\</PackagePath>
55+
</None>
5256
</ItemGroup>
5357

5458

5559
<!-- Pack as .nupkg with dependency on GitExtensions.Extensibility -->
5660
<PropertyGroup>
5761
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
5862
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
63+
<PackageIcon>IconGerrit.png</PackageIcon>
64+
<PackageReadmeFile>README.md</PackageReadmeFile>
65+
<RepositoryUrl>https://github.com/gitextensions/GitExtensions.GerritPlugin</RepositoryUrl>
66+
<RepositoryType>git</RepositoryType>
5967
</PropertyGroup>
6068

6169
<ItemGroup>

‎src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<!-- path is relative to $(ProjectDir) -->
55
<GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath>
66
<!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
7-
<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion>
7+
<GitExtensionsReferenceVersion>v4.0.2</GitExtensionsReferenceVersion>
88
<!-- 'GitHub' or 'AppVeyor' -->
9-
<GitExtensionsReferenceSource>AppVeyor</GitExtensionsReferenceSource>
9+
<GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource>
1010
<!-- for local builds (no download) -->
11-
<GitExtensionsPath />
11+
<GitExtensionsPath>$(GitExtensionsDownloadPath)</GitExtensionsPath>
1212
</PropertyGroup>
1313
</Project>

‎src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<icon>Resources\IconGerrit.png</icon>
1212
<dependencies>
1313
<group>
14-
<dependency id="GitExtensions.Extensibility" version="[0.2.0, 0.4.0)" />
14+
<dependency id="GitExtensions.Extensibility" version="[0.3.0, 0.4.0)" />
1515
</group>
1616
<!-- To fix Warning NU5128 Add a dependency group for net6.0-windows7.0 to the nuspec -->
1717
<group targetFramework="net6.0-windows7.0">
18-
<dependency id="GitExtensions.Extensibility" version="[0.2.0, 0.4.0)" />
18+
<dependency id="GitExtensions.Extensibility" version="[0.3.0, 0.4.0)" />
1919
</group>
2020
</dependencies>
2121
</metadata>

‎src/GitExtensions.GerritPlugin/Properties/launchSettings.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
{
2-
"profiles": {
3-
"GitExtensions.GerritPlugin": {
4-
"commandName": "Executable",
5-
"executablePath": "$(GitExtensionsExecutablePath)"
6-
}
7-
}
1+
{
2+
"profiles": {
3+
"GitExtensions.GerritPlugin": {
4+
"commandName": "Executable",
5+
"executablePath": "$(GitExtensionsExecutablePath)",
6+
"workingDirectory": "$(MSBuildProjectDirectory)"
7+
}
8+
}
89
}

0 commit comments

Comments
 (0)