Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FAKE template integration tests. #2640

Merged
merged 1 commit into from
Jan 30, 2022
Merged

Fix FAKE template integration tests. #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
]
},
"fake-cli": {
"version": "5.21.0-alpha004",
"version": "5.21.0",
"commands": [
"fake"
]
}
}
}
}
2 changes: 1 addition & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" &&
Expand Down