Merge pull request #1398 from hovsepm/clu

[#108471000] Added Websites test project to CLU.

Author: Hovsep

build.proj

@@ -312,9 +312,9 @@
   <Target Name="Test" DependsOnTargets="BeforeRunTests">
     <Message Importance="high" Text="Running check in tests..." />
     <ItemGroup>
-      <!--Exclude 2 test projects still in progress with build failures-->
+      <!--Exclude 1 test projects still in progress with build failures-->
       <_CLUTestProjects Include="$(CLURootDir)\*.Test\project.json"
-                        Exclude="$(CLURootDir)\Microsoft.Azure.Commands.Resources.Test\project.json;$(CLURootDir)\Microsoft.Azure.Commands.Websites.Test\project.json">
+                        Exclude="$(CLURootDir)\Microsoft.Azure.Commands.Resources.Test\project.json">
       </_CLUTestProjects>
     </ItemGroup>
     <Exec Command="dnu build" WorkingDirectory="%(_CLUTestProjects.RootDir)%(_CLUTestProjects.Directory)" />

src/CLU.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24711.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.Common", "Commands.Common\Commands.Common.xproj", "{5F567ACA-595E-436D-83DB-A21E08F82DF6}"
 EndProject
@@ -25,6 +25,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.Common.Storage", "
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Management.Storage", "Microsoft.Azure.Commands.Management.Storage\Microsoft.Azure.Commands.Management.Storage.xproj", "{3910613E-4ED2-49E2-8CCF-966D586665AC}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Websites.Test", "Microsoft.Azure.Commands.Websites.Test\Microsoft.Azure.Commands.Websites.Test.xproj", "{F4D46F77-36D6-4BDB-95D0-85B1FAD1E160}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +77,10 @@ Global
 		{3910613E-4ED2-49E2-8CCF-966D586665AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3910613E-4ED2-49E2-8CCF-966D586665AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3910613E-4ED2-49E2-8CCF-966D586665AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4D46F77-36D6-4BDB-95D0-85B1FAD1E160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4D46F77-36D6-4BDB-95D0-85B1FAD1E160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4D46F77-36D6-4BDB-95D0-85B1FAD1E160}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4D46F77-36D6-4BDB-95D0-85B1FAD1E160}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/CLU/CLUCoreCLR.sln

@@ -0,0 +1,3 @@
+{
+  "profiles": {}
+}

src/CLU/Microsoft.Azure.Commands.Management.Storage/Properties/launchSettings.json

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.24711" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24711</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>f4d46f77-36d6-4bdb-95d0-85b1fad1e160</ProjectGuid>
+    <RootNamespace>Microsoft.Azure.Commands.Websites.Test</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

src/CLU/Microsoft.Azure.Commands.Websites.Test/Microsoft.Azure.Commands.Websites.Test.xproj

@@ -12,13 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.WebApps.Cmdlets.WebApps;
+using Microsoft.Azure.Commands.WebApps.Utilities;
+using Moq;
 using System.Collections;
 using System.Collections.Generic;
 using System.Management.Automation;
-using Microsoft.Azure.Commands.WebApps.Utilities;
-using Microsoft.Azure.Commands.WebApps.Cmdlets.WebApps;
-using Moq;
-
 
 namespace Microsoft.Azure.Commands.Websites.Test
 {
@@ -53,9 +52,10 @@ public NewAzureWebAppCommandTests()
             commandRuntimeMock = new Mock<ICommandRuntime>();
             cmdlet = new NewAzureWebAppCmdlet()
             {
-                CommandRuntime = commandRuntimeMock.Object,
+                //CommandRuntime = commandRuntimeMock.Object,
                 WebsitesClient = websitesClientMock.Object
             };
+            System.Reflection.TypeExtensions.GetProperty(cmdlet.GetType(), "CommandRuntime").SetValue(cmdlet, commandRuntimeMock.Object);
         }
 
     }

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

@@ -0,0 +1,3 @@
+{
+  "profiles": {}
+}