diff options
| author | Jon Skeet <jonskeet@google.com> | 2016-02-04 07:05:49 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-02-04 07:05:49 +0000 |
| commit | a3ea9d120389d535164e42e45c07b539a398c6e1 (patch) | |
| tree | 7f89000a6e653ab8af6899e30f3c2c1b3f8de925 /csharp/src/Google.Protobuf/Google.Protobuf.csproj | |
| parent | eb1d156d74fc4742175d6c143e5747772e44a4bb (diff) | |
| download | protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.tar.gz protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.tar.bz2 protobuf-a3ea9d120389d535164e42e45c07b539a398c6e1.zip | |
Rename GeneratedCodeInfo to GeneratedClrTypeInfo
Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type.
Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code.
Generated code changes in next commit.
Diffstat (limited to 'csharp/src/Google.Protobuf/Google.Protobuf.csproj')
| -rw-r--r-- | csharp/src/Google.Protobuf/Google.Protobuf.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index f95bae07..326b6d31 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -109,7 +109,7 @@ <Compile Include="Reflection\FieldDescriptor.cs" />
<Compile Include="Reflection\FieldType.cs" />
<Compile Include="Reflection\FileDescriptor.cs" />
- <Compile Include="Reflection\GeneratedCodeInfo.cs" />
+ <Compile Include="Reflection\GeneratedClrTypeInfo.cs" />
<Compile Include="Reflection\IDescriptor.cs" />
<Compile Include="Reflection\IFieldAccessor.cs" />
<Compile Include="Reflection\MapFieldAccessor.cs" />
|