Don't touch app.config if we don't logically change it - references #…

…1248
fsprojects · Dec 3, 2015 · 9100cdf · 9100cdf
1 parent 40aa272
commit 9100cdf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.32.5 - 03.12.2015
+* Don't touch app.config if we don't logically change it - https://github.com/fsprojects/Paket/issues/1248
+
 #### 2.32.4 - 03.12.2015
 * Normalize versions in lock file for nuget.org - https://github.com/fsprojects/Paket/issues/1282
 

diff --git a/integrationtests/scenarios/i001248-stable-redirect/before/Project2/app.config b/integrationtests/scenarios/i001248-stable-redirect/before/Project2/app.config
@@ -6,8 +6,8 @@
     <!-- Google apps API keys -->
     <add key="GoogleAppMigrationWizProjectApiKey-1" value="key1" />
     <add key="GoogleAppMigrationWizProjectApiKey-2" value="key2" />
-    <add key="GoogleAppMigrationWizProjectApiKey-3" value="key3" />
-    <add key="SendEmails" value="false" />
+    <add key="GoogleAppMigrationWizProjectApiKey-3" value="key3"/>
+    <add key="SendEmails" value="false"/>
     <add key="BitTitanDropBoxAppKey" value="BitTitan" />
     <add key="BitTitanDropBoxSecretKey" value="BitTitan" />
   </appSettings>

diff --git a/src/Paket.Core/BindingRedirects.fs b/src/Paket.Core/BindingRedirects.fs
@@ -67,7 +67,6 @@ let internal indentAssemblyBindings config =
     let xmlWriterSettings = XmlWriterSettings()
     xmlWriterSettings.Indent <- true 
     use writer = XmlWriter.Create(sb, xmlWriterSettings)
-
     let tempAssemblyBindingNode = XElement.Parse(assemblyBinding.ToString())
     tempAssemblyBindingNode.WriteTo writer
     writer.Close()
@@ -124,6 +123,8 @@ let private applyBindingRedirects isFirstGroup cleanBindingRedirects bindingRedi
         with
         | exn -> failwithf "Parsing of %s failed.%s%s" configFilePath Environment.NewLine exn.Message
 
+    let original = config.ToString(SaveOptions.None)
+
     let isMarked e =
         match tryGetElement (Some bindingNs) "Paket" e with
         | Some e -> e.Value.Trim().ToLower() = "true"
@@ -139,7 +140,9 @@ let private applyBindingRedirects isFirstGroup cleanBindingRedirects bindingRedi
 
     let config = Seq.fold setRedirect config bindingRedirects
     indentAssemblyBindings config
-    config.Save configFilePath
+    let newText = config.ToString(SaveOptions.None)
+    if newText <> original then
+        config.Save(configFilePath, SaveOptions.DisableFormatting)
 
 /// Applies a set of binding redirects to all .config files in a specific folder.
 let applyBindingRedirectsToFolder isFirstGroup createNewBindingFiles cleanBindingRedirects rootPath bindingRedirects =