diff options
| author | mkruskal-google <62662355+mkruskal-google@users.noreply.github.com> | 2022-03-28 21:00:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 21:00:10 -0400 |
| commit | 43bb1bfe4224e31f2251da70aabcffeba0f3a2e6 (patch) | |
| tree | 026faf72603c6faebdf2194edd9b04af56e17f3f | |
| parent | 3dee6efa5414b240dc57b8072219321fb078cea1 (diff) | |
| parent | a114b008a205cebedd6e51762496d12841778d58 (diff) | |
| download | protobuf-upstream-master.tar.gz | |
Merge pull request #9692 from mkruskal-google/masterupstream-master
Reverting change to target frameworks that breaks kokoro
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj index a22ef9446..fe5ff8046 100644 --- a/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj +++ b/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net462;netcoreapp3.1;net6.0</TargetFrameworks> + <TargetFrameworks>net462;netcoreapp3.1;net60</TargetFrameworks> <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile> <SignAssembly>true</SignAssembly> <IsPackable>False</IsPackable> |