Merge pull request #2640 from FoothillSolutions/fix-template-integrat…

…ion-tests Fix FAKE template integration tests.
fsprojects · Jan 30, 2022 · aaba198 · aaba198
2 parents c7273c7 + 1c13985
commit aaba198
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,10 +15,10 @@
       ]
     },
     "fake-cli": {
-      "version": "5.21.0-alpha004",
+      "version": "5.21.0",
       "commands": [
         "fake"
       ]
     }
   }
-}
+}
diff --git a/build.fsx b/build.fsx
@@ -207,7 +207,7 @@ let version =
                 |> Seq.append [ 0I ]
                 |> Seq.max
             let d = System.DateTime.Now
-            [ PreReleaseSegment.AlphaNumeric ("local-" + (currentVer + 1I).ToString()) ], d.ToString("yyyy-MM-dd-HH-mm")
+            [ PreReleaseSegment.AlphaNumeric ("local." + (currentVer + 1I).ToString()) ], d.ToString("yyyy-MM-dd-HH-mm")
 
     let semVer = SemVer.parse release.NugetVersion
     let prerelease =

diff --git a/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs b/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs
@@ -73,7 +73,7 @@ let timeout = (System.TimeSpan.FromMinutes 10.)
 let runTemplate rootDir kind dependencies dsl =
     Directory.ensure rootDir
     try
-        DotNet.exec (dtntWorkDir rootDir >> redirect()) "new" (sprintf "%s --allow-scripts yes --version 5.16.2-alpha.1304 --bootstrap %s --dependencies %s --dsl %s" templateName (string kind) (string dependencies) (string dsl))   
+        DotNet.exec (dtntWorkDir rootDir >> redirect()) "new" (sprintf "%s --allow-scripts yes --bootstrap %s --dependencies %s --dsl %s" templateName (string kind) (string dependencies) (string dsl))
         |> shouldSucceed "should have run the template successfully"
     with e ->
         if e.Message.Contains "Command succeeded" &&