Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net5.0-windows7.0</TargetFramework>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<TargetFramework>net5.0-windows7.0</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting an error:

Error	NU1012	Some included files are included under TFMs which are missing a platform version: net5.0-windows
GitExtensions.GerritPlugin	C:\Program Files\dotnet\sdk\5.0.402\Sdks\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets	221	

<VersionPrefix>1.0.0</VersionPrefix>
</PropertyGroup>
</Project>
82 changes: 31 additions & 51 deletions GitExtensions.GerritPlugin.sln
Original file line number Diff line number Diff line change
@@ -1,51 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin", "src\GitExtensions.GerritPlugin\GitExtensions.GerritPlugin.csproj", "{58C09A62-E18E-4B76-AADB-D0B176C5424E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin.Tests", "UnitTests\GitExtensions.GerritPlugin.Tests\GitExtensions.GerritPlugin.Tests.csproj", "{847B0590-A76F-4B90-B797-10165DD6705F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x64.ActiveCfg = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x64.Build.0 = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x86.ActiveCfg = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|x86.Build.0 = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.Build.0 = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x64.ActiveCfg = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x64.Build.0 = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x86.ActiveCfg = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|x86.Build.0 = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x64.ActiveCfg = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x64.Build.0 = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x86.ActiveCfg = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|x86.Build.0 = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.Build.0 = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x64.ActiveCfg = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x64.Build.0 = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x86.ActiveCfg = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {464E76E6-53B0-4E56-B267-22F7F82476F1}
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin", "src\GitExtensions.GerritPlugin\GitExtensions.GerritPlugin.csproj", "{58C09A62-E18E-4B76-AADB-D0B176C5424E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.GerritPlugin.Tests", "UnitTests\GitExtensions.GerritPlugin.Tests\GitExtensions.GerritPlugin.Tests.csproj", "{847B0590-A76F-4B90-B797-10165DD6705F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58C09A62-E18E-4B76-AADB-D0B176C5424E}.Release|Any CPU.Build.0 = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{847B0590-A76F-4B90-B797-10165DD6705F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {464E76E6-53B0-4E56-B267-22F7F82476F1}
SolutionGuid = {F41D2140-C196-4AA5-B8C2-23BC5BEA8D01}
EndGlobalSection
EndGlobal
230 changes: 115 additions & 115 deletions GitExtensions.settings
Original file line number Diff line number Diff line change
@@ -1,116 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<dictionary>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorDisplayGitHubPullRequests</string>
</key>
<value>
<string>false</string>
</value>
</item>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorLoadTestsResults</string>
</key>
<value>
<string>false</string>
</value>
</item>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorProjectName</string>
</key>
<value>
<string>gitextensions/gitextensions-gerritplugin</string>
</value>
</item>
<item>
<key>
<string>BuildServer.EnableIntegration</string>
</key>
<value>
<string>true</string>
</value>
</item>
<item>
<key>
<string>BuildServer.Type</string>
</key>
<value>
<string>AppVeyor</string>
</value>
</item>
<item>
<key>
<string>dictionary</string>
</key>
<value>
<string>en-US</string>
</value>
</item>
<item>
<key>
<string>RevisionLinkDefs</string>
</key>
<value>
<string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;ArrayOfGitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;View on GitHub&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/commit/%COMMIT_HASH%&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - commit&lt;/Name&gt;
&lt;NestedSearchPattern /&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;Issue {0}&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/issues/{0}&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - issues&lt;/Name&gt;
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;(?i)(?&amp;lt;!pull request |pr[ _]?)(#|(((feat(ure)?)|fix)[/_-]))\d+&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;PR {0}&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/pull/{0}&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - PR&lt;/Name&gt;
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;(?i)(pull request |pr[ _]?)#?\d+&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;/ArrayOfGitExtLinkDef&gt;</string>
</value>
</item>
<?xml version="1.0" encoding="utf-8"?>
<dictionary>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorDisplayGitHubPullRequests</string>
</key>
<value>
<string>false</string>
</value>
</item>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorLoadTestsResults</string>
</key>
<value>
<string>false</string>
</value>
</item>
<item>
<key>
<string>BuildServer.AppVeyor.AppVeyorProjectName</string>
</key>
<value>
<string>gitextensions/gitextensions-gerritplugin</string>
</value>
</item>
<item>
<key>
<string>BuildServer.EnableIntegration</string>
</key>
<value>
<string>true</string>
</value>
</item>
<item>
<key>
<string>BuildServer.Type</string>
</key>
<value>
<string>AppVeyor</string>
</value>
</item>
<item>
<key>
<string>dictionary</string>
</key>
<value>
<string>en-US</string>
</value>
</item>
<item>
<key>
<string>RevisionLinkDefs</string>
</key>
<value>
<string>&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;ArrayOfGitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;View on GitHub&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/commit/%COMMIT_HASH%&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - commit&lt;/Name&gt;
&lt;NestedSearchPattern /&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;.*&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;Issue {0}&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/issues/{0}&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - issues&lt;/Name&gt;
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;(?i)(?&amp;lt;!pull request |pr[ _]?)(#|(((feat(ure)?)|fix)[/_-]))\d+&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;GitExtLinkDef&gt;
&lt;Enabled&gt;true&lt;/Enabled&gt;
&lt;LinkFormats&gt;
&lt;GitExtLinkFormat&gt;
&lt;Caption&gt;PR {0}&lt;/Caption&gt;
&lt;Format&gt;https://github.com/gitextensions/GitExtensions.GerritPlugin/pull/{0}&lt;/Format&gt;
&lt;/GitExtLinkFormat&gt;
&lt;/LinkFormats&gt;
&lt;Name&gt;GitHub - PR&lt;/Name&gt;
&lt;NestedSearchPattern&gt;\d+&lt;/NestedSearchPattern&gt;
&lt;RemoteSearchInParts /&gt;
&lt;SearchInParts&gt;
&lt;RevisionPart&gt;Message&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;LocalBranches&lt;/RevisionPart&gt;
&lt;RevisionPart&gt;RemoteBranches&lt;/RevisionPart&gt;
&lt;/SearchInParts&gt;
&lt;SearchPattern&gt;(?i)(pull request |pr[ _]?)#?\d+&lt;/SearchPattern&gt;
&lt;UseOnlyFirstRemote&gt;false&lt;/UseOnlyFirstRemote&gt;
&lt;/GitExtLinkDef&gt;
&lt;/ArrayOfGitExtLinkDef&gt;</string>
</value>
</item>
</dictionary>
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#---------------------------------#

# version format
version: 1.3.2.{build}
version: 2.0.0.{build}

# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
environment:
Expand Down
Loading