- pick up latest `build.cmd` and `build.sh` files
- go back to Mono Beta feed (version 4.0.4) in Travis builds
  - avoid frequent `mono .nuget/nuget.exe` failures
  - skip test that fails with this Mono version
This commit is contained in:
Doug Bunting 2015-10-10 19:09:23 -07:00
parent 8d8943bcfe
commit 7e93136484
4 changed files with 27 additions and 20 deletions

View File

@ -1,6 +1,6 @@
language: csharp language: csharp
sudo: false sudo: false
mono: mono:
- alpha - beta
script: script:
- ./build.sh --quiet verify - ./build.sh --quiet verify

View File

@ -18,22 +18,23 @@ md .nuget
copy %CACHED_NUGET% .nuget\nuget.exe > nul copy %CACHED_NUGET% .nuget\nuget.exe > nul
:restore :restore
IF EXIST packages\KoreBuild goto run IF EXIST packages\Sake goto getdnx
IF %BUILDCMD_KOREBUILD_VERSION%=="" ( IF %BUILDCMD_KOREBUILD_VERSION%=="" (
.nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
) ELSE ( ) ELSE (
.nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
) )
.nuget\nuget.exe install Sake -ExcludeVersion -Out packages .nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
IF "%SKIP_DNX_INSTALL%"=="1" goto run :getdnx
IF %BUILDCMD_DNX_VERSION%=="" ( IF "%SKIP_DNX_INSTALL%"=="" (
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 IF "%BUILDCMD_DNX_VERSION%"=="" (
BUILDCMD_DNX_VERSION=latest
)
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
) ELSE ( ) ELSE (
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -alias default CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
) )
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
:run
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %* packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

View File

@ -24,18 +24,20 @@ if test ! -e .nuget; then
cp $cachePath .nuget/nuget.exe cp $cachePath .nuget/nuget.exe
fi fi
if test ! -d packages/KoreBuild; then if test ! -d packages/Sake; then
mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
mono .nuget/nuget.exe install Sake -ExcludeVersion -Out packages mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
fi fi
if ! type dnvm > /dev/null 2>&1; then if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh source packages/KoreBuild/build/dnvm.sh
fi fi
if ! type dnx > /dev/null 2>&1; then if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
dnvm upgrade dnvm install latest -runtime coreclr -alias default
dnvm install default -runtime mono -alias default
else
dnvm use default -runtime mono
fi fi
mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@" mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"

View File

@ -6,6 +6,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Http.Authentication;
using Microsoft.AspNet.Testing.xunit;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Authentication namespace Microsoft.AspNet.Authentication
@ -97,7 +98,10 @@ namespace Microsoft.AspNet.Authentication
} }
} }
[Fact] [ConditionalFact]
[FrameworkSkipCondition(
RuntimeFrameworks.Mono,
SkipReason = "Test fails with Mono 4.0.4. Build rarely reaches testing with Mono 4.2.1")]
public void CanRoundTripClaimProperties() public void CanRoundTripClaimProperties()
{ {
var serializer = new TicketSerializer(); var serializer = new TicketSerializer();