merge with recent changes in upstream clu

Author: yugangw-msft

build.proj

@@ -185,7 +185,7 @@
     DependsOnTargets="Build;Test" >
     <Exec Command="$(LibraryToolsFolder)\CLU\BuildAndInstallClu.bat" />
     <!--do a simple verification-->
-    <Exec Command="$(LibraryRoot)drop\clurun\win7-x64\azure.bat help" />
+    <Exec Command="$(LibraryRoot)drop\clurun\win7-x64\az.bat help" />
   </Target>
 
   <Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">

examples/resource-management/03-Deployments.sh

@@ -6,10 +6,10 @@ printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName"
 az group create --name "$groupName" --location "$location"
 
 printf "\n2. Test template with dynamic parameters\n"
-az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --sku "Standard" --workerSize "0"
+az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --workerSize "0"
 
 printf "\n3. Test template with JSON parameter object\n"
-az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"sku\":\"Standard\",\"workerSize\": 0 }"
+az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
 
 printf "\n4. Provisioning Deployment\n"
 deploymentInfo=`az group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`

examples/resource-management/sampleTemplate.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
     "siteName": {
@@ -11,16 +11,6 @@
     "siteLocation": {
       "type": "string"
     },
-    "sku": {
-      "type": "string",
-      "allowedValues": [
-        "Free",
-        "Shared",
-        "Basic",
-        "Standard"
-      ],
-      "defaultValue": "Free"
-    },
     "workerSize": {
       "type": "int",
       "allowedValues": [
@@ -33,13 +23,17 @@
   },
   "resources": [
     {
-      "apiVersion": "2014-04-01",
+      "apiVersion": "2015-08-01",
       "name": "[parameters('hostingPlanName')]",
       "type": "Microsoft.Web/serverfarms",
       "location": "[parameters('siteLocation')]",
+      "sku": {
+        "name": "S1",
+        "tier": "Standard",
+        "capacity": 1
+      },
       "properties": {
         "name": "[parameters('hostingPlanName')]",
-        "sku": "[parameters('sku')]",
         "workerSize": "[parameters('workerSize')]",
         "numberOfWorkers": 1
       }

examples/resource-management/sampleTemplateParams.json

@@ -8,9 +8,6 @@
   "siteLocation": {
     "value": "West US"
   },
-  "sku": {
-    "value": "Standard"
-  },
   "workerSize": {
     "value": 0
   }

tools/CLU/az.sh

@@ -4,4 +4,4 @@ then
   export CmdletSessionID=$PPID
 fi
 SCRIPTPATH=$(dirname "$0")
-$SCRIPTPATH/clurun -s azure -r $SCRIPTPATH/azure.lx "$@" 
+$SCRIPTPATH/clurun -s az -r $SCRIPTPATH/azure.lx "$@" 

tools/CLU/az.win.sh

@@ -5,4 +5,4 @@ then
 fi
 SCRIPTPATH=$(dirname "$0")
 WSCRIPTPATH=$({ cd $SCRIPTPATH && pwd -W; } | sed 's|/|\\|g')
-$WSCRIPTPATH/clurun -s azure -r $WSCRIPTPATH/azure.lx "$@" 
+$WSCRIPTPATH/clurun -s az -r $WSCRIPTPATH/azure.lx "$@"