merge from branch-1.6 and version bump

appveyor.yml

@@ -46,7 +46,7 @@ after_test:
     - pip install codecov
     - codecov -f "SparkCLRCodeCoverage.xml"
     - cmd: cd .\build\localmode
-    - cmd: .\Runsamples.cmd --validate
+    - cmd: if not defined ProjectVersion (.\Runsamples.cmd --validate)
     - cmd: cd ..\..
     - cmd: dir csharp\Microsoft*.nupkg
     - cmd: dir scala\target\spark-clr*.jar

build/Build.cmd

@@ -208,8 +208,8 @@ move /Y %SPARKCLR_HOME%\data %CMDHOME%\samples
 copy /Y "%CMDHOME%\..\notes\mobius-release-info.md"
 
 @rem Create the zip file
-@echo 7z a .\target\test.zip runtime examples samples mobius-release-info.md
-7z a .\target\test.zip runtime examples samples mobius-release-info.md
+@echo 7z a .\target\%SPARKCLR_NAME%.zip runtime examples samples mobius-release-info.md
+7z a .\target\%SPARKCLR_NAME%.zip runtime examples samples mobius-release-info.md
 
 :distdone
 popd

csharp/SparkCLR.nuspec

@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Microsoft.SparkCLR</id>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.101-SNAPSHOT</version>
     <authors>Microsoft Corporation</authors>
     <owners>Microsoft Corporation</owners>
-    <licenseUrl>https://github.com/Microsoft/SparkCLR/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Microsoft/SparkCLR</projectUrl>
+    <licenseUrl>https://github.com/Microsoft/Mobius/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/Microsoft/Mobius</projectUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>C# language binding and extensions to Apache Spark</description>
-    <releaseNotes>See release notes on GitHub https://github.com/Microsoft/SparkCLR/releases</releaseNotes>
+    <releaseNotes>See release notes on GitHub https://github.com/Microsoft/Mobius/releases</releaseNotes>
     <copyright>Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.</copyright>
-    <tags>C# .NET Apache Spark RDD DataFrame</tags>
+    <tags>C# .NET Apache Spark RDD DataFrame Streaming SparkCLR Mobius</tags>
     <dependencies>
       <dependency id="Razorvine.Pyrolite" version="4.10.0" />
       <dependency id="Razorvine.Serpent" version="1.12.0" />

notes/mobius-release-info.md

@@ -20,11 +20,11 @@ The [release in GitHub](https://github.com/Microsoft/Mobius/releases) is a zip f
         |-- Data files used by the samples
 ```` 
 
-Instructions on running a Mobius app is available at https://github.com/skaarthik/Mobius/blob/master/notes/running-mobius-app.md
+Instructions on running a Mobius app is available at https://github.com/Microsoft/Mobius/blob/master/notes/running-mobius-app.md
 
 Mobius samples do not have any extenral dependencies. The dependent jar files and data files used by samples are included in the release. Instructions to run samples are available at
-* https://github.com/skaarthik/Mobius/blob/master/notes/windows-instructions.md#running-samples for Windows
-* https://github.com/skaarthik/Mobius/blob/master/notes/linx-instructions.md#running-samples for Linux
+* https://github.com/Microsoft/Mobius/blob/master/notes/windows-instructions.md#running-samples for Windows
+* https://github.com/Microsoft/Mobius/blob/master/notes/linx-instructions.md#running-samples for Linux
 
 Mobius examples under "examples" folder may have external dependencies and may need configuration settings to those dependencies before they can be run. Refer to [Running Examples](https://github.com/Microsoft/Mobius/blob/master/notes/running-mobius-app.md#running-mobius-examples-in-local-mode) for details on how to run each example.
 

scala/pom.xml

@@ -2,22 +2,22 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.sparkclr</groupId>
   <artifactId>spark-clr_2.10</artifactId>
-  <version>1.6.1-SNAPSHOT</version>
-  <name>SparkCLR Project</name>
+  <version>1.6.101-SNAPSHOT</version>
+  <name>Mobius Project</name>
   <description>C# language binding and extensions to Apache Spark</description>
-  <url>https://github.com/Microsoft/sparkclr</url>
+  <url>https://github.com/Microsoft/Mobius</url>
   <inceptionYear>2015</inceptionYear>
   <licenses>
     <license>
       <name>MIT License</name>
-      <url>https://github.com/Microsoft/SparkCLR/blob/master/LICENSE</url>
+      <url>https://github.com/Microsoft/Mobius/blob/master/LICENSE</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
 
   <developers>
     <developer>
-      <name>SparkCLR Team</name>
+      <name>Mobius Team</name>
       <email>sparkclrdev@microsoft.com</email>
       <organization>Microsoft</organization>
       <organizationUrl>http://www.microsoft.com</organizationUrl>
@@ -25,9 +25,9 @@
   </developers>
 
   <scm>
-    <connection>scm:git:git@github.com:Microsoft/SparkCLR.git</connection>
-    <developerConnection>scm:git:git@github.com:Microsoft/SparkCLR.git</developerConnection>
-    <url>git@github.com:Microsoft/SparkCLR.git</url>
+    <connection>scm:git:git@github.com:Microsoft/Mobius.git</connection>
+    <developerConnection>scm:git:git@github.com:Microsoft/Mobius.git</developerConnection>
+    <url>git@github.com:Microsoft/Mobius.git</url>
   </scm>
 
   <properties>

scripts/sparkclr-submit.cmd

@@ -36,7 +36,7 @@ if "%SPARK_ASSEMBLY_JAR%"=="0" (
   exit /b 1
 )
 
-if not defined SPARKCLR_JAR (set SPARKCLR_JAR=spark-clr_2.10-1.6.1-SNAPSHOT.jar)
+if not defined SPARKCLR_JAR (set SPARKCLR_JAR=spark-clr_2.10-1.6.101-SNAPSHOT.jar)
 echo SPARKCLR_JAR=%SPARKCLR_JAR% 
 set SPARKCLR_CLASSPATH=%SPARKCLR_HOME%\lib\%SPARKCLR_JAR%
 REM SPARKCLR_DEBUGMODE_EXT_JARS environment variable is used to specify external dependencies to use in debug mode

scripts/sparkclr-submit.sh

@@ -54,7 +54,7 @@ then
   exit 1
 fi
 
-export SPARKCLR_JAR=spark-clr_2.10-1.6.1-SNAPSHOT.jar
+export SPARKCLR_JAR=spark-clr_2.10-1.6.101-SNAPSHOT.jar
 export SPARKCLR_CLASSPATH="$SPARKCLR_HOME/lib/$SPARKCLR_JAR"
 # SPARKCLR_DEBUGMODE_EXT_JARS environment variable is used to specify external dependencies to use in debug mode
 [ ! "$SPARKCLR_DEBUGMODE_EXT_JARS" = "" ] && export SPARKCLR_CLASSPATH="$SPARKCLR_CLASSPATH:$SPARKCLR_DEBUGMODE_EXT_JARS"