Skip to content

Commit

Permalink
AVRO-945. C# port does not build under Ubuntu 11.10
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/avro/trunk@1190479 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
thiru-mg committed Oct 28, 2011
1 parent 04d3e59 commit cc43459
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ Avro 1.6.0 (27 October 2011)
AVRO-942. Java: Fix reflect so that @Nullable fields have a
default value of null. (Binglin Chang via cutting)

AVRO-945. C# port does not build under Ubuntu 11.10. (thiru)

Avro 1.5.4 (12 September 2011)

IMPROVEMENTS
Expand Down
2 changes: 1 addition & 1 deletion lang/csharp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ROOT=../..
VERSION=`cat $ROOT/share/VERSION.txt`

export CONFIGURATION=Release
export TARGETFRAMEWORKVERSION=3.5
export TARGETFRAMEWORKVERSION=v3.5

case "$1" in

Expand Down
12 changes: 3 additions & 9 deletions lang/csharp/src/apache/codegen/Avro.codegen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<RootNamespace>Avro.codegen</RootNamespace>
<AssemblyName>avrogen</AssemblyName>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<FileUpgradeFlags>
Expand Down Expand Up @@ -133,16 +132,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v3.5,Profile=Client">
<BootstrapperPackage Include=".NETFramework,Version=v3.5">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
<ProductName>Microsoft .NET Framework 3.5 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
Expand All @@ -165,4 +159,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
8 changes: 1 addition & 7 deletions lang/csharp/src/apache/main/Avro.main.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<AssemblyName>Avro</AssemblyName>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down Expand Up @@ -134,11 +133,6 @@
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
Expand All @@ -158,4 +152,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 0 additions & 6 deletions lang/csharp/src/apache/test/Avro.test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<AssemblyName>Avro.test</AssemblyName>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
Expand Down Expand Up @@ -104,11 +103,6 @@
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
Expand Down

0 comments on commit cc43459

Please sign in to comment.