From e77878ebc76e629bcbad1baf170d73fe7db9718d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 16 Apr 2015 10:21:42 -0700 Subject: Updated readme.md and changes.txt, removed old license.txt --- csharp/CHANGES.txt | 14 +++++++++----- csharp/README.md | 29 +++++++++++++++++------------ csharp/license.txt | 31 ------------------------------- 3 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 csharp/license.txt (limited to 'csharp') diff --git a/csharp/CHANGES.txt b/csharp/CHANGES.txt index 90e9d77e..b29debb8 100644 --- a/csharp/CHANGES.txt +++ b/csharp/CHANGES.txt @@ -2,12 +2,16 @@ Welcome to the C# port of Google Protocol Buffers, written by Jon Skeet (skeet@pobox.com) based on the work of many talented people. -For more information about this port, visit its homepage: -http://protobuf-csharp-port.googlecode.com +=============================================================================== +RELEASE NOTES - Code imported into Google's main protobuf repository +=============================================================================== + +Everything below note this represents history of protobuf-csharp-port project +before the code was merged into csharp/ subtree of GitHub google/protobuf +repository. +Frozen legacy version of the original project is available in +https://github.com/jskeet/protobuf-csharp-port. -For more information about Protocol Buffers in general, visit the project page -for the C++, Java and Python project: -http://protobuf.googlecode.com =============================================================================== RELEASE NOTES - Version 2.4.1.555 =============================================================================== diff --git a/csharp/README.md b/csharp/README.md index 7844062a..62c76384 100644 --- a/csharp/README.md +++ b/csharp/README.md @@ -1,12 +1,17 @@ -This repo was originally exported from http://code.google.com/p/protobuf-csharp-port, -and represents the latest "legacy" version of protobuf-csharp-port. - -This project has now been folded into the [main Google Protocol Buffers project](http://github.com/google/protobuf), -and is being revamped to support proto3. It is not expected to be fully backwardly-compatible with -the code in this repo - in particular, some of the C#-specific options may not be supported in the new -codebase, and some of the generated code may differ. A new major version offers an opportunity to spring-clean, -as it were. - -This repo exists as an acknowledgement that not everyone will want to immediately use the newer codebase, -and that they may wish to make changes to the legacy codebase. I do not expect to make any changes within this -repo, but it can be forked for further changes. +This directory contains a library that implements Protocol Buffers +functionality in C#. + +Experimental only +----------------- + +C# protobufs are currently under development and are not officially supported yet. +Also, as of now, only proto2 is supported. Proto3 support for C# is currently in progress +(both design & implementation). + +History of C# protobufs +----------------------- + +This subtree was originally imported from https://github.com/jskeet/protobuf-csharp-port +and represents the latest development version of C# protobufs, that will now be developed +and maintained by Google. All the development will be done in open, under this repository +(https://github.com/google/protobuf). \ No newline at end of file diff --git a/csharp/license.txt b/csharp/license.txt deleted file mode 100644 index 2715f7b8..00000000 --- a/csharp/license.txt +++ /dev/null @@ -1,31 +0,0 @@ -Protocol Buffers - Google's data interchange format -Copyright 2008-2010 Google Inc. All rights reserved. -http://github.com/jskeet/dotnet-protobufs/ -Original C++/Java/Python code: -http://code.google.com/p/protobuf/ - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- cgit v1.2.3