Skip to content

Commit

Permalink
Update build scripts
Browse files Browse the repository at this point in the history
- Travis-ci: Distro has changed to Ubuntu bionic, Mono changed to 6.8.0 and dotnet sdk to 3.1.102
- Appveyor: image changed to VS2019
- PowerShell script: CakeVersion updated to 0.37.0
- Bash script: DOTNET_INSTALL_URL updated
- For both powershell and bash, there was a bug in regex that couldn't detect versions like x.x.x00.
- Cake: The project is using `dotnet test` command. `xunit` command replaced with `test` command and arguments chagned to match dotnet test command.

NancyFx#3007
  • Loading branch information
Ali Bahrami committed Mar 12, 2020
1 parent 0a01746 commit 24ac114
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ os:
- osx

sudo: required
dist: trusty
dist: bionic

mono:
- 6.8.0

dotnet: 3.1.100
dotnet: 3.1.102

script:
- ./build.sh --verbosity=minimal
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: Visual Studio 2017
image: Visual Studio 2019

version: 2.0.0-ci000{build}
configuration: Release
Expand Down
4 changes: 2 additions & 2 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,13 @@ Task("Test")
}
var settings = new ProcessSettings {
Arguments = string.Concat("xunit -configuration ", configuration, " -nobuild"),
Arguments = string.Concat("test --configuration ", configuration, " --no-build"),
WorkingDirectory = project.GetDirectory()
};
if (IsRunningOnUnix())
{
settings.Arguments.Append(string.Concat("-framework ", netCoreTarget));
settings.Arguments.Append(string.Concat("--framework ", netCoreTarget));
}
Information("Executing tests for " + project.GetFilename() + " with arguments: " + settings.Arguments.Render());
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$CakeVersion = "0.24.0"
$DotNetVersion = select-string -Path .\global.json -Pattern '[\d]\.[\d]\.[\d]' | % {$_.Matches} | % {$_.Value };
$CakeVersion = "0.37.0"
$DotNetVersion = select-string -Path .\global.json -Pattern '[\d]\.[\d]\.[\d]*' | % {$_.Matches} | % {$_.Value };
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";

# Make sure tools folder exists
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Define directories.
SCRIPT_DIR=$PWD
TOOLS_DIR=$SCRIPT_DIR/tools
CAKE_VERSION=0.24.0
CAKE_VERSION=0.37.0
CAKE_DLL=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
DOTNET_VERSION=$(cat "$SCRIPT_DIR/global.json" | grep -o '[0-9]\.[0-9]\.[0-9]')
DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh
DOTNET_VERSION=$(cat "$SCRIPT_DIR/global.json" | grep -o '[0-9]\.[0-9]\.[0-9]*')
DOTNET_INSTRALL_URI=https://dot.net/v1/dotnet-install.sh

# Make sure the tools folder exist.
if [ ! -d "$TOOLS_DIR" ]; then
Expand Down

0 comments on commit 24ac114

Please sign in to comment.