svn commit: r1759352 - in /logging/log4net/trunk: log4net.build netstandard/log4net/project.json

[bodewig]

Author: bodewig
Date: Mon Sep  5 20:15:59 2016
New Revision: 1759352

URL: http://svn.apache.org/viewvc?rev=1759352&view=rev
Log:
integrate .NET Core build in NAnt build - assembly isn't strong named, yet

Modified:
    logging/log4net/trunk/log4net.build
    logging/log4net/trunk/netstandard/log4net/project.json

Modified: logging/log4net/trunk/log4net.build
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/log4net.build?rev=1759352&r1=1759351&r2=1759352&view=diff
==============================================================================
--- logging/log4net/trunk/log4net.build (original)
+++ logging/log4net/trunk/log4net.build Mon Sep  5 20:15:59 2016
@@ -339,6 +339,7 @@ limitations under the License.
         <echo message="SSCLI 1.0 is not available. Build skipped." />
       </if>
     </if-->
+    <call target="compile-netstandard" />
   </target>
   <target name="compile" description="Builds the current build configuration 
for the current target framework." depends="check-current-build-config">
     <call target="compile-${framework::get-target-framework()}" />
@@ -1742,4 +1743,28 @@ limitations under the License.
       </asminfo>
     </if>
   </target>
+  <target name="compile-netstandard">
+    <exec program="dotnet" workingdir="netstandard"
+         failonerror="false" resultproperty="dotnet.available">
+      <arg value="restore"/>
+    </exec>
+    <if test="${dotnet.available == '0'}">
+      <exec program="dotnet" workingdir="netstandard">
+       <arg value="build"/>
+       <arg value="log4net"/>
+       <arg if="${current.build.config.release}" value="-c"/>
+       <arg if="${current.build.config.release}" value="Release"/>
+      </exec>
+      <mkdir dir="${log4net.basedir}/bin/netstandard/1.3"/>
+      <move todir="${log4net.basedir}/bin/netstandard/1.3/Release">
+       <fileset basedir="netstandard/log4net/bin/Release/netstandard1.3"/>
+      </move>
+      <move todir="${log4net.basedir}/bin/netstandard/1.3/Debug">
+       <fileset basedir="netstandard/log4net/bin/Debug/netstandard1.3"/>
+      </move>
+    </if>
+    <if test="${dotnet.available != '0'}">
+      <echo message=".NET Core is not available." />
+    </if>
+  </target>
 </project>

Modified: logging/log4net/trunk/netstandard/log4net/project.json
URL: 
http://svn.apache.org/viewvc/logging/log4net/trunk/netstandard/log4net/project.json?rev=1759352&r1=1759351&r2=1759352&view=diff
==============================================================================
--- logging/log4net/trunk/netstandard/log4net/project.json (original)
+++ logging/log4net/trunk/netstandard/log4net/project.json Mon Sep  5 20:15:59 
2016
@@ -63,32 +63,6 @@
         "System.Xml.ReaderWriter": "4.0.11",
         "System.Xml.XmlDocument": "4.0.1"
       }
-    },
-    "net40": {
-      "buildOptions": {
-        "compile": "../../src/**/*.cs",
-        "define": [ "TRACE", "STRONG", "NET", "NET_2_0", "NET_4_0" ]
-      },
-      "frameworkAssemblies": {
-        "System": { "type": "build" },
-        "System.Configuration": { "type": "build" },
-        "System.Data": { "type": "build" },
-        "System.Web": { "type": "build" },
-        "System.Xml": { "type": "build" }
-      }
-    },
-    "net45": {
-      "buildOptions": {
-        "compile": "../../src/**/*.cs",
-        "define": [ "TRACE", "STRONG", "NET", "NET_2_0", "NET_4_0", "NET_4_5" ]
-      },
-      "frameworkAssemblies": {
-        "System": { "type": "build" },
-        "System.Configuration": { "type": "build" },
-        "System.Data": { "type": "build" },
-        "System.Web": { "type": "build" },
-        "System.Xml": { "type": "build" }
-      }
     }
   }
 }