Skip to content

Refactor module version/GUID comparison logic #7125

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

Merged
Aditya Patwardhan (adityapatwardhan) merged 6 commits into from
Nov 1, 2018
Merged

Refactor module version/GUID comparison logic #7125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c08f151
[Feature] Refactor module version comparison logic so it all goes thr…
Jun 21, 2018
e56b1b4
Fix inverted if conditions
Jun 21, 2018
a1d4707
[Feature] Remove rebase artefacts
Sep 28, 2018
dc731a3
[Feature] Run formerly pending tests to check loaded module versions
Oct 10, 2018
c1141d9
[Feature] Remove parameter defaults for local module constraint metho…
Oct 12, 2018
bf88fd9
[Feature] Rename IsModuleAlreadyLoaded
Oct 30, 2018
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
Next Next commit
[Feature] Refactor module version comparison logic so it all goes thr… 
…ough one method
  • Loading branch information
Robert Holt
Robert Holt committed Sep 28, 2018
commit c08f151a9c44e424a5a82049e676ef2cc1d66c2b
9 changes: 2 additions & 7 deletions src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,13 +586,8 @@ private PSModuleInfo ImportModule_LocallyViaName(ImportModuleOptions importModul
PSModuleInfo module;
if (!BaseForce && Context.Modules.ModuleTable.TryGetValue(rootedPath, out module))
{
if (RequiredVersion == null
|| module.Version.Equals(RequiredVersion)
|| (BaseMinimumVersion == null && BaseMaximumVersion == null)
|| module.ModuleType != ModuleType.Manifest
|| (BaseMinimumVersion == null && BaseMaximumVersion != null && module.Version <= BaseMaximumVersion)
|| (BaseMinimumVersion != null && BaseMaximumVersion == null && module.Version >= BaseMinimumVersion)
|| (BaseMinimumVersion != null && BaseMaximumVersion != null && module.Version >= BaseMinimumVersion && module.Version <= BaseMaximumVersion))
if (module.ModuleType != ModuleType.Manifest
|| ModuleIntrinsics.IsVersionMatchingConstraints(module.Version, RequiredVersion, BaseMinimumVersion, BaseMaximumVersion))
{
alreadyLoaded = true;
AddModuleToModuleTables(this.Context, this.TargetSessionState.Internal, module);
Expand Down
Loading