Merge branch 'hotfix_fake4' of github.com:fsharp/FAKE into release/next

fsprojects · Feb 9, 2020 · d5a4763 · d5a4763
2 parents 5b48c17 + b1700c6
commit d5a4763
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -203,7 +203,13 @@
 * DOCS: Resort TraceSecrets.register indexed parameters - https://github.com/fsharp/FAKE/pull/2254
 * DOCS: fix broken links #2241 - https://github.com/fsharp/FAKE/pull/2241
 
-## 4.64.16 - 2019-02-15
+#### 4.64.18 - 2020-01-30
+* Add Dynamics Business Central 365 support
+
+#### 4.64.17 - 2019-03-19
+* Add support for MSBuild16 
+
+#### 4.64.16 - 2019-02-15
 * Add Dynamics NAV FullCompile function
 
 ## 4.64.14 - 2019-01-07

diff --git a/src/legacy/FakeLib/DynamicsNavHelper.fs b/src/legacy/FakeLib/DynamicsNavHelper.fs
@@ -112,6 +112,7 @@ let getNAVClassicPath navClientVersion =
         | "1000" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\100\RoleTailored Client"
         | "1100" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\110\RoleTailored Client"
         | "1300" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\130\RoleTailored Client"
+        | "1400" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\140\RoleTailored Client"
         | "501" -> @"software\microsoft\Dynamics Nav\Cside Client\W1 5.0 SP1"
         | "403" -> @"SOFTWARE\Navision\Microsoft Business Solutions-Navision\W1 4.00"
         | _     -> failwithf "Unknown NAV-Version (Client) %s" navClientVersion
@@ -135,11 +136,12 @@ let getNAVServicePath navClientVersion =
             | "1000" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\100\Service"
             | "1100" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\110\Service"
             | "1300" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\130\Service"
+            | "1400" -> @"SOFTWARE\Microsoft\Microsoft Dynamics NAV\140\Service"
             | _     -> failwithf "Unknown NAV-Version (Service) %s" navClientVersion
 
         match navClientVersion with
         | "601" | "602" -> getRegistryValue HKEYLocalMachine subKey "Path"
-        | "700"| "701"| "800" | "900" | "1000" | "1100" | "1300" -> getRegistryValue64 HKEYLocalMachine subKey "Path"
+        | "700"| "701"| "800" | "900" | "1000" | "1100" | "1300" | "1400" -> getRegistryValue64 HKEYLocalMachine subKey "Path"
         | _     -> failwithf "Unknown NAV-Version (Service) %s" navClientVersion
 
     (directoryInfo navServiceRootPath).Parent.FullName @@ "Service"
@@ -576,6 +578,8 @@ let StartNavServiceTier serverMode navClientVersion =
             StartService "MicrosoftDynamicsNavServer$DynamicsNAV110"
         | "1300" ->
             StartService "MicrosoftDynamicsNavServer$DynamicsNAV130"
+        | "1400" ->
+            StartService "MicrosoftDynamicsNavServer$DynamicsNAV140"
         | _ -> failwithf "NavServiceTier of version %s unknown." navClientVersion
 
 [<System.Obsolete("This API is obsolete. There is no alternative in FAKE 5 yet. You can help by porting this module.")>]
@@ -591,3 +595,4 @@ let StopNavServiceTier serverMode navClientVersion =
         StopService "MicrosoftDynamicsNavServer$DynamicsNAV100"
         StopService "MicrosoftDynamicsNavServer$DynamicsNAV110"
         StopService "MicrosoftDynamicsNavServer$DynamicsNAV130"
+        StopService "MicrosoftDynamicsNavServer$DynamicsNAV140"
diff --git a/src/legacy/FakeLib/MSBuildHelper.fs b/src/legacy/FakeLib/MSBuildHelper.fs
@@ -28,6 +28,11 @@ type MsBuildEntry = {
 [<System.Obsolete("Use Fake.DotNet.MSBuild instead")>]
 let knownMsBuildEntries =
     [
+        { Version = "16.0"; Paths = [@"\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
+                                     @"\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin"
+                                     @"\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+                                     @"\MSBuild\Current\Bin"
+                                     @"\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"] }
         { Version = "15.0"; Paths = [@"\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin"
                                      @"\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin"
                                      @"\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin"
@@ -130,6 +135,8 @@ let msBuildExe =
         traceFAKE "If you encounter msbuild errors make sure you have copied the required SDKs, see https://github.com/Microsoft/msbuild/issues/1697"
     elif foundExe.Contains @"\2017\" then
         logVerbosefn "Using msbuild of VS2017 (%s), if you encounter build errors make sure you have installed the necessary workflows!" foundExe
+    elif foundExe.Contains @"\2019\" then
+        logVerbosefn "Using msbuild of VS2019 (%s), if you encounter build errors make sure you have installed the necessary workflows!" foundExe        
     foundExe
 
 /// [omit]