Skip to content

Commit

Permalink
merge from hotfix_fake4
Browse files Browse the repository at this point in the history
  • Loading branch information
matthid committed Feb 22, 2018
2 parents 43396b5 + 0425a96 commit de67662
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@
* Fix NuGet key leak if push fails (https://github.com/matthid/FAKE/pull/2)
* Coreclr nunit3 params (https://github.com/matthid/FAKE/pull/3)

#### 4.64.6 - 21.02.2018
* ConvertFileFromWin7ToWin8 reads file line by line

#### 4.64.4 - 17.01.2018
* Support for Dynamics NAV 2018 - https://github.com/fsharp/FAKE/pull/1758

Expand Down
12 changes: 8 additions & 4 deletions src/app/FakeLib/DynamicsNavHelper.fs
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@ module Replacements =
let ConvertFileFromWin7ToWin8 fileName =
if isWin8 then
traceVerbose "Converting from Win7 format to Win8"
Fake.StringHelper.ReadFileAsString fileName
|> Win7ToWin8
|> Fake.StringHelper.WriteStringToFile false fileName
let tmpFile = fileName + ".tmp"
Fake.StringHelper.ReadFile fileName
|> Seq.map Win7ToWin8
|> Fake.StringHelper.WriteToFile false tmpFile

File.Delete(fileName)
File.Move(tmpFile, fileName)

let shortcutReplacements =
["ShortCutKey=Strg","ShortCutKey=Ctrl"
Expand Down Expand Up @@ -458,4 +462,4 @@ let StopNavServiceTier serverMode navClientVersion =
StopService "MicrosoftDynamicsNavServer$DynamicsNAV80"
StopService "MicrosoftDynamicsNavServer$DynamicsNAV90"
StopService "MicrosoftDynamicsNavServer$DynamicsNAV100"
StopService "MicrosoftDynamicsNavServer$DynamicsNAV110"
StopService "MicrosoftDynamicsNavServer$DynamicsNAV110"

0 comments on commit de67662

Please sign in to comment.