Repository: thrift Updated Branches: refs/heads/master 5608e43ec -> c71bdf85c
THRIFT-4210 include Thrift.45.csproj into CI runs Client: C# Patch: Jens Geyer This closes #1277 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c71bdf85 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c71bdf85 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c71bdf85 Branch: refs/heads/master Commit: c71bdf85c9b643587c48804d29e063303f27fee5 Parents: 5608e43 Author: Jens Geyer <[email protected]> Authored: Tue May 23 22:28:24 2017 +0200 Committer: Jens Geyer <[email protected]> Committed: Sat May 27 21:10:32 2017 +0200 ---------------------------------------------------------------------- lib/csharp/Makefile.am | 8 ++++++-- lib/csharp/src/Thrift.45.csproj | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/c71bdf85/lib/csharp/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/csharp/Makefile.am b/lib/csharp/Makefile.am index 1fd5462..f113e1a 100644 --- a/lib/csharp/Makefile.am +++ b/lib/csharp/Makefile.am @@ -84,13 +84,17 @@ if NET_2_0 export CSC_DEFINES = -d:NET_2_0 endif -all-local: Thrift.dll +all-local: Thrift.dll Thrift.45.dll Thrift.dll: $(THRIFTCODE) $(CSC) $(CSC_DEFINES) -out:$@ -target:library -reference:System.Web $(THRIFTCODE) +Thrift.45.dll: $(THRIFTCODE) + $(CSC) $(CSC_DEFINES) -out:$@ -target:library -reference:System.Web $(THRIFTCODE) + clean-local: - $(RM) Thrift.dll + $(RM) Thrift.dll \ + $(RM) Thrift.45.dll EXTRA_DIST = \ $(THRIFTCODE) \ http://git-wip-us.apache.org/repos/asf/thrift/blob/c71bdf85/lib/csharp/src/Thrift.45.csproj ---------------------------------------------------------------------- diff --git a/lib/csharp/src/Thrift.45.csproj b/lib/csharp/src/Thrift.45.csproj index 78089fc..455916f 100644 --- a/lib/csharp/src/Thrift.45.csproj +++ b/lib/csharp/src/Thrift.45.csproj @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
