[tools] Fix issue when serialized json file is null (#18565)

Azure · Jun 17, 2022 · 5fe28a3 · 5fe28a3
1 parent 58755ec
commit 5fe28a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tools/Tools.Common/Models/ModuleMetadata.cs b/tools/Tools.Common/Models/ModuleMetadata.cs
@@ -99,7 +99,7 @@ public override bool Equals(Object obj)
 
         public static ModuleMetadata DeserializeCmdlets(string fileName)
         {
-            return JsonConvert.DeserializeObject<ModuleMetadata>(File.ReadAllText(fileName));
+            return File.Exists(fileName) ? JsonConvert.DeserializeObject<ModuleMetadata>(File.ReadAllText(fileName)) : null;
         }
 
         public override int GetHashCode()

diff --git a/tools/VersionController/Models/VersionMetadataHelper.cs b/tools/VersionController/Models/VersionMetadataHelper.cs
@@ -50,15 +50,15 @@ public VersionMetadataHelper(VersionFileHelper fileHelper)
         /// <returns></returns>
         private ModuleMetadata DeserializeCmdlets(string fileName)
         {
-            return JsonConvert.DeserializeObject<ModuleMetadata>(File.ReadAllText(fileName));
+            return File.Exists(fileName) ? JsonConvert.DeserializeObject<ModuleMetadata>(File.ReadAllText(fileName)) : null;
         }
 
         /// <summary>
         /// Serialize the cmdlets so they can be compared to change modules later
         /// </summary>
         /// <param name="fileName">Name of the file cmdlets are being serialized to.</param>
         /// <param name="cmdlets">List of cmdlets that are to be serialized.</param>
-        public static void SerializeCmdlets(string fileName, ModuleMetadata moduleMetadata)
+        public static string SerializeCmdlets(string fileName, ModuleMetadata moduleMetadata)
         {
             string json = JsonConvert.SerializeObject(moduleMetadata, new JsonSerializerSettings
             {
@@ -67,6 +67,7 @@ public static void SerializeCmdlets(string fileName, ModuleMetadata moduleMetada
                 ContractResolver = VersionMetadataContractResolver.Instance
             });
             File.WriteAllText(fileName, json);
+            return fileName;
         }
 
         /// <summary>
@@ -297,7 +298,8 @@ public Version GetVersionBumpUsingSerialized()
                 Console.WriteLine($"Warning: {moduleName} does not have a previously serialized cmdlet for comparison.");
                 Console.ForegroundColor = currentColor;
                 var newCmdletFile = Path.Join(serializedCmdletsDirectory, serializedCmdletName);
-                SerializeCmdlets(newCmdletFile, newModuleMetadata);
+                // Use newly build one, only bump PATCH version
+                serializedCmdletFile = SerializeCmdlets(newCmdletFile, newModuleMetadata);
             }
             var oldModuleMetadata = DeserializeCmdlets(serializedCmdletFile);
             CmdletLoader.ModuleMetadata = oldModuleMetadata;