Changed the extension of the external file to .projectSets.json to not break backwards compatibility (i.e. not changing the format of the vspsm file).

Author: Peter Palotas

Source/LoadedProjectsProfileManagerPackage.cs

@@ -338,7 +338,7 @@ private void SaveOptionsExternal()
                m_repository.SaveJson(fs);
             }
 
-            string targetPath = Path.ChangeExtension(info.SolutionFile, ".vspsm");
+            string targetPath = Path.ChangeExtension(info.SolutionFile, ".projectSets.json");
 
             if (!AreFilesIdentical(tempPath, targetPath))
             {
@@ -405,25 +405,26 @@ private static bool AreFilesIdentical(string file1, string file2, int bufferSize
          }
       }
 
-
       private void LoadOptionsExternal()
       {
          SolutionManager solMgr = GetSolutionManager();
          if (solMgr != null)
          {
             SolutionInfo info = solMgr.GetSolutionInfo();
 
-            string targetPath = Path.ChangeExtension(info.SolutionFile, ".vspsm");
 
-            if (File.Exists(targetPath))
+            string targetBinaryPath = Path.ChangeExtension(info.SolutionFile, ".vspsm");
+            string targetJsonPath = Path.ChangeExtension(info.SolutionFile, ".projectSets.json");
+
+            if (File.Exists(targetJsonPath))
+            {
+               m_repository.LoadJson(targetJsonPath, solMgr);
+            }
+            else if (File.Exists(targetBinaryPath))
             {
-               using (FileStream fs = new FileStream(targetPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+               using (FileStream fs = new FileStream(targetBinaryPath, FileMode.Open, FileAccess.Read, FileShare.Read))
                {
-                  if (!m_repository.TryLoadJson(fs, solMgr))
-                  {
-                     fs.Position = 0;
-                     m_repository.LoadBinary(fs, solMgr);
-                  }
+                  m_repository.LoadBinary(fs, solMgr);
                }
             }
          }

Source/Model/IProjectSetRepository.cs

@@ -116,30 +116,22 @@ public void SaveJson(JsonWriter writer)
          serializer.Serialize(writer, m_projectSets);
       }
 
-      public bool TryLoadJson(Stream stream, SolutionManager solMgr)
+      public void LoadJson(string fileName, SolutionManager solMgr)
       {
-         try
+         using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read))
+         using (StreamReader streamReader = new StreamReader(fs, Encoding.UTF8, true, 4096, true))
+         using (JsonReader reader = new JsonTextReader(streamReader))
          {
-            using (StreamReader streamReader = new StreamReader(stream, Encoding.UTF8, true, 4096, true))
-            using (JsonReader reader = new JsonTextReader(streamReader))
+            JsonSerializer serializer = JsonSerializer.Create();
+            var projectSets = serializer.Deserialize<ObservableCollection<ProjectSet>>(reader);
+            if (projectSets == null)
             {
-               JsonSerializer serializer = JsonSerializer.Create();
-               var projectSets = serializer.Deserialize<ObservableCollection<ProjectSet>>(reader);
-               if (projectSets == null)
-               {
-                  return false;
-               }
-
-               m_projectSets.Clear();
-               foreach (var projectSet in projectSets)
-                  m_projectSets.Add(projectSet);
+               projectSets = new ObservableCollection<ProjectSet>();
             }
 
-            return true;
-         }
-         catch (JsonReaderException)
-         {
-            return false;
+            m_projectSets.Clear();
+            foreach (var projectSet in projectSets)
+               m_projectSets.Add(projectSet);
          }
       }