Updated Travis config to enable running on Mac and also fixed test

This commit is contained in:
Kiran Challa 2015-12-10 10:27:15 -08:00
parent dde06ffdcb
commit 573bdcc318
4 changed files with 8 additions and 28 deletions

3
.gitignore vendored
View File

@ -27,4 +27,5 @@ nuget.exe
node_modules
*.sln.ide
project.lock.json
.vs/
.vs/
launchSettings.json

View File

@ -10,9 +10,14 @@ addons:
- libssl-dev
- libunwind8
- zlib1g
before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; fi
env:
- KOREBUILD_DNU_RESTORE_CORECLR=true KOREBUILD_TEST_DNXCORE=true
mono:
- 4.0.5
os:
- linux
- osx
script:
- ./build.sh --quiet verify

View File

@ -1,26 +0,0 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:41542/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNET_ENV": "Development"
}
},
"web": {
"commandName": "web",
"commandLineArgs": " ",
"environmentVariables": {
"Hosting:Environment": "Development"
}
}
}
}

View File

@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Diagnostics
"TestFiles/SourceFile.txt"
};
if (!TestPlatformHelper.IsLinux)
if (!(TestPlatformHelper.IsLinux || TestPlatformHelper.IsMac))
{
data.Add(@"TestFiles\SourceFile.txt");
}