aboutsummaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
authorJie Luo <anandolee@gmail.com>2015-05-12 16:25:34 -0700
committerJie Luo <anandolee@gmail.com>2015-05-12 16:25:34 -0700
commitd1183bba4dc26d5c7c3daa57df4f7f82cc3a46af (patch)
tree31203df3d403da36b9d9106899f3a09d0e3654b0 /csharp
parent5e68a75fa7eb769db5a38cc8d2f3f5fee75e744e (diff)
parent6f4bdffbe56888ba3497f7edd70c842c3849ddbe (diff)
downloadprotobuf-d1183bba4dc26d5c7c3daa57df4f7f82cc3a46af.tar.gz
protobuf-d1183bba4dc26d5c7c3daa57df4f7f82cc3a46af.tar.bz2
protobuf-d1183bba4dc26d5c7c3daa57df4f7f82cc3a46af.zip
Merge pull request #372 from jtattermusch/csharp_cleanup
C# cleanup
Diffstat (limited to 'csharp')
-rw-r--r--csharp/.gitignore2
-rw-r--r--csharp/lib/README.md13
2 files changed, 2 insertions, 13 deletions
diff --git a/csharp/.gitignore b/csharp/.gitignore
index 19af6f85..d7dcef59 100644
--- a/csharp/.gitignore
+++ b/csharp/.gitignore
@@ -6,6 +6,8 @@ src/AddressBook/obj
src/ProtocolBuffers/bin/
src/ProtocolBuffers/obj/
src/ProtocolBuffers/objCF
+src/ProtocolBuffers.Serialization/bin/
+src/ProtocolBuffers.Serialization/obj/
src/ProtocolBuffers.Test/bin/
src/ProtocolBuffers.Test/obj/
src/ProtocolBuffersLite.Test/bin/
diff --git a/csharp/lib/README.md b/csharp/lib/README.md
deleted file mode 100644
index d31885be..00000000
--- a/csharp/lib/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory used to contain the binary dependencies, but they were removed during a cleanup associated with importing the project
-into google/protobuf repository. Before we figure a better way to manage the dependencies, you will have to manually download the dependencies
-to be able to build the test projects:
-
-1. Download https://github.com/jskeet/protobuf-csharp-port/archive/2.4.1.555.zip
-2. Open the archive and copy following files into this directory:
- * `lib/Microsoft.Silverlight.Testing/`
- * `lib/NUnit/`
- * `lib/proto.exe`
-
-After that, you should be able to fully build the C# protobufs Visual Studio solutions.
-
-TODO(jtattermusch): the way we pull in dependencies needs to change