avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject avro git commit: AVRO-1626: C#: Fix Avro.pref build error. Contributed by Naruto Takahashi.
Date Sat, 05 Nov 2016 19:43:10 GMT
Repository: avro
Updated Branches:
  refs/heads/master bf7f3934c -> ecc2adb31


AVRO-1626: C#: Fix Avro.pref build error. Contributed by Naruto Takahashi.

Also removes '-framework' parameter from nunit-console

Closes #136.


Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/ecc2adb3
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/ecc2adb3
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/ecc2adb3

Branch: refs/heads/master
Commit: ecc2adb31a1bcd61d073d87de8be18b2a91f5e6d
Parents: bf7f393
Author: Naruto TAKAHASHI <naruto.takahashi@drecom.co.jp>
Authored: Fri Sep 30 10:55:33 2016 +0900
Committer: Ryan Blue <blue@apache.org>
Committed: Sat Nov 5 12:42:25 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                            |  2 ++
 lang/csharp/build.sh                   |  2 +-
 lang/csharp/src/apache/perf/app.config | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/avro/blob/ecc2adb3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9225c16..b05a138 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,8 @@ Trunk (not yet released)
     AVRO-1947: Java: Inconsistent maven profile activation
     (Gabor Szadovszky via tomwhite)
 
+    AVRO-1626: C#: Fix Avro.pref build error. (Naruto Takahashi via blue)
+
 Avro 1.8.1 (14 May 2016)
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/avro/blob/ecc2adb3/lang/csharp/build.sh
----------------------------------------------------------------------
diff --git a/lang/csharp/build.sh b/lang/csharp/build.sh
index 97beaf8..cb9f7fc 100755
--- a/lang/csharp/build.sh
+++ b/lang/csharp/build.sh
@@ -30,7 +30,7 @@ case "$1" in
 
   test)
     xbuild
-    nunit-console -framework=4.0 Avro.nunit
+    nunit-console Avro.nunit
     ;;
 
   perf)

http://git-wip-us.apache.org/repos/asf/avro/blob/ecc2adb3/lang/csharp/src/apache/perf/app.config
----------------------------------------------------------------------
diff --git a/lang/csharp/src/apache/perf/app.config b/lang/csharp/src/apache/perf/app.config
new file mode 100755
index 0000000..ae24790
--- /dev/null
+++ b/lang/csharp/src/apache/perf/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>


Mime
View raw message