Clu

build.proj

@@ -182,7 +182,9 @@
     Dnx uses dynamic compilation, 'clean' is unnecessary -->
   <Target
     Name="Full"
-    DependsOnTargets="Build;Test" />
+    DependsOnTargets="Build;Test" >
+    <Exec Command="$(LibraryToolsFolder)\CLU\BuildAndInstallClu.bat"></Exec>
+  </Target>
 
   <Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">
     <MSBuild Projects="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.csproj"

src/CLU/Commands.Common.Storage/project.json

@@ -19,8 +19,8 @@
     "Microsoft.CLU": "1.0.0",
     "Commands.Common": "",
     "Commands.Common.Authentication": "",
-    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
-    "Microsoft.Rest.ClientRuntime": "1.5.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
+    "Microsoft.Rest.ClientRuntime": "1.8.0",
     "Newtonsoft.Json": "7.0.1",
     "System.Collections": "4.0.11-beta-23516",
     "System.Collections.Concurrent": "4.0.11-beta-23516",

src/CLU/Commands.Common/project.json

@@ -18,8 +18,8 @@
     "System.Linq": "4.0.1-beta-23516",
     "Microsoft.CLU": "1.0.0",
     "Commands.Common.Authentication": "",
-    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
-    "Microsoft.Rest.ClientRuntime": "1.5.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
+    "Microsoft.Rest.ClientRuntime": "1.8.0",
     "Newtonsoft.Json": "7.0.1",
     "System.Collections": "4.0.11-beta-23516",
     "System.Collections.Concurrent": "4.0.11-beta-23516",

src/CLU/Commands.ResourceManager.Cmdlets/project.json

@@ -20,8 +20,8 @@
     "Commands.Common.Authentication": "",
     "Commands.Common": "",
     "Commands.ResourceManager.Common": "",
-    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
-    "Microsoft.Rest.ClientRuntime": "1.5.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
+    "Microsoft.Rest.ClientRuntime": "1.8.0",
     "Newtonsoft.Json": "7.0.1",
     "System.Collections": "4.0.11-beta-23516",
     "System.Collections.Concurrent": "4.0.11-beta-23516",

src/CLU/Commands.ResourceManager.Common/project.json

@@ -19,8 +19,8 @@
     "Microsoft.CLU": "1.0.0",
     "Commands.Common": "",
     "Commands.Common.Authentication": "",
-    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
-    "Microsoft.Rest.ClientRuntime": "1.5.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
+    "Microsoft.Rest.ClientRuntime": "1.8.0",
     "Newtonsoft.Json": "7.0.1",
     "System.Collections": "4.0.11-beta-23516",
     "System.Collections.Concurrent": "4.0.11-beta-23516",

src/CLU/Microsoft.Azure.Commands.Management.Storage/project.json

@@ -21,8 +21,8 @@
     "Commands.Common.Authentication": "",
     "Commands.Common.Storage": "",
     "Commands.ResourceManager.Common": "",
-    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
-    "Microsoft.Rest.ClientRuntime": "1.5.0",
+    "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
+    "Microsoft.Rest.ClientRuntime": "1.8.0",
     "Newtonsoft.Json": "7.0.1",
     "System.Collections": "4.0.11-beta-23516",
     "System.Collections.Concurrent": "4.0.11-beta-23516",

src/CLU/Microsoft.Azure.Commands.Resources.Test/ResourceGroups/NewAzureResourceGroupCommandTests.cs

@@ -41,7 +41,7 @@ public class NewAzureResourceGroupCommandTests : RMTestBase
 
         private string templateFile = @"Resources\sampleTemplateFile.json";
 
-        private string storageAccountName = "myStorageAccount";
+        //private string storageAccountName = "myStorageAccount";
 
         private Hashtable[] tags;
 

src/CLU/Microsoft.Azure.Commands.Websites.Test/NewAzureWebsitesCommandTests.cs

@@ -30,22 +30,21 @@ public class NewAzureWebAppCommandTests
 
         private Mock<ICommandRuntime> commandRuntimeMock;
 
- //       ResourceGroupName, WebsiteName, SlotName, Location, WebHostingPlan
+        //ResourceGroupName, WebsiteName, SlotName, Location, WebHostingPlan
 
+        //private string resourceGroupName = "Default-Web-WestUS";
 
-        private string resourceGroupName = "Default-Web-WestUS";
+        //private string websiteName = "ngoliPSWebsite";
 
-        private string websiteName = "ngoliPSWebsite";
-
-        private string slotName = null; 
+        //private string slotName = null; 
 
-        private string webHostingPlan = "myWHP";
+        //private string webHostingPlan = "myWHP";
 
-        private string location = "West US";
+        //private string location = "West US";
 
-        private Dictionary<string, object> properties;
+        //private Dictionary<string, object> properties;
 
-        private Hashtable[] tags;
+        //private Hashtable[] tags;
 
         public NewAzureWebAppCommandTests()
         {

src/CLU/Microsoft.Azure.Commands.Websites.Test/WebsitesTestHelpers.cs

@@ -24,7 +24,7 @@ public static void CreateAccountResource(string accountName, string resourceGrou
         {
             string tenantUrlEnding = "batch-test.windows-int.net";
             string endpoint = string.Format("{0}.{1}", accountName, tenantUrlEnding);
-            string subscription = "00000000-0000-0000-0000-000000000000";
+            //string subscription = "00000000-0000-0000-0000-000000000000";
             string resourceGroup = resourceGroupName;
         }
     }

tools/CLU/BuildAndInstallClu.bat

@@ -0,0 +1,36 @@
+echo off
+setlocal
+set root=%~dp0..\..
+where dotnet.exe
+if ERRORLEVEL 1 (
+    echo Please install 'dotnet', say from 'https://azureclu.blob.core.windows.net/tools/dotnet-win-x64.latest.zip', unzip, then add its bin folder to the PATH
+    exit /B 1
+)
+@powershell -file %~dp0\BuildDrop.ps1
+
+REM cook a msclu.cfg with a correct local repro path. 
+set mscluCfg=%root%\drop\clurun\win7-x64\msclu.cfg
+if not exist %mscluCfg% (
+    copy /Y %root%\src\CLU\clurun\msclu.cfg %root%\drop\clurun\win7-x64
+)
+echo ^(Get-Content "%mscluCfg%"^) ^| ForEach-Object { $_ -replace "TOFILL", "%root%\drop\CommandRepo" } ^| Set-Content "%mscluCfg%"^ >"%temp%\Rep.ps1"
+@powershell -file %temp%\Rep.ps1
+
+%root%\drop\clurun\win7-x64\clurun.exe --install
+%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Profile
+%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Resources
+%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Resources.Cmdlets
+%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Websites
+%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Management.Storage
+
+REM setup osx and linux bits which can be xcopied and run. 
+REM note, for known nuget bugs, skip --install by copying over cmdlet packages.
+xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\osx.10.10-x64\pkgs /S /Q /I /Y
+copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\osx.10.10-x64
+copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\osx.10.10-x64
+copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64
+
+xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\ubuntu.14.04-x64\pkgs /S /Q /I /Y
+copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\ubuntu.14.04-x64
+copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\ubuntu.14.04-x64
+copy /Y %~dp0\azure.sh %root%\drop\clurun\ubuntu.14.04-x64

tools/CLU/SetupEnv.bat

@@ -1,48 +1,23 @@
 echo off
-
-where dotnet.exe
-if ERRORLEVEL 1 (
-    echo Please install 'dotnet', say from 'https://azureclu.blob.core.windows.net/tools/dotnet-win-x64.latest.zip', unzip, then add its bin folder to the PATH
-    exit /B
-)
-
+setlocal
 set root=%~dp0..\..
 echo Build all clu source projects
 "%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild" %root%\build.proj /t:build >NUL
 
 if ERRORLEVEL 1 (
    echo Build source project failed. To repro, run: msbuild build.proj /t:build
+   exit /B 1
 ) 
 
 REM build cmdlets packages
-@powershell -file %~dp0\BuildDrop.ps1
-
-REM cook a msclu.cfg with a correct local repro path. 
-set mscluCfg=%root%\drop\clurun\win7-x64\msclu.cfg
-if not exist %mscluCfg% (
-    copy /Y %root%\src\CLU\clurun\msclu.cfg %root%\drop\clurun\win7-x64
-)
-echo ^(Get-Content "%mscluCfg%"^) ^| ForEach-Object { $_ -replace "TOFILL", "%root%\drop\CommandRepo" } ^| Set-Content "%mscluCfg%"^ >"%temp%\Rep.ps1"
-@powershell -file %temp%\Rep.ps1
-
 set DebugCLU=
-%root%\drop\clurun\win7-x64\clurun.exe --install
-%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Profile
-%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Resources
-%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Resources.Cmdlets
-%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Websites
-%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Management.Storage
-set DebugCLU=1
+call %~dp0\BuildAndInstallClu.bat
 set Path=%Path%;%root%\drop\clurun\win7-x64
+REM run 'azure help' to verify all are wired up
+azure help
+if ERRORLEVEL 1 (
+   echo Build and deploy clu package failed
+   exit /B 1
+) 
+set DebugCLU=1
 
-REM setup osx and linux bits which can be xcopied and run. 
-REM note, for known nuget bugs, skip --install by copying over cmdlet packages.
-xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\osx.10.10-x64\pkgs /S /Q /I /Y
-copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\osx.10.10-x64
-copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\osx.10.10-x64
-copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64
-
-xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\ubuntu.14.04-x64\pkgs /S /Q /I /Y
-copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\ubuntu.14.04-x64
-copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\ubuntu.14.04-x64
-copy /Y %~dp0\azure.sh %root%\drop\clurun\ubuntu.14.04-x64