Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize line endings for C# sources #9526

Closed
jtattermusch opened this issue Feb 18, 2022 · 4 comments
Closed

Normalize line endings for C# sources #9526

jtattermusch opened this issue Feb 18, 2022 · 4 comments
Assignees
Labels

Comments

@jtattermusch
Copy link
Contributor

Followup for incident in https://github.com/protocolbuffers/protobuf/pull/6307/files#r806572011

Run this command to see the current status:

git ls-files --eol csharp/src

Currently most files use LF, some files use CRLF and some files have mixed line endings.

Also see https://www.aleksandrhovhannisyan.com/blog/crlf-vs-lf-normalizing-line-endings-in-git/

@jtattermusch
Copy link
Contributor Author

CC @jskeet

@jskeet
Copy link
Contributor

jskeet commented Feb 18, 2022

We should probably work out any advice we need to give (or repo settings) to avoid users getting into problems in the future.
It would be good to add a test for this too.

@jskeet
Copy link
Contributor

jskeet commented Feb 28, 2022

I'll try to get to this next week. (This week is pretty busy.)

@jskeet
Copy link
Contributor

jskeet commented Mar 7, 2022

Okay, (not having read the first comment that shows git ls-files --eol, doh) I've written some code to categorize text files (from src and csharp, recursively) into "empty", "CRLF", "LF" or "mixed". Attaching the results at the bottom of this comment.

In summary:

  • LF: 774
  • CRLF: 38
  • Mixed: 4

It shouldn't be too hard to normalize on LF - I'm currently not sure of the best place to put a test for that though (to make sure we don't get regressions). I suspect git ls-files is the way forward though.

We might want to make an exception for .sln files as they're not usually hand-written - it's entirely possible that Visual Studio would clobber them anyway.

output.txt

jskeet added a commit to jskeet/protobuf that referenced this issue Mar 28, 2022
This commit should have no non-whitespace changes

Fixes protocolbuffers#9526 (in terms of content)
jskeet added a commit to jskeet/protobuf that referenced this issue Mar 28, 2022
jskeet added a commit to jskeet/protobuf that referenced this issue Mar 28, 2022
@jskeet jskeet closed this as completed in e1e9d3e Mar 29, 2022
jskeet added a commit that referenced this issue Mar 29, 2022
clrpackages pushed a commit to clearlinux-pkgs/protobuf that referenced this issue Sep 20, 2022
… 21.6

AN Long (1):
      Add python-requires in setup.py (#8989)

Adam Cozzette (96):
      Sync from Piper @392954264
      Update CHANGES.txt
      Add new Python-C++ source files to Makefile.am
      Use kName naming style for enum in binary_json_conformance_suite.cc
      Allocate 10 descriptor.proto extension numbers for COSI (#8921)
      Fix dist install test by ensuring that we use Python 3 (#9011)
      Update cmake file lists (#9038)
      Sync from Piper @402594188
      Update CHANGES.txt
      Tweak syntax of casting function to void
      Update the file lists with ./update_file_lists.sh
      Add jsr305 dependency for Bazel
      Removed unused references to easymock_classextension
      Remove references to six (#9096)
      Remove references to HAVE_PTHREAD (#9100)
      Use dedicated helper functions for map descriptors (#9099)
      Update protobuf version (#9106)
      Update Mac test runs to download RVM directly from GitHub (#9107)
      Update CHANGES.txt for 3.19.0
      Update PHP release notes for 3.19.0 (#9110)
      Python: fix usages of deprecated assertRaisesRegxp (#9098)
      Update version to 3.19.0-rc2 and fix changelog about Java 7 (#9116)
      Update protobuf version (#9119)
      Fix Python 3.10 C++ tests (#9128)
      Ensure that release archives contain everything needed for Bazel (#9131)
      Make IsDescriptor* helpers lenient about descriptor name (#9127)
      Fix distcheck test by updating example Go file paths (#9137)
      Update checked-in C# generated code (#9158)
      Align dependency handling with Bazel best practices (#9165)
      Update changelog for 3.19.1
      Update protobuf version (#9167)
      Fix benchmark by making sure we use Python 3 (#9170)
      Fix benchmark by making sure we use Python 3 (#9170) (#9176)
      Update our build script to publish Mac aarch_64 binaries (#9203)
      Remove unused includes from unit tests (#9251)
      Use C++11 integer types and fully qualify std::string (#9253)
      Small tweaks to C# unit tests (#9271)
      Cherry-pick fix from #9311 into 3.18.x (#9320)
      Fix Ruby release build by pinning rake-compiler-dock version (#9372)
      Improve performance of parsing unknown fields in Java (#9371)
      Fix Ruby release build by pinning rake-compiler-dock version (#9372)
      Improve performance of parsing unknown fields in Java (#9371)
      Update CHANGES.txt for 3.19.2 release
      Update protobuf version
      Tweak wording of CHANGES.txt
      Fix Python 3.10 C++ tests (#9128)
      Fix build error with Python 3.10 build on Windows
      Update CHANGES.txt for 3.19.3
      Update protobuf version
      Revert "Standardize on Array copyOf" (#9400)
      Update CHANGES.txt to include recent Java security advisory (#9403)
      Make libprotobuf symbols local on OSX (#8346) (#9435)
      Update CHANGES.txt for 3.19.4 release (#9448)
      Update protobuf version for 3.19.4 (#9449)
      Ruby: rename max_recursion_depth to recursion_limit (#9486)
      Fix the benchmark job and delete old Python configs (#9497)
      Fix update_version.py script (#9554)
      Sync from Piper @431959314
      Update CHANGES.txt
      Replace EasyMock dependency with Mockito and re-pin Bazel deps
      Undo unintentional file list changes
      Reimplement the type sorter to avoid a ICE in gcc 4.8.2.
      Update CHANGES.txt
      Update Makefile.am with new Python files
      Add missing GSON dependency
      Add new unit test protos to setup.py
      Update protobuf version
      Update tests.sh to locally install all Java packages, not just util
      Lower minimum CMake version to 3.5 (#9580)
      Update CHANGES.txt for 3.20.0 release (#9581)
      Sync from Piper @acozzette/proto_github_202203101748
      Sync from Piper @acozzette/proto_github_202203101748
      Fix typo in src/README.md (#9644)
      Update CHANGES.txt with recent internal changes
      Fix warning about unused variable in unit test
      Add new Python file to Makefile.am
      Revert "Use repo-relative labels wherever possible (#9187)" (#9696)
      Update protobuf_deps.bzl to add a dependency on Abseil (#9752)
      Start reducing our reliance on autotools (#9824)
      Remove the JavaScript implementation (#9874)
      Remove cuda.list from apt sources (#9896)
      Update CHANGES.txt (#9897)
      Sync from Piper @446230931
      Fix spelling error
      Remove unused ShouldVerifyInt32() function
      Use __constinit only in GCC 12.2 and up (#9936)
      Add endian.h to includes list (#10057)
      Remove Abseil dependency from CMake build (#10056)
      Revert "Fix cmake install targets (#9822)" (#10060)
      Upgrade upb to include another recent fix
      Update CHANGES.txt for the 21.3 release
      Update version.json to: 21.3-dev (#10275)
      Upgrade upb and update CHANGES.txt (#10286)
      Update the release date in package.xml (#10295)
      Update developer username in package.xml (#10297)
      Update version.json to: 21.4-dev (#10299)

Alex Vanyo (1):
      Add test scope to kotlin-test for protobuf-kotlin-lite

Alexandre Mutel (1):
      Fixed NullReferenceException when accessing FieldDescriptor.IsPacked

Alexey Solodkiy (1):
      Add twirp to RPC Implementations list (#9085)

Alisa (1):
      Fix broken max macro on Windows (#9273)

Amin Vakil (1):
      Add $(nproc) to make documentation (#9360)

Anthony Dmitriyev (1):
      Use rb_obj_class instead of CLASS_OF in Ruby C to ignore singleton classes (#9342)

Antoine Pitrou (1):
      Fix #9947: make the ABI identical between debug and non-debug builds

Arfrever (3):
      cmake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (#9529)
      cmake: Use linker version scripts (#9545)
      CMake fixes (#9595)

Arfrever Frehtes Taifersar Arahesis (5):
      Rename main cmake/CMakeLists.txt to CMakeLists.txt
      Add cmake/CMakeLists.txt for compatibility (#9596)
      cmake: Replace protobuf_source_dir variable with protobuf_SOURCE_DIR variable (#9596)
      cmake: Call get_filename_component() with DIRECTORY mode instead of PATH mode (#9614)
      Enable GeneratedDescriptorTest.EnormousDescriptor test for GCC/Clang CMake builds (#9617)

BartH (1):
      Added Embedded Proto to options.md to reserve the extenion number for the custom options. (#9493)

Biswapriyo Nath (1):
      Fix checking Windows platform with preprocessor (#9460)

Bo Yang (3):
      Stopping build wheel for python 2.7
      Stop building wheel for python 3.5
      Stick to a working version of docker file

Brent Shaffer (16):
      fix: [PHP] add missing reserved classnames (#9458)
      chore: [PHP] fix phpdoc for MapField keys
      fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
      fix: phpdoc syntax for repeatedfield parameters (#9784)
      fix: phpdoc for repeatedfield (#9783)
      fix: move composer.json out of root to avoid confusion (#9819)
      Add back "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)"
      feat: [PHP] add previous classname to descriptor pool
      refactor for efficiency
      free lower
      fix valgrind error
      fix dist tests
      address review comments
      fix valgrind
      address review comments
      fix: fix PHP readonly legacy files for nested messages

Brett McBride (14):
      fixing php 8.1 deprecation warnings
      adding return type hints to php ext
      require bcmath
      conditionally adding mixed return type
      bump extension min version to 7.2
      php 7.0 support
      fixing typo in comment
      working 7.0 extension
      polyfill ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX
      tidy
      formatting
      removing ext-bcmath require
      php8.1 testing
      adding php81 support to release notes (#9590)

Bu Sun Kim (1):
      Add python 3.10 (#9034)

Chris Bainbridge (1):
      Fix comment syntax in any.proto (#8792)

Chris McClymont (1):
      Add class method from_time to ruby well known types - Timestamp

Chris Povirk (2):
      Add jsr305 to protobuf-util deps. (#9059)
      Update maven-surefire-plugin to 3.0.0-M5. (#7830)

Damien Neil (1):
      examples: update Go example (#7217)

Dane Harrigan (1):
      Add protoc-gen-go-svc to options.md (#9280)

Daniel Kuschny (1):
      Skip exports if not available by CommonJS (#8856)

Darly (1):
      Adding missing python files to the Makefile.am

Darly Paredes (2):
      Sync from Piper @436517178
      Update protobuf version

Dave MacLachlan (3):
      Remove some unnecessary header includes from objectivec sources.
      Remove 2 more unnecessary header includes from objectivec sources.
      Remove a bunch of clang-tidy warnings about missing use of `explicit` on single arg ctors.

David Benjamin (1):
      Remove various unused includes (#9852)

David Geldreich (1):
      link with correct C runtime on MSVC (#9437)

David L. Jones (29):
      Tweak update_file_lists.sh to handle changes to Makefile.am. (#8965)
      Update changelog
      Sync from Piper @429642851
      Update changelog
      Regenerate BUILD file lists
      Regenerate cmake file lists.
      Update ignored file paths after renaming.
      Factor out test libraries in the cmake build. (#9689)
      Temporary Kokoro build for macos-next. (#9693)
      Enable builds for macos-next kokoro. (#9706)
      [CMake] Declare remaining tests, and add a test output option. (#9705)
      [Kokoro] Emit XML test logs on macos-next. (#9709)
      Update CHANGES.txt.
      Move rules_pkg targets into //pkg, and add experimental C++ library rules (#9823)
      Update rules_pkg to version 0.7.0. (#9833)
      Add jdk11 test. (#9843)
      Add source distribution packaging rules (#9835)
      Update more code to use standard int types. (#9851)
      Specify full path to proto files. (#9881)
      Factor out MSVC-only `version.rc` logic, and ensure other variables are always initialized (#9880)
      Add forwarding lang_generator.h headers for cpp, java, and python. (#9883)
      Rename all BUILD files to BUILD.bazel (#9892)
      Add Starlark utilities to generate files with lists of files (#9882)
      Remove references to //:composer.json and JS compiler. (#9910)
      [Bazel] Fix broken build rules or mark them manual (#9913)
      [Bazel] Expand lists of protos in BUILD files (#9915)
      [Bazel] Move C++ build-related logic into //build_defs (#9921)
      [Bazel] Move conformance test targets to //conformance. (#9922)
      Add a test for bazel-built dist archives (#9929)

David Mollitor (4):
      Use ArrayList copy constructor
      Standardize NPE checks on JDK Objects utility
      Transition to NIO StandardCharsets
      Standardize on Array copyOf

David Supplee (1):
      fix: use E_USER_ERROR for trigger_error calls (#9462)

Deanna Garcia (86):
      Creating bazel toolchain to crosscompile with
      Addressing first round of comments
      Style nits
      Remove config suffix from .bazelrc configs
      Changing format of features
      Changing directory of clang to match docker container
      Changing clang path
      Change tool paths for docker
      Specify bits of architectures in toolchain names
      Change include messages to match docker
      Fixing builds
      Fixing inlining and deprecation for repeated string fields in kotlin
      Fixing formatting
      Creating bazel toolchains to compile for macOS.
      Fixing formatting
      Changing cpp version back to 8
      Change sysroot flags
      Adding windows toolchains
      Name protoc artifacts by their cpu and os
      Add error throwing
      No error throwing for unknown OS
      Fixing windows builds
      Change includes
      Add comma
      Removing -I include to ensure there's only one system include
      Adding kotlin bazel tests
      Remove unfinished release work and make names consistent
      Addressing comments
      Fixing bazel build failure
      Add new files to makefile
      fix pom errors
      Switch to java_test
      Fixing java and protoc builds
      Fix python and kotlin tests
      Fix spelling
      Fix python tests
      Fix python tests
      Fixing tests
      Fixing more tests
      Fix test
      Fixing tests
      More test fixes.
      Fix java tests
      Fix more tests
      Fixing java test
      Change gcc version
      First try
      Fix errors
      Remove old import
      Removing Proto3LiteTest
      Update Makefile
      Use internal kotlin gen rule
      Remove deleted files from Makefile
      Change sysroot flags
      kotlin core maven export
      Only exe extension for windows
      Update build files
      Changing toolchain build file
      Removing toolchain_dir variable
      Toolchain cleanups
      Add k8 toolchain
      Removing comment
      Consistent formatting
      Update UPB version
      Add macosx action env
      Remove duplicate java generated code
      update changelog
      change configure.ac to use c++ version
      Update protoc version for doc publishing
      Update protoc version for doc publishing
      Update python doc gen versions
      Pin googleapis-common-protos to most recent version
      Update version.json to: 21.0-dev
      Use osx-aarch_64 artifact
      Fix protoc_release target
      Edit changelog
      Update version.json to: 21.0-dev
      Fix podspecs
      Updated changelog
      Update version.json to: 21.1-dev
      Change composer download
      Update phpunit version
      Update UPB version
      Update changelog
      Update version.json to: 21.6-dev
      Apply patch

Derek Perez (4):
      Addresses duplicates identified in #8925 (#8939)
      Fix wkt dupes (#8942)
      Creates a protoc release zip (#9188)
      include gen_dir irrespsective of sources_dir in protoc_gen (#9735)

Dietmar Scheidl (1):
      Fix build on AIX and SunOS (#8373) (#9065)

Dimitris Koutsogiorgas (4):
      objective-c: Add `objc_class_prefix` generation option.
      Revert "objective-c: Add `objc_class_prefix` generation option."
      Add `prefix_to_proto_package_mappings_path` ObjC option.
      Rename `proto_package_to_prefix_mappings_path` to `package_to_prefix_mappings_path`.

Dirk Boye (1):
      update rules_python dependency to version 0.1.0 (#8214)

Eddie-cz (1):
      Update port_def.inc (#8993)

Elliotte Rusty Harold (52):
      Updtae version to 3.17.3 (#8889)
      same directory ignore
      add Stack Overflow as a possible support channel. (#8908)
      enforce android API level 14 (#8971)
      docs: 3.18.0 is released
      deps: add j2objc annotations (#9005)
      Stop using EasyMock classextension (#9008)
      EasyMock should have scope test
      remove dependency on Jackson
      update to 3.18.1 (#9057)
      deps: update maven-antrun-plugin
      document the kinds of patches the repo is open to (#8900)
      Update versions in README files (#9093)
      JDK 6 is too old to care about (#9097)
      delete unused files (#9262)
      remove UTF8Utils class that hasn't been needed since Java 6
      show less log junk from Maven
      remove unused test proto (#9298)
      fix spelling errors (#9368)
      update GSON to 2.8.9 (#9367)
      Update, fix, or delete an assortment of broken links (#9381)
      Revert "Transition to NIO StandardCharsets" (#9382)
      restore Android API level 14 compatibility (#9386)
      restore even more Android API level 14 compatibility (#9388)
      turn on animal-sniffer (#9383)
      remove Proto2MessageLiteInfoFactory and Proto3MessageLiteInfoFactory (#9407)
      simplify mergeable  UI messages (#9445)
      Must build project before running benchmarks (#9454)
      add test for clone of non-empty message (#9193)
      add Eclipse metafiles (#9485)
      clean up language (#9577)
      download_data.sh no longer exists (#9661)
      sync JUnit version (#9662)
      Update Guava to 31.1 (#9707)
      -DfailIfNoSpecifiedTests=false (#9753)
      -DfailIfNoSpecifiedTests=false (#9753)
      -Dsurefire.failIfNoSpecifiedTests=false (#9761)
      -Dsurefire.failIfNoSpecifiedTests=false (#9761)
      deps: update Guava to 31.1 (#9757)
      add JDK 8 target (#9743)
      LAST_RELEASED=3.20.0 (#9741)
      Remove LAST_RELEASED variable we haven't been updating (#9803)
      Add JDK 17 target (#9802)
      Remove old kokoro configs (#9815)
      add Kokoro config for OpenJDK11 (#9837)
      Add Kokoro config for JDK 17 (#9845)
      Fix typos (#9847)
      Fail on unit tests failure (#9862)
      more descriptive error messages and exceptions (#9868)
      build_java without conformance tests (#9873)
      Include JDK11 in error message on first run (#9866)
      Fail JDK 17 build when unit tests fail (#9878)

Esun Kim (1):
      Added cmake abseil include guard

FaBrand (2):
      Make genrule portable for windows (#9889)
      Be explicit with empty globs (#9890)

Florin Crișan (2):
      Enable testing via CTest (#8737)
      Add option to use external GTest in CMake (#8736)

Gary Peck (1):
      Add pbandk to list of 3rd-party Kotlin libraries (#9712)

Gergely Nagy (1):
      Disable [[clang::musttail]] attribute on Windows x86 (#9421)

Go Kudo (2):
      [PHP] Remove unnecessary zval initialization (#9600)
      [PHP] fix PHP build system (#9571)

Greg Miller (1):
      chore: gitignore ephemeral files that clangd uses

Gregor Jasny (1):
      Use constexpr for FieldTypeClass (#9434)

Gregory Haskins (1):
      Update protojure link (#9389)

Hong Xu (1):
      Emacs: Protobuf mode should be derived from prog-mode (#9076)

Ivo List (1):
      Selectively add source or gen dir to includes. (#9438)

JCooky (1):
      Add cmake option protobuf_INSTALL for installation files (#7123)

James Newton-King (8):
      Update .NET SDKs to LTS versions
      Fix tests
      Add nuget.config
      Fix test
      Fix .NET SourceLink and warnings in NuGet package
      Fix trim warnings
      [C#] Update GetExtension to support getting typed value (#9655)
      Suppress CS8981 in generated source

Jan Tattermusch (11):
      fix arm64 tests broken by dockcross image update
      fix arm64 C++ tests broken by dockcross image update
      OSS benchmark script improvements: use java 11, remove tcmalloc, remove JS (#8918)
      Reintroduce setup.py changes from #8280 erased by piper import #8902
      add NuGet.config to Makefile.am
      Fix dotnet aarch64 (#9222)
      pin multibuild scripts to get manylinux1 wheels back
      pin multibuild, set MB_ML_VER explicitly
      use manylinux2010 for python3.10 wheel on x86_64
      fixup linux python artifact build
      regenerate C# protos

Jason Erb (1):
      Protobuf: Fix for C5041 for VC++ >= 15.5 (#8979)

Jason Lunn (26):
      Update JRuby to leverage pure-Ruby DSL.
      Fix logic to decouple from the order of fields.keySet
      Fix a test regression observed after branch update
      Add an explicit RUBYLIB path to fix a load error under JRuby
      Add trailing backslashes at end of line consistently
      Remove vestigial function that makes a dated claim that Ruby doesn't support proto2
      Include JRuby's pom.xml file when updating version numbers
      Remove blank line
      Bump to 3.18.1
      Create an explicit build dependency from JRuby on Java.
      Bug fix for oracle7 regression
      Narrow the scope of the install
      Update the base image from jessie to stretch (for parity with the Java).
      Add JRuby test targets for JRuby 9.2.x and 9.3.x.
      Add JRuby test targets for JRuby 9.2.x and 9.3.x.
      Install core rather than util
      Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0.
      Fix NPE during encoding and add regression test for issue 9507.
      Add alternative instructions for Homebrew users.
      Implement `respond_to?` in RubyMessage (#9677)
      Run all JRuby source files through `google-java-format.`
      Cleanup warnings seen when running tests.
      Add JRuby 9.3.4.0 to Dockerfile and use it for 9.3.x testing.
      Fix NPE during encoding and add regression test for issue 9507.
      Implement `respond_to?` in RubyMessage (#9677)
      Improve range handling logic of `RepeatedField` (#9799)

Jeff Sawatzky (1):
      Add Google Gnostic Registered Extension Number (#9754)

Jensaarai (3):
      Add .NET 6 target to Google.Protobuf test projects
      Add .editorconfig for csharp directory
      Add C# .editorconfig to Makefile.am

Jie Luo (3):
      Fix python 10 install error
      Update python 3.10 install MD5 Sum (#9322)
      Cherry-pick Python 3.10 fix to 3.19.x (#9323)

Jimmy Yuen Ho Wong (1):
      Fix cl deprecation warning (#9046)

Joel Courtney (5):
      Improvement: better ruby from_* support in well_known_types.rb
      Update well_known_types_test.rb
      Test coverage: .from_ruby / #from_ruby
      Fixed: incorrect tests
      Remove lib from require

Joel Johnson (1):
      Use matching soname when building with CMake as Makefile (#9178)

Jon Skeet (9):
      Add ToProto() method to all C# descriptor classes
      Normalize all C# and .proto files to LF
      Change C# editor config to use LF by default
      Add regression test for protocolbuffers/protobuf#9526
      Make it easier to follow cmake/README.md instructions
      C# generator: Append _ to the oneof case enum name if it's "None"
      Test proto and unit test for issue #9605
      Generated code for test protos for issue #9605
      Remove unnecessary console output from test

Jonathan Ringer (1):
      Fix cmake install targets (#9822)

JongChan Choi (1):
      Add pbkit to third_party.md (#9177)

Jorg Brown (1):
      Use int32_t rather than int32.

Josh (1):
      Added "object" as a reserved name for PHP (#8962)

Josh Haberman (1):
      Added changelog entries from google3.

Joshua Haberman (70):
      Added release notes indicating that 3.17.3 is the last Python 2.x release.
      Sync from Piper @395706834
      Added release notes.
      Added missing source to Makefile.am.
      Reverted package change in test proto.
      Removed google-internal annotation.
      Removed redundant license header that confounded shebang line.
      Marked JS conformance runner as executable.
      Disabled build_files_updated unittest for now.
      Removed more testing of Python <3.5.
      Removed extraneous trailing backslashes.
      Removed remaining dependence on six for Python.
      Corrected the labels for CHANGES.txt.
      Added new Java Lite files to BUILD/pom.xml.
      Added new files to Makefile.am.
      Fix for descriptor_pb.rb: google/protobuf should be required first.
      Minor whitespace fixes and test fixups.
      Dropped Ruby 2.4 support for CI and releases.
      Removed Kokoro configs for old Ruby versions.
      Updated upb.
      Updated to new upb APIs.
      Added utf8_range.c as a source file.
      Fixed crash bug with proto2 enums.
      Added changelog entries.
      Added utf8_range.
      Fixed spelling errors in comments.
      Fixed data loss bug with PHP C extension.
      Added CHANGES.txt entry.
      Fixed data loss bug in Ruby extension.
      For GCC < 4.9.0 use ::max_align_t instead of std::max_align_t.
      Dropped support for Python < 3.7 (#9480)
      Resolved remaining conflict markers.
      Removed redundant/unnecessary variable definition.
      Sync from Piper @427369078
      Added changelog entries.
      Fixed JavaScript conformance test and failure list.
      Added missing Kotlin file to EXTRA_DIST.
      Removed conflicting/redundant variable declaration.
      Added AniesTest.kt to Makefile.am.
      Changes to build aarch64 under manylinux.
      Updated PHP upb, and utf8_range for Ruby/PHP (#9585)
      Updated Ruby to the latest upb. (#9589)
      Updated Ruby to the latest upb. (#9589) (#9630)
      Fixed Ruby 3.1 tests by marking intersect? as unimplemented. (#9645)
      Cherry-pick to get Ruby 3.1 support in protobuf 3.20.0 (#9657)
      Added missing files and fixed file roles. (#9672)
      Disable the aarch64 build on macOS because it is broken. (#9816)
      Update protobuf version (#9820)
      Updated CHANGES.txt for 3.20.1 (#9826)
      Updated CHANGES.txt.
      Sync from Piper @443506199
      Fixed PHP release script.
      Sync from Piper @443569271
      Fixed some mis-merged files.
      Added a Bazel dependency for upb (#9812)
      Sync from Piper @444600173
      Eliminated git_repository() in favor of HTTP archives. (#9861)
      Updated upb.
      Updated to upb for -rc1.
      Added default flags for all of the compilation modes.
      Optimization is now working.
      Updated the release notes and the upb version.
      Minor CHANGES.txt fix and pulled one more upb commit.
      Updated to the newest upb, which brings many fixes for Windows builds.
      Throw a more helpful error if generated code is out of date, and fixed two reference leaks.
      Fixed PHP SEGV by not writing to shared memory for zend_class_entry.
      Fixed the Windows build of protoc by statically linking deps.
      Revert "fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)"
      Pick up upb cherry-picks for 21.x release.
      Merge pull request #10356 from haberman/php-containing-oneof

Junrou Nishida (1):
      [C#] fix parse failure for extensions with large field numbers (#9591)

Justin Paupore (1):
      Add Android stlport and default toolchains to BUILD. (#8290)

Kent Ross (1):
      Implement unambiguous comparisons for RepeatedPtrIterator in C++20 (#9139)

Kevin Gibson (1):
      Use ReadVarint32 for Int32 types (#8769)

LINKIWI (1):
      Set protoc binary file mode to 0555 in release archive (#9354)

Luc Thevenard (2):
      [Ruby] Fix RepeatedField#last, #first inconsistencies
      Avoid negative indexes for JRuby

Luka Dornhecker (1):
      [Ruby] allow encode json options to be an object that responds to to_hash (#9513)

Lukas Fittl (1):
      [Ruby] Message.decode/encode: Add max_recursion_depth option (#9218)

Marco Concetto Rudilosso (1):
      Allow pre-compiled binaries for ruby 3.1.0 (#9566)

Marnix Bouhuis (3):
      Update the way we get the global object, to comply with CSP no-unsafe-eval (#8864)
      JS: Fixed `ReferenceError: window is not defined` when getting the global object (#9156)
      JS: Fixed `ReferenceError: window is not defined` when getting the global object (#9156)

Martin Schröder (1):
      Replace gradle plugin with a live project (#9611)

Masaki Hara (3):
      Ruby: build extensions for arm64-darwin
      Specify aarch64 for older autotools
      Suppress dot-delimiter warning if ruby_package consists of a single component (#7276)

Maximilian (1):
      Use proper SPDX license identifier (#9441)

Michele Locati (2):
      Test building packaged PHP extension
      Fix building packaged PHP extension

Mike Kruskal (9):
      Project import generated by Copybara
      Update protobuf version
      Sync from Piper @439400376
      Update protobuf version
      Update changelogs for 3.20.1-rc1
      Disabling broken mac php tests (#10219)
      Fix Kokoro tests to work on Monterey machines (#10473)
      Remove broken use_bazel.sh (#10511)
      Uninstall system protobuf to prevent version conflicts (#10522)

Minsoo Cheong (2):
      fix: restore val
      remove public modifiers on kt variables

Mitchell Macpherson (2):
      Update Field Presence doc
      Update field_presence.md

Neakxs (1):
      Apply registration for `protoc-gen-authz` extension (#9807)

NexusNull (1):
      Update README.md (#9078)

Nils (1):
      Add prost and quick-protobuf to third_party.md (#9104)

Nipunn Koorapati (2):
      Provide a type alias field ValueType on EnumTypeWrapper (#8182)
      Match service argument names to abstract interface (#9418)

Niranjan Bhaskar (1):
      Add header search paths to protobuf-c++ spec

Noah Dietz (1):
      Change enum string name for reserved words (#9780)

ObsidianMinor (1):
      Add an option to preserve proto names in JsonFormatter (#6307)

Oleg Golberg (1):
      Add Protokt to the list of 3rd party implementations (#7169)

Oleg Kolesov (1):
      #9293 - incompatible return type php 8.1 (#9301)

Oliver Eikemeier (1):
      remove unnecessary dependency (#9195)

Paul Yang (2):
      No need to test python2.7 (#8891)
      Use a working docker image for build python release packages (#8916)

Peter Sobot (2):
      Added GetDebugString to Python FileDescriptor interface.
      Only run GetDebugString test with cpp impl.

Peter Zhu (2):
      Fix memory leak in MessageClass.encode
      Fix memory leak in MessageClass.encode

Phil Clay (1):
      Resolve more java field accessor name conflicts (#8198)

Phil Felton (1):
      Make propertyName public

Philipp Stephani (1):
      Make //:protobuf_python and //:well_known_types_py_pb2 public.

Postmodern (1):
      Remove unused rubygems-tasks development dependency (#8824)

Prawn (2):
      Adding an extension number for protoc-gen-jsonschema (#8999)
      An additional range so we can have FieldOptions, MessageOptions, EnumOptions, FileOptions, and OneOfOptions (#9012)

Protobuf Team (3):
      Project import generated by Copybara
      Updating version.json to: 22-dev
      Updating version.json and repo version numbers to: 21.0-rc1

Protobuf Team Bot (9):
      Updating version.json and repo version numbers to: 21.0-rc2
      Updating version.json and repo version numbers to: 21.0
      Updating version.json and repo version numbers to: 21.1
      Updating version.json and repo version numbers to: 21.1
      Updating version.json and repo version numbers to: 21.2
      Updating version.json and repo version numbers to: 21.3
      Updating version.json and repo version numbers to: 21.4
      Updating version.json and repo version numbers to: 21.5
      Updating version.json and repo version numbers to: 21.6

Raul Bocanegra Algarra (1):
      Make glob recursive if option is enabled (#8783)

Roni Lichtman (1):
      Remove unused `HasTopLevelEnums` function

Rose (1):
      [C++] Fix missing #ifdef for undefined identifiers (#9201)

Ryan VanderMeulen (1):
      Use PROTOBUF_CONSTEXPR instead of constexpr for kRepHeaderSize. (#9885)

Saleem Abdulrasool (2):
      cmake: support `MSVC_RUNTIME_LIBRARY` property
      build: fix the support for CMake[<3.7]

Sandy Zhang (9):
      Add release notes.
      Remove duplicate build_ext class and get_ext_filename method
      Sync from Piper @396393195
      Update release notes.
      Fix map_test.proto package name
      Updated changelog
      Update version.json to: 21.2-dev
      Update changelog
      Update version.json to: 21.5-dev

Shigeo Hashimoto (1):
      Fix build failed for visual studio in multi-byte windows environments (#7235)

Sil3ntStorm (8):
      Disable conditional expression is constant warning (C4127) inside protobuf
      Fix cast truncates constant value warning (#8932)
      Fix uninitialized variable warnings in descriptor.cc (#8931)
      Fix unreachable code return in a case label that has a switch with only a default case in it, which returns already (#8927)
      Fix shadowing warnings (#8926)
      Fix warning about unary minus operator (#8929)
      Disable MSVC warning C4125 (decimal digit terminates octal escape sequence) (#8928)
      Fix unused variable warnings outside of compiler directory (#8945)

Stephen Kennedy (1):
      [cleanup] Msvc warnings (#9263)

Sydney Acksman (2):
      Swap registry from input when merging from existing input
      Add test for parsing using coded input

Tamarous (1):
      fix: misspelling (#9857)

Taufiq Rahman (1):
      Fix grammatical error in comments #7603

Thomas Hisch (1):
      Remove unittest2 imports (#9171)

Thomas Van Lenten (24):
      Add two new generation options around objc prefix usage.
      Update some types to be more current.
      Move some common code into a helper.
      Ensure errors are reported from the last chunk of a file.
      Remove some of the state handoff via ivars within Parser.
      Add Xcode 13 to the build/test script.
      Fix spacing in message (missing a space between words from line split)
      review feedback
      Add a envvar to provide a prefix on all proto package prefixed symbols.
      Support no_package:FILE in the expected prefixes file.
      Add space to fix error message formatting.
      Default two more of the options from env variables.
      Rename ExpectedPrefixesCollector to PackageToPrefixesCollector
      Make the ObjC support conditional to darwin.
      Stop passing generation options thru the graph.
      Remove the non prefix validation options from Options.
      And an overload for ValidateObjCClassPrefixes().
      Simplify imports of the WKTs within the library itself.
      Add a generation option to control use of forward declarations in headers.
      Update the mac python helper scripts to python3.
      Tweak how python/python3 is used.
      Add a github action workflow to run CocoaPods validation. (#9800)
      Remove the support for the kokoro cocoapods integration tests.
      ObjC: Revise the minimal extension deps algorithm.

Timo Lange (1):
      [CMake] Allow custom plugin options e.g. to generate mocks (#9105)

Timo Röhling (1):
      Prevent integer overflow for unknown fields

Trent Houliston (1):
      Fix invalid dependency manifest when using `descriptor_set_out` (#9647)

Upils (1):
      Reserve extension id range for protoc-gen-checker (#9133)

Vasiliy Tolstov (1):
      Add micro Registered Extension Number (#9767)

Vasily Fomin (1):
      Fix typo in Descriptor docstring (#9001)

Xùdōng Yáng (1):
      Use repo-relative labels wherever possible (#9187)

Yash Tibrewal (2):
      [Bazel] Add back a filegroup for :well_known_protos (#10279)
      Reduce the required alignment of ArenaString from 8 to 4 (#10298)

Yibo Cai (1):
      Move private utf8 helpers to anonymous namespace (#9791)

Zak Henry (1):
      fix(splitFloat32): Fix incorrect exponent when converting double to float

alusco-scratch (1):
      Override Map.clone to use Map's dup method

amirhadadi (1):
      Implement Utf8.decodeUtf8 by using String constructor (#9415)

appledragon (3):
      Update stl_util.h
      for old clang build issue, related with https://reviews.llvm.org/D12375 (#9159)
      for ios shared library export api visibility (#9160)

cui fliter (1):
      fix some typos (#9771)

deannagarcia (12):
      Update BUILD paths
      Update BUILD paths
      Update BUILD
      Update include directories
      Update BUILD
      Update BUILD
      Update toolchains.bazelrc
      Change toolchain includes (#9318)
      Update location of llvm-ar in bazel toolchain
      Update package.xml
      Fix package naming rule
      Make protoc executable names consistent

heretic (1):
      add push/pop GetObject macro

idodod (1):
      Update third_party.md (#9505)

j-min5u (1):
      remove redundant public modifiers

johanmoe (2):
      Fix cmake install for protoc component (#8994)
      Fix build error with MinGW (#9077)

johnnyshields (1):
      Backport: Ruby: support x64-mingw-ucrt platform, which is the new platform which Windows Ruby Installer uses as of Ruby 3.1

junzeng (1):
      Clean up unused code in src\google\protobuf\compiler\cpp\cpp_helpers.h (#8819)

kunhtkun (1):
      [editors/emacs] Fix protobuf-mode definition (#9572)

lzj (1):
      avoid allocating memory if all extension are cleared (#9345)

mgabris (1):
      Fix unused variable warnings in extension_set.h (#9073)

miyucy (1):
      Add size to Map class (#8068)

mkruskal-google (7):
      Reverting change to target frameworks that breaks kokoro
      Merge pull request #9727 from mlocati/build-packaged-php-extension
      Merge 3.20.1-rc1 into main (#9760)
      Update CMake configuration to add a dependency on Abseil (#9793)
      Fix Abseil dependency in windows protoc kokoro build (#9814)
      Rollback pull request #9852, which will break clients who don't IWYU and depend on us for these STL headers (#9860)
      Rollforward of #9852 (#9886)

noahdietz (1):
      Replace master with main in URLs & docs

owentou (1):
      [CMAKE] `protobuf::libprotoc` and `protobuf::protoc` should be optional in legacy `protobuf-module.cmake` when crossing compiling.

panda (1):
      Make MessageToDict convert map keys to strings

petr.dannhofer (1):
      "Fixed" Visual Studio constinit errors both for clang-cl and msvc compilers under c+17 and c+20 standards

theodorerose (7):
      update python to 3
      Update protobuf version
      update PHP release to not fail on existing tag
      cherry-pick: arenastring
      cherry-pick c38281dd20e562bac239bc77ab2fa10f71661708
      generate CHANGES, bump minors
      updated change log notes

tomerv (1):
      Fix typo in docstring (#9208)

yeqown (1):
      apply a registration for  `protoc-gen-fieldmask` extension (#9646)

zhangskz (7):
      Add ruby_upb_alloc using xrealloc/xfree so Ruby GC is aware of allocated memory for Arenas. (#9586)
      Add disallowment of setting numpy singleton arrays and multi-dimensio… (#9788)
      Add initial version.json file for 21-dev (#9840)
      Update protobuf_version.bzl to separate protoc and per-language java major version (#9900)
      Increment python major version in version.json for python upb (#9926)
      Update upb commit/sha256 to include updated python wheel (#10058)
      Update upb commit to include fix for segmentation fault when instantiating field via repeated field assignment (#10066)

なつき (2):
      Suppress warning for intentional circular require
      Do not use range based UTF-8 validation in truffleruby (#9769)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants