diff options
Diffstat (limited to 'appveyor.bat')
| -rw-r--r-- | appveyor.bat | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/appveyor.bat b/appveyor.bat index ca88b25c3..9a46b9289 100644 --- a/appveyor.bat +++ b/appveyor.bat @@ -10,7 +10,7 @@ goto :error echo Building C++ mkdir build_msvc cd build_msvc -cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -Dprotobuf_UNICODE=%UNICODE% ../cmake +cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% ../cmake msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error cd %configuration% tests.exe || goto error @@ -19,16 +19,9 @@ goto :EOF :build_csharp echo Building C# cd csharp\src -REM The platform environment variable is implicitly used by msbuild; -REM we don't want it. -set platform= -dotnet restore -dotnet build -c %configuration% || goto error - -echo Testing C# -dotnet run -c %configuration% -f netcoreapp1.0 -p Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error -dotnet run -c %configuration% -f net451 -p Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error - +nuget restore +msbuild Google.Protobuf.sln /p:Platform="Any CPU" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error +nunit-console Google.Protobuf.Test\bin\%configuration%\Google.Protobuf.Test.dll || goto error goto :EOF :error |