fixed NuGet/Home#2158 and NuGet/Home#1567

NuGet · Feb 25, 2016 · f83234a · f83234a
1 parent 53ad894
commit f83234a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/src/NuGet.Clients/Options/PackageSourcesOptionsControl.cs b/src/NuGet.Clients/Options/PackageSourcesOptionsControl.cs
@@ -227,15 +227,12 @@ internal bool ApplyChangedSettings()
                     _packageSourceProvider.SavePackageSources(packageSources);
                 }
             }
-            catch (InvalidOperationException)
+            catch (Configuration.NuGetConfigurationException e)
             {
-                MessageHelper.ShowErrorMessage(Resources.ShowError_ConfigInvalidOperation, Resources.ErrorDialogBoxTitle);
+                MessageHelper.ShowErrorMessage(e.Message, Resources.ErrorDialogBoxTitle);
                 return false;
             }
-            catch (UnauthorizedAccessException)
-            {
-                MessageHelper.ShowErrorMessage(Resources.ShowError_ConfigUnauthorizedAccess, Resources.ErrorDialogBoxTitle);
-            }
+
             // find the enabled package source 
             return true;
         }

diff --git a/src/NuGet.Core/NuGet.Configuration/Properties/Resources.Designer.cs b/src/NuGet.Core/NuGet.Configuration/Properties/Resources.Designer.cs
diff --git a/src/NuGet.Core/NuGet.Configuration/Resources.resx b/src/NuGet.Core/NuGet.Configuration/Resources.resx
@@ -136,10 +136,16 @@
     <value>Parameter 'fileName' to Settings must be just a fileName and not a path</value>
   </data>
   <data name="ShowError_ConfigInvalidOperation" xml:space="preserve">
-    <value>NuGet.Config is malformed, Please check NuGet.Config at '{0}'.</value>
+    <value>NuGet.Config is malformed, Please check NuGet.Config at '{0}', exception message is '{1}'.</value>
+  </data>
+  <data name="ShowError_ConfigInvalidXml" xml:space="preserve">
+    <value>NuGet.Config is invalid XML, Please check NuGet.Config at '{0}', exception message is '{1}'.</value>
   </data>
   <data name="ShowError_ConfigUnauthorizedAccess" xml:space="preserve">
-    <value>Can not access NuGet.Config, Please check NuGet.Config at '{0}'.</value>
+    <value>Can not access NuGet.Config, Please check NuGet.Config at '{0}', exception message is '{1}'.</value>
+  </data>
+  <data name="Unknown_Config_Exception" xml:space="preserve">
+    <value>Got exception From NuGet.Config, Please check NuGet.Config at '{0}', exception message is '{1}'.</value>
   </data>
   <data name="UnsupportedHashAlgorithm" xml:space="preserve">
     <value>Hash algorithm '{0}' is unsupported. Supported algorithms include: SHA512 and SHA256.</value>

diff --git a/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs b/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs
@@ -1068,13 +1068,25 @@ private void ExecuteSynchronizedCore(Action ioOperation)
                 catch(InvalidOperationException e)
                 {
                     throw new NuGetConfigurationException(
-                        string.Format(Resources.ShowError_ConfigInvalidOperation, fileName), e);
+                        string.Format(Resources.ShowError_ConfigInvalidOperation, fileName, e.Message), e);
                 }
 
                 catch (UnauthorizedAccessException e)
                 {
                     throw new NuGetConfigurationException(
-                        string.Format(Resources.ShowError_ConfigUnauthorizedAccess, fileName), e);
+                        string.Format(Resources.ShowError_ConfigUnauthorizedAccess, fileName, e.Message), e);
+                }
+
+                catch (XmlException e)
+                {
+                    throw new NuGetConfigurationException(
+                        string.Format(Resources.ShowError_ConfigInvalidXml, fileName, e.Message), e);
+                }
+
+                catch (Exception e)
+                {
+                    throw new NuGetConfigurationException(
+                        string.Format(Resources.ShowError_ConfigInvalidXml, fileName, e.Message), e);
                 }
 
                 finally