Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert to CPS #13

Merged
merged 1 commit into from
Sep 17, 2019
Merged

Convert to CPS #13

merged 1 commit into from
Sep 17, 2019

Conversation

RussKie
Copy link
Member

@RussKie RussKie commented Sep 16, 2019

  • Retarget to .NET Standard 2.0
  • Fix compile issues
  • Fix warnings

@RussKie
Convert to CPS
b10b799 
* Retarget to .NET Standard 2.0
* Fix compile issues
* Fix warnings
@ghost ghost assigned RussKie Sep 16, 2019
@RussKie
Copy link
Member Author

RussKie commented Sep 16, 2019

@pmiossec I think you've been dealing with the GH plugin.
Do you think you could check that the update still works?

gerhardol
gerhardol reviewed Sep 16, 2019
View reviewed changes
Copy link
Member

@gerhardol gerhardol left a comment •
edited
Loading

Choose a reason for hiding this comment

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

No important comment. Leaner definition, the plugin works for me.
What about the latest changes in master?

Got an exception when opening after building, not sure if it is related. Not occurring after a rebuild.

System.NullReferenceException: Object reference not set to an instance of an object.
   at GitHub3.GitHub3Plugin.GetHostedRemotesForModule() in F:\dev\gc\gitextensions_4\Plugins\GitHub3\GitHub3Plugin.cs:line 190
   at GitHub3.GitHub3Plugin.GitModuleIsRelevantToMe() in F:\dev\gc\gitextensions_4\Plugins\GitHub3\GitHub3Plugin.cs:line 182
   at GitUI.PluginRegistry.<>c.<TryGetGitHosterForModule>b__11_0(IRepositoryHostPlugin gitHoster) in F:\dev\gc\gitextensions_4\GitUI\Plugin\PluginRegistry.cs:line 63
   at System.Linq.Enumerable.FirstOrDefault[TSource](IEnumerable`1 source, Func`2 predicate)
   at GitUI.PluginRegistry.TryGetGitHosterForModule(GitModule module) in F:\dev\gc\gitextensions_4\GitUI\Plugin\PluginRegistry.cs:line 63
   at GitUI.CommandsDialogs.FormBrowse.TryGetRepositoryHost(IRepositoryHostPlugin& repoHost) in F:\dev\gc\gitextensions_4\GitUI\CommandsDialogs\FormBrowse.cs:line 2138
   at GitUI.CommandsDialogs.FormBrowse._viewPullRequestsToolStripMenuItem_Click(Object sender, EventArgs e) in F:\dev\gc\gitextensions_4\GitUI\CommandsDialogs\FormBrowse.cs:line 2104
   at System.Windows.Forms.ToolStripItem.RaiseEvent(Object key, EventArgs e)
   at System.Windows.Forms.ToolStripMenuItem.OnClick(EventArgs e)
   at System.Windows.Forms.ToolStripItem.HandleClick(EventArgs e)
   at System.Windows.Forms.ToolStripItem.HandleMouseUp(MouseEventArgs e)
   at System.Windows.Forms.ToolStrip.OnMouseUp(MouseEventArgs mea)
   at System.Windows.Forms.ToolStripDropDown.OnMouseUp(MouseEventArgs mea)
   at System.Windows.Forms.Control.WmMouseUp(Message& m, MouseButtons button, Int32 clicks)
   at System.Windows.Forms.Control.WndProc(Message& m)
   at System.Windows.Forms.ToolStrip.WndProc(Message& m)
   at System.Windows.Forms.ToolStripDropDown.WndProc(Message& m)
   at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)

@RussKie
Copy link
Member Author

RussKie commented Sep 16, 2019

Got an exception when opening after building, not sure if it is related. Not occurring after a rebuild.

Thank you for testing.
Not sure, could be a red herring. It worked for me on two different computers.

pmiossec
pmiossec reviewed Sep 17, 2019
View reviewed changes
Directory.Build.props
@@ -1,3 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>

<PropertyGroup>
<Copyright>Copyright &#xA9; 2012 Marcus Bauer &lt;mabako@gmail.com&gt; // Copyright &#xA9; 2019 Git Extensions</Copyright>
Copy link
Member

Choose a reason for hiding this comment

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

Is there a particular reason to put it here instead in the only csproj the repository have?

Copy link
Member Author

Choose a reason for hiding this comment

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

In the target state we'll put all the common info into a directory.build.props
However right now I don't want to deal with this.

pmiossec
pmiossec approved these changes Sep 17, 2019
View reviewed changes
Copy link
Member

@pmiossec pmiossec left a comment

Choose a reason for hiding this comment

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

It is working well for me.

@pmiossec
Copy link
Member

For the other csproj, we could do it with https://github.com/hvanbakel/CsprojToVs2017
Tested successfully. It does most of the job...

@RussKie
Copy link
Member Author

RussKie commented Sep 17, 2019

For the other csproj, we could do it with hvanbakel/CsprojToVs2017

Nice! Do you want to try it on other submodules?

@RussKie RussKie merged commit ad3ade7 into master Sep 17, 2019
@RussKie RussKie deleted the Convert_to_CPS branch September 17, 2019 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gerhardol gerhardol gerhardol left review comments

@drewnoakes drewnoakes drewnoakes approved these changes

@pmiossec pmiossec pmiossec approved these changes

@sharwell sharwell Awaiting requested review from sharwell

Assignees

@RussKie RussKie

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RussKie @pmiossec @drewnoakes @gerhardol