diff options
| author | csharptest <roger@csharptest.net> | 2011-05-19 22:56:28 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-05-19 22:56:28 -0500 |
| commit | 157979e135c22fdb385734d0db45f82fedda74d3 (patch) | |
| tree | 47abf8de7064106f4d5e33273604a5c299b8fdb1 /src/ProtocolBuffers | |
| parent | f1816beebe7f68a6e9380b964d93c1dee91fb277 (diff) | |
| parent | 232c79562cebfb46510634afb82a2cf723333404 (diff) | |
| download | protobuf-157979e135c22fdb385734d0db45f82fedda74d3.tar.gz protobuf-157979e135c22fdb385734d0db45f82fedda74d3.tar.bz2 protobuf-157979e135c22fdb385734d0db45f82fedda74d3.zip | |
merged from protobuf-csharp-port
Diffstat (limited to 'src/ProtocolBuffers')
5 files changed, 27 insertions, 11 deletions
diff --git a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs index 855f8fe6..87ae5fd9 100644 --- a/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs +++ b/src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs @@ -1,4 +1,4 @@ -// Generated by ProtoGen, Version=0.9.0.0, Culture=neutral, PublicKeyToken=8fd7408b07f8d2cd. DO NOT EDIT!
+// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=8fd7408b07f8d2cd. DO NOT EDIT!
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
diff --git a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs index 0e2e7e21..e9496a07 100644 --- a/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs +++ b/src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs @@ -1,4 +1,4 @@ -// Generated by ProtoGen, Version=0.9.0.0, Culture=neutral, PublicKeyToken=8fd7408b07f8d2cd. DO NOT EDIT!
+// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=8fd7408b07f8d2cd. DO NOT EDIT!
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
diff --git a/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/src/ProtocolBuffers/Properties/AssemblyInfo.cs index e86a2f15..64c121a3 100644 --- a/src/ProtocolBuffers/Properties/AssemblyInfo.cs +++ b/src/ProtocolBuffers/Properties/AssemblyInfo.cs @@ -62,10 +62,10 @@ using System.Runtime.CompilerServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.0.0")] +// [assembly: AssemblyVersion("2.3.0.277")] +[assembly: AssemblyVersion("2.3.0.277")] #if !COMPACT_FRAMEWORK_35 -[assembly: AssemblyFileVersion("0.9.0.0")] +[assembly: AssemblyFileVersion("2.3.0.277")] #endif [assembly:InternalsVisibleTo("Google.ProtocolBuffers.Test,PublicKey="+ diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj index 5c1721cf..59bbc775 100644 --- a/src/ProtocolBuffers/ProtocolBuffers.csproj +++ b/src/ProtocolBuffers/ProtocolBuffers.csproj @@ -40,6 +40,8 @@ <DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
+ <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+ <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -50,6 +52,8 @@ <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
+ <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+ <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -61,6 +65,8 @@ <DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug_Silverlight2\</OutputPath>
+ <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+ <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
<DefineConstants>DEBUG;TRACE;SILVERLIGHT2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -71,6 +77,8 @@ <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release_Silverlight2\</OutputPath>
+ <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+ <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
<DefineConstants>TRACE;SILVERLIGHT2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -203,11 +211,11 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(Configuration)' == 'Release' " />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" Condition=" '$(Configuration)' == 'Debug_Silverlight2' " />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" Condition=" '$(Configuration)' == 'Release_Silverlight2' " />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
-->
</Project>
\ No newline at end of file diff --git a/src/ProtocolBuffers/ProtocolBuffersLite.csproj b/src/ProtocolBuffers/ProtocolBuffersLite.csproj index d4413d83..ffb52295 100644 --- a/src/ProtocolBuffers/ProtocolBuffersLite.csproj +++ b/src/ProtocolBuffers/ProtocolBuffersLite.csproj @@ -24,6 +24,8 @@ <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath> + <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile> + <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn> <DefineConstants>TRACE;DEBUG;LITE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -33,6 +35,8 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> + <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile> + <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn> <DefineConstants>TRACE;LITE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -43,6 +47,8 @@ <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\Debug_Silverlight2\</OutputPath> + <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile> + <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn> <DefineConstants>DEBUG;TRACE;SILVERLIGHT2;LITE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -53,6 +59,8 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release_Silverlight2\</OutputPath> + <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile> + <NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn> <DefineConstants>TRACE;SILVERLIGHT2;LITE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> |