Skip to content

Commit 42c70ee

Browse files
lekhmanruslekhmanrus
authored
Merge pull request #46 from lekhmanrus/net5
Upgrade to .NET 5.0
2 parents d61c20d + 93e631c commit 42c70ee

12 files changed

+431
-464
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<TargetFramework>net461</TargetFramework>
18+
<UseWindowsForms>true</UseWindowsForms>
19+
<TargetFramework>net5.0-windows7.0</TargetFramework>
1920
<VersionPrefix>1.0.0</VersionPrefix>
2021
</PropertyGroup>
2122
</Project>

‎GitExtensions.GerritPlugin.sln

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,31 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29709.97
5-
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin", "src\GitExtensions.GerritPlugin\GitExtensions.GerritPlugin.csproj", "{58C09A62-E18E-4B76-AADB-D0B176C5424E}"
7-
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin.Tests", "UnitTests\GitExtensions.GerritPlugin.Tests\GitExtensions.GerritPlugin.Tests.csproj", "{847B0590-A76F-4B90-B797-10165DD6705F}"
9-
EndProject
10-
Global
11-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
13-
Debug|x64 = Debug|x64
14-
Debug|x86 = Debug|x86
15-
Release|Any CPU = Release|Any CPU
16-
Release|x64 = Release|x64
17-
Release|x86 = Release|x86
18-
EndGlobalSection
19-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x64.ActiveCfg = Debug|Any CPU
23-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x64.Build.0 = Debug|Any CPU
24-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x86.ActiveCfg = Debug|Any CPU
25-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x86.Build.0 = Debug|Any CPU
26-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x64.ActiveCfg = Release|Any CPU
29-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x64.Build.0 = Release|Any CPU
30-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x86.ActiveCfg = Release|Any CPU
31-
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x86.Build.0 = Release|Any CPU
32-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x64.ActiveCfg = Debug|Any CPU
35-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x64.Build.0 = Debug|Any CPU
36-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x86.ActiveCfg = Debug|Any CPU
37-
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x86.Build.0 = Debug|Any CPU
38-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x64.ActiveCfg = Release|Any CPU
41-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x64.Build.0 = Release|Any CPU
42-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x86.ActiveCfg = Release|Any CPU
43-
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x86.Build.0 = Release|Any CPU
44-
EndGlobalSection
45-
GlobalSection(SolutionProperties) = preSolution
46-
HideSolutionNode = FALSE
47-
EndGlobalSection
48-
GlobalSection(ExtensibilityGlobals) = postSolution
49-
SolutionGuid = {464E76E6-53B0-4E56-B267-22F7F82476F1}
50-
EndGlobalSection
51-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29709.97
4+
MinimumVisualStudioVersion = 15.0.26124.0
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin", "src\GitExtensions.GerritPlugin\GitExtensions.GerritPlugin.csproj", "{58C09A62-E18E-4B76-AADB-D0B176C5424E}"
6+
EndProject
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin.Tests", "UnitTests\GitExtensions.GerritPlugin.Tests\GitExtensions.GerritPlugin.Tests.csproj", "{847B0590-A76F-4B90-B797-10165DD6705F}"
8+
EndProject
9+
Global
10+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11+
Debug|Any CPU = Debug|Any CPU
12+
Release|Any CPU = Release|Any CPU
13+
EndGlobalSection
14+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.Build.0 = Release|Any CPU
19+
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.Build.0 = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(SolutionProperties) = preSolution
25+
HideSolutionNode = FALSE
26+
EndGlobalSection
27+
GlobalSection(ExtensibilityGlobals) = postSolution
28+
SolutionGuid = {464E76E6-53B0-4E56-B267-22F7F82476F1}
29+
SolutionGuid = {F41D2140-C196-4AA5-B8C2-23BC5BEA8D01}
30+
EndGlobalSection
31+
EndGlobal

‎GitExtensions.settings

Lines changed: 115 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<dictionary>
3-
<item>
4-
<key>
5-
<string>BuildServer.AppVeyor.AppVeyorDisplayGitHubPullRequests</string>
6-
</key>
7-
<value>
8-
<string>false</string>
9-
</value>
10-
</item>
11-
<item>
12-
<key>
13-
<string>BuildServer.AppVeyor.AppVeyorLoadTestsResults</string>
14-
</key>
15-
<value>
16-
<string>false</string>
17-
</value>
18-
</item>
19-
<item>
20-
<key>
21-
<string>BuildServer.AppVeyor.AppVeyorProjectName</string>
22-
</key>
23-
<value>
24-
<string>gitextensions/gitextensions-gerritplugin</string>
25-
</value>
26-
</item>
27-
<item>
28-
<key>
29-
<string>BuildServer.EnableIntegration</string>
30-
</key>
31-
<value>
32-
<string>true</string>
33-
</value>
34-
</item>
35-
<item>
36-
<key>
37-
<string>BuildServer.Type</string>
38-
</key>
39-
<value>
40-
<string>AppVeyor</string>
41-
</value>
42-
</item>
43-
<item>
44-
<key>
45-
<string>dictionary</string>
46-
</key>
47-
<value>
48-
<string>en-US</string>
49-
</value>
50-
</item>
51-
<item>
52-
<key>
53-
<string>RevisionLinkDefs</string>
54-
</key>
55-
<value>
56-
<string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
57-
&lt;ArrayOfGitExtLinkDef&gt;
58-
&lt;GitExtLinkDef&gt;
59-
&lt;Enabled&gt;true&lt;/Enabled&gt;
60-
&lt;LinkFormats&gt;
61-
&lt;GitExtLinkFormat&gt;
62-
&lt;Caption&gt;View on GitHub&lt;/Caption&gt;
63-
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/commit/%COMMIT_HASH%&lt;/Format&gt;
64-
&lt;/GitExtLinkFormat&gt;
65-
&lt;/LinkFormats&gt;
66-
&lt;Name&gt;GitHub - commit&lt;/Name&gt;
67-
&lt;NestedSearchPattern /&gt;
68-
&lt;RemoteSearchInParts /&gt;
69-
&lt;SearchInParts&gt;
70-
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
71-
&lt;/SearchInParts&gt;
72-
&lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
73-
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
74-
&lt;/GitExtLinkDef&gt;
75-
&lt;GitExtLinkDef&gt;
76-
&lt;Enabled&gt;true&lt;/Enabled&gt;
77-
&lt;LinkFormats&gt;
78-
&lt;GitExtLinkFormat&gt;
79-
&lt;Caption&gt;Issue {0}&lt;/Caption&gt;
80-
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/issues/{0}&lt;/Format&gt;
81-
&lt;/GitExtLinkFormat&gt;
82-
&lt;/LinkFormats&gt;
83-
&lt;Name&gt;GitHub - issues&lt;/Name&gt;
84-
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
85-
&lt;RemoteSearchInParts /&gt;
86-
&lt;SearchInParts&gt;
87-
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
88-
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
89-
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
90-
&lt;/SearchInParts&gt;
91-
&lt;SearchPattern&gt;(?i)(?&amp;lt;!pull request |pr[ _]?)(#|(((feat(ure)?)|fix)[/_-]))\d+&lt;/SearchPattern&gt;
92-
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
93-
&lt;/GitExtLinkDef&gt;
94-
&lt;GitExtLinkDef&gt;
95-
&lt;Enabled&gt;true&lt;/Enabled&gt;
96-
&lt;LinkFormats&gt;
97-
&lt;GitExtLinkFormat&gt;
98-
&lt;Caption&gt;PR {0}&lt;/Caption&gt;
99-
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/pull/{0}&lt;/Format&gt;
100-
&lt;/GitExtLinkFormat&gt;
101-
&lt;/LinkFormats&gt;
102-
&lt;Name&gt;GitHub - PR&lt;/Name&gt;
103-
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
104-
&lt;RemoteSearchInParts /&gt;
105-
&lt;SearchInParts&gt;
106-
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
107-
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
108-
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
109-
&lt;/SearchInParts&gt;
110-
&lt;SearchPattern&gt;(?i)(pull request |pr[ _]?)#?\d+&lt;/SearchPattern&gt;
111-
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
112-
&lt;/GitExtLinkDef&gt;
113-
&lt;/ArrayOfGitExtLinkDef&gt;</string>
114-
</value>
115-
</item>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<dictionary>
3+
<item>
4+
<key>
5+
<string>BuildServer.AppVeyor.AppVeyorDisplayGitHubPullRequests</string>
6+
</key>
7+
<value>
8+
<string>false</string>
9+
</value>
10+
</item>
11+
<item>
12+
<key>
13+
<string>BuildServer.AppVeyor.AppVeyorLoadTestsResults</string>
14+
</key>
15+
<value>
16+
<string>false</string>
17+
</value>
18+
</item>
19+
<item>
20+
<key>
21+
<string>BuildServer.AppVeyor.AppVeyorProjectName</string>
22+
</key>
23+
<value>
24+
<string>gitextensions/gitextensions-gerritplugin</string>
25+
</value>
26+
</item>
27+
<item>
28+
<key>
29+
<string>BuildServer.EnableIntegration</string>
30+
</key>
31+
<value>
32+
<string>true</string>
33+
</value>
34+
</item>
35+
<item>
36+
<key>
37+
<string>BuildServer.Type</string>
38+
</key>
39+
<value>
40+
<string>AppVeyor</string>
41+
</value>
42+
</item>
43+
<item>
44+
<key>
45+
<string>dictionary</string>
46+
</key>
47+
<value>
48+
<string>en-US</string>
49+
</value>
50+
</item>
51+
<item>
52+
<key>
53+
<string>RevisionLinkDefs</string>
54+
</key>
55+
<value>
56+
<string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
57+
&lt;ArrayOfGitExtLinkDef&gt;
58+
&lt;GitExtLinkDef&gt;
59+
&lt;Enabled&gt;true&lt;/Enabled&gt;
60+
&lt;LinkFormats&gt;
61+
&lt;GitExtLinkFormat&gt;
62+
&lt;Caption&gt;View on GitHub&lt;/Caption&gt;
63+
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/commit/%COMMIT_HASH%&lt;/Format&gt;
64+
&lt;/GitExtLinkFormat&gt;
65+
&lt;/LinkFormats&gt;
66+
&lt;Name&gt;GitHub - commit&lt;/Name&gt;
67+
&lt;NestedSearchPattern /&gt;
68+
&lt;RemoteSearchInParts /&gt;
69+
&lt;SearchInParts&gt;
70+
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
71+
&lt;/SearchInParts&gt;
72+
&lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
73+
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
74+
&lt;/GitExtLinkDef&gt;
75+
&lt;GitExtLinkDef&gt;
76+
&lt;Enabled&gt;true&lt;/Enabled&gt;
77+
&lt;LinkFormats&gt;
78+
&lt;GitExtLinkFormat&gt;
79+
&lt;Caption&gt;Issue {0}&lt;/Caption&gt;
80+
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/issues/{0}&lt;/Format&gt;
81+
&lt;/GitExtLinkFormat&gt;
82+
&lt;/LinkFormats&gt;
83+
&lt;Name&gt;GitHub - issues&lt;/Name&gt;
84+
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
85+
&lt;RemoteSearchInParts /&gt;
86+
&lt;SearchInParts&gt;
87+
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
88+
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
89+
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
90+
&lt;/SearchInParts&gt;
91+
&lt;SearchPattern&gt;(?i)(?&amp;lt;!pull request |pr[ _]?)(#|(((feat(ure)?)|fix)[/_-]))\d+&lt;/SearchPattern&gt;
92+
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
93+
&lt;/GitExtLinkDef&gt;
94+
&lt;GitExtLinkDef&gt;
95+
&lt;Enabled&gt;true&lt;/Enabled&gt;
96+
&lt;LinkFormats&gt;
97+
&lt;GitExtLinkFormat&gt;
98+
&lt;Caption&gt;PR {0}&lt;/Caption&gt;
99+
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/pull/{0}&lt;/Format&gt;
100+
&lt;/GitExtLinkFormat&gt;
101+
&lt;/LinkFormats&gt;
102+
&lt;Name&gt;GitHub - PR&lt;/Name&gt;
103+
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
104+
&lt;RemoteSearchInParts /&gt;
105+
&lt;SearchInParts&gt;
106+
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
107+
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
108+
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
109+
&lt;/SearchInParts&gt;
110+
&lt;SearchPattern&gt;(?i)(pull request |pr[ _]?)#?\d+&lt;/SearchPattern&gt;
111+
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
112+
&lt;/GitExtLinkDef&gt;
113+
&lt;/ArrayOfGitExtLinkDef&gt;</string>
114+
</value>
115+
</item>
116116
</dictionary>

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

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

0 commit comments

Comments
 (0)