Only build deb packages on mac, fix windows docker build

build.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
+#
+# $1 is passed to package to enable deb or pkg packaging
 
 ./scripts/bootstrap.sh
 
-./scripts/package.sh
+./scripts/package.sh $1

scripts/ci_build.sh

@@ -3,7 +3,7 @@ whoami
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [[ "$(uname)" == "Linux" ]]; then
-    $SCRIPT_DIR/dockerbuild.sh $@
+    $SCRIPT_DIR/dockerbuild.sh debian $@
 else
     $SCRIPT_DIR/../build.sh $@
 fi

scripts/dockerbuild.sh

@@ -26,4 +26,4 @@ docker run \
     -v $DOCKER_HOST_SHARE_DIR:/opt/code \
     --name $DOTNET_BUILD_CONTAINER_NAME \
     -e DOTNET_BUILD_VERSION=$DOTNET_BUILD_VERSION \
-    $DOTNET_BUILD_CONTAINER_TAG $BUILD_COMMAND
+    $DOTNET_BUILD_CONTAINER_TAG $BUILD_COMMAND $1

scripts/package-debian.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # 
-# Build Script
+# Debian Packaging Script
 # Currently Intended to build on ubuntu14.04
 
 SOURCE="${BASH_SOURCE[0]}"

scripts/package.sh

@@ -11,7 +11,10 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 # Create Dnvm Package
 $DIR/package-dnvm.sh
 
-# Create Debian package
-$DIR/package-debian.sh
-
-# TODO: Create Pkg
+if [[ "$1" == "debian" ]]; then
+    # Create Debian package
+    $DIR/package-debian.sh
+elif [[ "$1" == "pkg" ]]; then
+    # Create Mac Pkg
+    $DIR/package-pkg.sh
+fi

scripts/package_upload.json

@@ -0,0 +1,6 @@
+{
+  "name":"dotnet",
+  "version":"0.3",
+  "repositoryId":"561d36b9e548cb6eea0d6fc3",
+  "sourceUrl":"http://dotnetbuilddrops.blob.core.windows.net/debiantest/dotnet_0.3-1_amd64.deb"
+}

scripts/windows_dockerbuild.sh

@@ -82,7 +82,7 @@ copy_code_to_vm(){
 run_build(){
     # These are env variables for dockerbuild.sh
     export DOCKER_HOST_SHARE_DIR="$(_convert_path $VM_CODE_DIR)"
-    echo $DOCKER_HOST_SHARE_DIR
+    export BUILD_COMMAND="//opt\\code\\build.sh"
 
     $DIR/dockerbuild.sh
 }

src/Microsoft.DotNet.Cli/project.json

@@ -20,7 +20,7 @@
     },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
-      "version": "1.0.0-rc1-15981"
+      "version": "1.0.0-rc1-15838"
     }
   },
   "frameworks": {

src/Microsoft.DotNet.Tools.Compiler.Csc/project.json

@@ -23,7 +23,7 @@
     },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
-      "version": "1.0.0-*"
+      "version": "1.0.0-rc1-15838"
     },
     "Microsoft.Net.Compilers.netcore": "1.1.0-*"
   },

src/Microsoft.DotNet.Tools.Compiler/project.json

@@ -23,7 +23,7 @@
     },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
-      "version": "1.0.0-*"
+      "version": "1.0.0-rc1-15838"
     },
     "Microsoft.Net.Compilers.netcore": "1.1.0-*"
   },

src/Microsoft.DotNet.Tools.Publish/project.json

@@ -21,7 +21,7 @@
     },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
-      "version": "1.0.0-*"
+      "version": "1.0.0-rc1-15838"
     },
     "System.AppContext": "4.0.1-beta-23419"
   },

src/Microsoft.DotNet.Tools.Resgen/project.json

@@ -21,7 +21,7 @@
     },
     "Microsoft.Extensions.CommandLineUtils.Sources": {
       "type": "build",
-      "version": "1.0.0-*"
+      "version": "1.0.0-rc1-15838"
     },
     "System.Xml.XDocument": "4.0.11-beta-23419",
     "System.Resources.ReaderWriter": "4.0.0-beta-23419"