Add threedigit normalized method

Author: alerickson

src/code/InstallHelper.cs

@@ -599,6 +599,18 @@ private List<PSResourceInfo> InstallPackages(
 
                             // Add each pkg to _packagesOnMachine (ie pkgs fully installed on the machine).
                             _packagesOnMachine.Add($"{pkgName}{pkgInfo["pkgVersion"]}");
+
+                            // PSResourceInfo psResourceInfoPkg = pkgInfo["psResourceInfoPkg"] as PSResourceInfo;
+                            // psResourceInfoPkg.AdditionalMetadata.TryGetValue("NormalizedVersion", out string pkgVersion);
+                            // if (pkgVersion == null)
+                            // {
+                            //     // Not all NuGet providers (e.g. Artifactory, possibly others) send NormalizedVersion in NuGet package responses.
+                            //     // If they don't, we need to manually construct the combined version+prerelease from pkgToInstall.Version and the prerelease string.
+                            //     // Get three digit normalized version
+                            //     pkgVersion = Utils.GetThreeDigitNormalizedVersionString(psResourceInfoPkg.Version.ToString(), psResourceInfoPkg.Prerelease);
+                            // }
+                            
+                            _packagesOnMachine.Add($"{pkgName}{pkgVersion}");
                         }
                     }
                 }
@@ -827,7 +839,6 @@ private ConcurrentDictionary<string, Hashtable> BeginPackageInstall(
                 }
                 else {
                     // If we don't install dependencies, we're only installing the parent pkg so we can short circut and simply install the parent pkg. 
-                    // TODO::  check this version and prerelease combo
                     Stream responseStream = currentServer.InstallPackage(pkgToInstall.Name, pkgVersion, true, out ErrorRecord installNameErrRecord);
 
                     if (installNameErrRecord != null)

src/code/PSResourceInfo.cs

@@ -1535,7 +1535,7 @@ private static Dependency[] GetDependencies(ArrayList dependencyInfos)
 
         private static string ConcatenateVersionWithPrerelease(string version, string prerelease)
         {
-            return Utils.GetNormalizedVersionString(version, prerelease);
+            return Utils.GetThreeDigitNormalizedVersionString(version, prerelease);
         }
 
         #endregion
@@ -1820,7 +1820,8 @@ private static ResourceType ParseHttpMetadataTypeForLocalRepo(
 
         private PSObject ConvertToCustomObject()
         {
-            // 1.0.0-alpha1
+            // TODO update Normalized Version
+            // 1.0.0-alpha1   test_module 5.0.0.0
             // 1.0.0.0
             string NormalizedVersion = IsPrerelease ? ConcatenateVersionWithPrerelease(Version.ToString(), Prerelease) : Version.ToString();
 

src/code/Utils.cs

@@ -318,6 +318,45 @@ public static bool TryGetVersionType(
             return true;
         }
 
+        ///need this for cache
+        public static string GetThreeDigitNormalizedVersionString(
+            string versionString,
+            string prerelease)
+        {
+            // versionString may be like 1.2.0.0 or 1.2.0 or 1.2
+            // prerelease    may be      null    or "alpha1"
+            // possible passed in examples:
+            // versionString: "1.2"                           <- container registry 2 digit version
+            // versionString: "1.2"     prerelease: "alpha1"  <- container registry 2 digit version
+            // versionString: "1.2.0"   prerelease: "alpha1"
+            // versionString: "1.2.0"   prerelease: ""        <- doubtful though
+            // versionString: "1.2.0.0" prerelease: "alpha1"
+            // versionString: "1.2.0.0" prerelease: ""
+
+            int numVersionDigits = versionString.Split('.').Count();
+
+            if (numVersionDigits == 2)
+            {
+                // versionString: "1.2"   prerelease: "alpha1" -> 1.2.0-alpha1
+                return versionString + ".0-" + prerelease;
+            }
+            else if (numVersionDigits == 3)
+            {
+                // versionString: "1.2.0" prerelease: "alpha1" -> 1.2.0-alpha1
+                return versionString + "-" + prerelease;
+            }
+            else if (numVersionDigits == 4)
+            {
+                // if last digit is 0, truncated it 
+
+                // if it's not 0, just leave it
+                // versionString: "1.2.0.1"
+                return versionString;
+            }
+
+            return versionString;
+        }
+
         public static string GetNormalizedVersionString(
             string versionString,
             string prerelease)
@@ -1217,7 +1256,15 @@ internal static HashSet<string> GetInstalledPackages(List<string> pathsToSearch,
                 pathsToSearch: pathsToSearch,
                 selectPrereleaseOnly: false))
             {
-                string pkgNameVersion = String.Format("{0}{1}", installedPkg.Name, installedPkg.Version.ToString());
+                // if (string.Equals(installedPkg.Name, "test_module", StringComparison.OrdinalIgnoreCase))
+                // {
+                //     // get normalized version now
+                //     string pkgNameVersionnew = String.Format("{0}{1}", installedPkg.Name, Utils.GetNormalizedVersionString(installedPkg.AdditionalMetadata["NormalizedVersion"], installedPkg.Prerelease));
+                //     tempbool = true;
+                // }
+                
+                // normalize version here instead of using installedPkg.Version.ToString()
+                string pkgNameVersion = String.Format("{0}{1}", installedPkg.Name, Utils.GetThreeDigitNormalizedVersionString(installedPkg.Version.ToString(), installedPkg.Prerelease));
                 if (!pkgsInstalledOnMachine.Contains(pkgNameVersion))
                 {
                     pkgsInstalledOnMachine.Add(pkgNameVersion);

test/InstallPSResourceTests/InstallPSResourceV2Server.Tests.ps1

@@ -183,7 +183,7 @@ Describe 'Test Install-PSResource for V2 Server scenarios' -tags 'CI' {
         $pkg.Name | Should -Be "TestModuleWithDependencyC"
         $pkg.Version | Should -Be "1.0"
 
-        $pkg = Get-InstalledPSResource "TestModuleWithDependencyB", "TestModuleWithDependencyD"
+        $pkg = Get-InstalledPSResource "TestModuleWithDependencyB", "TestModuleWithDependencyD" -ErrorAction SilentlyContinue
         $pkg | Should -BeNullOrEmpty
     }