Fix bad merge from 21.x

pull/11340/head
Mike Kruskal 2 years ago
parent 31a21cff3a
commit c39ccb73fb
  1. BIN
      csharp/src/Google.Protobuf.Test/testprotos.pb
  2. 1
      kokoro/macos/prepare_build_macos_rc
  3. 7
      php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php

@ -13,6 +13,7 @@ export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer
sudo xcode-select -s "${DEVELOPER_DIR}"
##
# Use Python 2 by default (for googletest)
pyenv global 2.7.18
##

@ -273,13 +273,6 @@ class Descriptor
->optional('source_file', \Google\Protobuf\Internal\GPBType::STRING, 2)
->optional('begin', \Google\Protobuf\Internal\GPBType::INT32, 3)
->optional('end', \Google\Protobuf\Internal\GPBType::INT32, 4)
->optional('semantic', \Google\Protobuf\Internal\GPBType::ENUM, 5, 'google.protobuf.internal.GeneratedCodeInfo.Annotation.Semantic')
->finalizeToPool();
$pool->addEnum('google.protobuf.internal.GeneratedCodeInfo.Annotation.Semantic', \Google\Protobuf\Internal\Semantic::class)
->value("NONE", 0)
->value("SET", 1)
->value("ALIAS", 2)
->finalizeToPool();
$pool->finish();

Loading…
Cancel
Save