Skip to content

Commit de67662

Browse files
committed
merge from hotfix_fake4
2 parents 43396b5 + 0425a96 commit de67662

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

RELEASE_NOTES.md

+3
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@
179179
* Fix NuGet key leak if push fails (https://github.com/matthid/FAKE/pull/2)
180180
* Coreclr nunit3 params (https://github.com/matthid/FAKE/pull/3)
181181

182+
#### 4.64.6 - 21.02.2018
183+
* ConvertFileFromWin7ToWin8 reads file line by line
184+
182185
#### 4.64.4 - 17.01.2018
183186
* Support for Dynamics NAV 2018 - https://github.com/fsharp/FAKE/pull/1758
184187

src/app/FakeLib/DynamicsNavHelper.fs

+8-4
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ module Replacements =
3535
let ConvertFileFromWin7ToWin8 fileName =
3636
if isWin8 then
3737
traceVerbose "Converting from Win7 format to Win8"
38-
Fake.StringHelper.ReadFileAsString fileName
39-
|> Win7ToWin8
40-
|> Fake.StringHelper.WriteStringToFile false fileName
38+
let tmpFile = fileName + ".tmp"
39+
Fake.StringHelper.ReadFile fileName
40+
|> Seq.map Win7ToWin8
41+
|> Fake.StringHelper.WriteToFile false tmpFile
42+
43+
File.Delete(fileName)
44+
File.Move(tmpFile, fileName)
4145

4246
let shortcutReplacements =
4347
["ShortCutKey=Strg","ShortCutKey=Ctrl"
@@ -458,4 +462,4 @@ let StopNavServiceTier serverMode navClientVersion =
458462
StopService "MicrosoftDynamicsNavServer$DynamicsNAV80"
459463
StopService "MicrosoftDynamicsNavServer$DynamicsNAV90"
460464
StopService "MicrosoftDynamicsNavServer$DynamicsNAV100"
461-
StopService "MicrosoftDynamicsNavServer$DynamicsNAV110"
465+
StopService "MicrosoftDynamicsNavServer$DynamicsNAV110"

0 commit comments

Comments
 (0)