avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject avro git commit: Revert "AVRO-1626: C#: Fix Avro.pref build error. Contributed by Naruto Takahashi."
Date Sat, 05 Nov 2016 22:33:34 GMT
Repository: avro
Updated Branches:
  refs/heads/branch-1.8 edf6a7e6c -> bec6349f4


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

This reverts commit 338b443f0d1452b9b1ac4a00eaef162e5a644be7.


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

Branch: refs/heads/branch-1.8
Commit: bec6349f46b40fe0a4674062179966696e3026b1
Parents: edf6a7e
Author: Ryan Blue <blue@apache.org>
Authored: Sat Nov 5 15:32:03 2016 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Sat Nov 5 15:32:03 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/avro/blob/bec6349f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 18622c1..aed8391 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -100,8 +100,6 @@ Avro 1.8.2 (5 November 2016)
     AVRO-1947: Java: Inconsistent maven profile activation
     (Gabor Szadovszky via tomwhite)
 
-    AVRO-1626: C#: Fix Avro.pref build error. (Naruto Takahashi via blue)
-
     AVRO-1951: Python: Fix ipc_test.py with a valid DNS name. (blue)
 
 Avro 1.8.1 (14 May 2016)

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

http://git-wip-us.apache.org/repos/asf/avro/blob/bec6349f/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
deleted file mode 100755
index ae24790..0000000
--- a/lang/csharp/src/apache/perf/app.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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