Merged
Conversation
Improves Add, Update, and Remove submodule operations by adding user prompts, validation checks, detailed error handling, and user guidance. Now checks for existing directories and submodule paths, provides suggestions for common errors, allows updating specific submodules, and gives step-by-step feedback and recovery instructions during removal. These changes make submodule management more robust and user-friendly.
Enhanced the logic for adding submodules by providing options when the target directory exists and contains files, including removal, force add, or cancel. Improved error handling and user guidance for common submodule issues, such as invalid repositories, permission errors, and index conflicts. Added more detailed suggestions and retry mechanisms for failed submodule additions, and refactored code for clarity and user experience.
This update significantly improves the add, update, and remove submodule workflows in GitController. It adds detailed user prompts, more robust error handling, and interactive suggestions for resolving common issues (e.g., force-adding, cleaning up failed submodules, handling uncommitted changes, and switching between SSH/HTTPS). The update and removal processes now offer more granular options and recovery guidance, making submodule management more user-friendly and resilient.
Updated AssemblyVersion and FileVersion in EasyKit.csproj from 4.1.3 to 4.1.4 to reflect a new release.
Updated the MyAppVersion definition from 4.1.3 to 4.1.4 in both Release-win-x64.iss and Release-win-x86.iss to reflect the new application version.
Set the SetupIconFile property in both Release-win-x64.iss and Release-win-x86.iss to use a custom icon for the installer.
Eliminated the 'desktopicon' task and its association from both x64 and x86 Inno Setup scripts. The installer will now always create a desktop icon without prompting the user.
The post-install step to automatically launch the application has been removed from both the x64 and x86 Inno Setup scripts. This change prevents the app from starting immediately after installation.
Extracted common installer logic into a new Common.iss file and updated Release-win-x64.iss and Release-win-x86.iss to include it. This reduces duplication and centralizes shared configuration, making maintenance easier.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request includes updates to the
EasyKitproject, primarily focusing on version upgrades, centralizing shared logic for Inno Setup scripts, and improving maintainability by reusing common configuration across different builds. Below are the most important changes:Version Upgrade:
AssemblyVersionandFileVersioninEasyKit.csprojto4.1.4to reflect the new release.Centralized Shared Logic for Inno Setup:
Common.issfile to centralize shared configuration for Inno Setup scripts, such as application metadata and setup parameters. This reduces redundancy across different installer configurations.Refactored Inno Setup Scripts:
Release-win-x64.issto includeCommon.issand removed redundant setup logic, replacing it with shared definitions for the x64 build.Release-win-x86.isssimilarly to includeCommon.issand removed redundant setup logic for the x86 build.Submodule Update:
CommonUtilitiessubmodule to a new commit (0e06b1d3d93172fd2d0796ce81e2dd193d23abda).