From 753daae02725ec73615fb33003c79395f70aa7ff Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 Mar 2019 04:40:46 -0400 Subject: [PATCH] use netcoreapp2.1 for testing --- appveyor.bat | 2 +- csharp/buildall.bat | 2 +- csharp/buildall.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.bat b/appveyor.bat index 29ec4922a..7a35ceb4d 100644 --- a/appveyor.bat +++ b/appveyor.bat @@ -38,7 +38,7 @@ dotnet restore dotnet build -c %configuration% || goto error echo Testing C# -dotnet test -c %configuration% -f netcoreapp1.0 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error +dotnet test -c %configuration% -f netcoreapp2.1 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error dotnet test -c %configuration% -f net451 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error goto :EOF diff --git a/csharp/buildall.bat b/csharp/buildall.bat index 1ec4dd530..89cf8f057 100644 --- a/csharp/buildall.bat +++ b/csharp/buildall.bat @@ -4,7 +4,7 @@ dotnet build src/Google.Protobuf.sln || goto :error echo Running tests. -dotnet test -f netcoreapp1.0 src/Google.Protobuf.Test/Google.Protobuf.Test.csproj || goto :error +dotnet test -f netcoreapp2.1 src/Google.Protobuf.Test/Google.Protobuf.Test.csproj || goto :error goto :EOF diff --git a/csharp/buildall.sh b/csharp/buildall.sh index 50d8906dc..43b5ac3ff 100755 --- a/csharp/buildall.sh +++ b/csharp/buildall.sh @@ -10,8 +10,8 @@ dotnet restore $SRC/Google.Protobuf.sln dotnet build -c $CONFIG $SRC/Google.Protobuf.sln echo Running tests. -# Only test netcoreapp1.0, which uses the .NET Core runtime. +# Only test netcoreapp2.1, which uses the .NET Core runtime. # If we want to test the .NET 4.5 version separately, we could # run Mono explicitly. However, we don't have any differences between -# the .NET 4.5 and netstandard1.0 assemblies. -dotnet test -c $CONFIG -f netcoreapp1.0 $SRC/Google.Protobuf.Test/Google.Protobuf.Test.csproj +# the .NET 4.5 and netstandard2.1 assemblies. +dotnet test -c $CONFIG -f netcoreapp2.1 $SRC/Google.Protobuf.Test/Google.Protobuf.Test.csproj