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

Fix installer for Win7 #7090

Merged
merged 1 commit into from
Sep 2, 2019
Merged

Fix installer for Win7 #7090

merged 1 commit into from
Sep 2, 2019

Conversation

mast-eu
Copy link
Member

@mast-eu mast-eu commented Sep 2, 2019

Fixes #7079

Proposed changes

  • Make installer compatible with PowerShell 2.0 (needed on Win7 SP1)
  • General: correct dialog order when using "back" button. Clicking "back" in GitEx_VerifyReadyDlg jumped back by 2 dialogs to GitEx_SSHClientDlg.
    The correct sequence is: GitEx_SSHClientDlg <-> GitEx_TelemetryDlg <-> GitEx_VerifyReadyDlg.

Test methodology

  • Built MSI and verified correct installation on both Win7 and Win10

Test environment (Win10)

  • Git Extensions 3.2.0.67
  • Build cd95abe
  • Git 2.23.0.windows.1
  • Microsoft Windows NT 10.0.17763.0
  • .NET Framework 4.8.3928.0
  • DPI 96dpi (no scaling)

Test environment (Win7)

  • Git Extensions 3.2.0.67
  • Build cd95abe
  • Git 2.20.1.windows.1 (recommended: 2.22.0 or later)
  • Microsoft Windows NT 6.1.7601 Service Pack 1
  • .NET Framework 4.7.3416.0
  • DPI 120dpi (125% scaling)

✒️ I contribute this code under The Developer Certificate of Origin.

@mast-eu mast-eu added this to the 3.2.0 milestone Sep 2, 2019
@ghost ghost assigned mast-eu Sep 2, 2019
RussKie
RussKie reviewed Sep 2, 2019
View reviewed changes
Setup/UI/WixUI.wxs
@@ -61,7 +61,7 @@
<Publish Dialog="GitEx_TelemetryDlg" Control="Back" Event="NewDialog" Value="GitEx_SSHClientDlg">1</Publish>
<Publish Dialog="GitEx_TelemetryDlg" Control="Next" Event="NewDialog" Value="GitEx_VerifyReadyDlg">1</Publish>

<Publish Dialog="GitEx_VerifyReadyDlg" Control="Back" Event="NewDialog" Value="GitEx_SSHClientDlg" Order="1">
<Publish Dialog="GitEx_VerifyReadyDlg" Control="Back" Event="NewDialog" Value="GitEx_TelemetryDlg" Order="1">
Copy link
Member

Choose a reason for hiding this comment

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

Nice!

RussKie
RussKie approved these changes Sep 2, 2019
View reviewed changes
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

Thank you heaps!

@RussKie RussKie changed the base branch from release/3.2 to master September 2, 2019 20:10
@RussKie RussKie changed the base branch from master to release/3.2 September 2, 2019 20:10
@RussKie
Copy link
Member

RussKie commented Sep 2, 2019

I think I gave you a wrong directioon - 3.2 branch is currently busted, could you please rebase on top of the master, and then I'll port it over once 3.2 is fixed.
My apologies for changing the directions.

@mast-eu mast-eu changed the base branch from release/3.2 to master September 2, 2019 20:25
@mast-eu
Copy link
Member Author

mast-eu commented Sep 2, 2019

could you please rebase on top of the master

No problem. Done.

@RussKie RussKie removed this from the 3.2.0 milestone Sep 2, 2019
gerhardol
gerhardol reviewed Sep 2, 2019
View reviewed changes
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

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

seem OK

@RussKie RussKie merged commit d9ac4bf into gitextensions:master Sep 2, 2019
@mast-eu mast-eu deleted the 7079-InstallerWin7 branch September 3, 2019 04:39
@RussKie RussKie mentioned this pull request Sep 11, 2019
Closed
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

@RussKie RussKie RussKie approved these changes

Assignees

@mast-eu mast-eu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

version 3.2 not installable on Win7
3 participants
@mast-eu @RussKie @gerhardol