Author: cutting
Date: Fri Jul 1 20:12:17 2011
New Revision: 1142066
URL: http://svn.apache.org/viewvc?rev=1142066&view=rev
Log:
Merge -c 1142063 from trunk to 1.5 branch. Fixes: AVRO-810.
Added:
avro/branches/branch-1.5/lang/csharp/.gitignore
- copied unchanged from r1142063, avro/trunk/lang/csharp/.gitignore
avro/branches/branch-1.5/lang/csharp/Avro.snk
- copied unchanged from r1142063, avro/trunk/lang/csharp/Avro.snk
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj
avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 20:12:17 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1079680,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1130503,1136342,1141677,1141685,1141979-1141980,1142057
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1079680,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1099257,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706,1129729,1130503,1136342,1141677,1141685,1141979-1141980,1142057,1142063
Modified: avro/branches/branch-1.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1142066&r1=1142065&r2=1142066&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Fri Jul 1 20:12:17 2011
@@ -30,6 +30,8 @@ Avro 1.5.2 (unreleased)
names of schemas read from data files, for compatibility with
1.4. (cutting)
+ AVRO-810: C#: Add strong naming to assemblies. (Eric Hauser)
+
BUG FIXES
AVRO-818. C: Fix data file corruption bug in C library (dcreager)
Modified:
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj?rev=1142066&r1=1142065&r2=1142066&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj
(original)
+++ avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj
Fri Jul 1 20:12:17 2011
@@ -107,6 +107,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>..\..\..\build\codegen\Release\</OutputPath>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\..\Avro.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -159,4 +165,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file
Modified: avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj?rev=1142066&r1=1142065&r2=1142066&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj
(original)
+++ avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj Fri
Jul 1 20:12:17 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -69,6 +69,12 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>..\..\..\Avro.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="log4net">
<HintPath>..\..\..\lib\main\log4net.dll</HintPath>
@@ -152,4 +158,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file
