Merge branch 'clu' of github.com:Azure/azure-powershell into clu

Author: amarzavery

clu-getstart.md

@@ -2,10 +2,12 @@
 
 ### Prerequsites
 
-Visual Studio 2015 RTM with ASP.NET. For details, check out the [installation doc](http://docs.asp.net/en/latest/getting-started/installing-on-windows.html). 
+* Visual Studio 2015 RTM with ASP.NET. For details, check out the [installation doc](http://docs.asp.net/en/latest/getting-started/installing-on-windows.html). 
 
 Note, after done, run `dnvm list` command to check the 'coreclr' runtime is installed with right version of `1.0.0-rc1-final`. If not, run `dnvm install 1.0.0-rc1-final -r coreclr -a x64 -p`. Remember always use `-p` flag, so the selection can persist. 
 
+* Get the latest dotnet from "https://azureclu.blob.core.windows.net/tools/dotnet-win-x64.latest.zip", unzip, then add its bin folder to the PATH
+
 ### Project Artifacts
 
 CLUPackages require some additional files to direct generation of indexing, and to provide shortcuts when files are installed.  These files can be copied from the Profile project and updated for each package.   

examples/resource-management/03-Deployments.sh

@@ -6,10 +6,10 @@ printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName"
 azure group create --name "$groupName" --location "$location"
 
 printf "\n2. Test template with dynamic parameters\n"
-azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --sku "Standard" --workerSize "0"
+azure 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"
-azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"sku\":\"Standard\",\"workerSize\": 0 }"
+azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
 
 printf "\n4. Provisioning Deployment\n"
 deploymentInfo=`azure 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/BuildPackage.ps1

@@ -28,11 +28,9 @@ $fileContent = Get-Content $nuSpecTemplate
 $renameFileExists = Test-Path -Path ([System.IO.Path]::Combine($packageSource, "content", "rename.cfg"))
 $files = (Get-ChildItem $packageSource | Where -FilterScript {!$_.Name.Contains("nuspec")} | Select-Object -Property Name)
 $refFiles = $files | Where -FilterScript { $_.Name.EndsWith(".dll")}
-$contentFiles = $files | Where -FilterScript { $_.Name.EndsWith("xml")}
 $refFileText = ""
 $refFiles | %{$refFileText +=  ("        <reference file=""" + $_.Name + """/>`r`n")}
 $contentFileText = ""
-$contentFiles | %{ $contentFileText += ("    <file src=""" + $_.Name + """ target=""content""/>`r`n")}
 if ($packageId -ne "Microsoft.CLU.Commands") 
 {
     $contentFileText += "    <file src=""content\*.lx"" target=""content""/>`r`n"