Merge pull request Azure#7127 from panchagnula/sisirap-previewSDK

Websites: Updating websites module to use the latest released .NET SDK version of websites

Author: Maddie Clayton

src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.Netcore.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
-    <PackageReference Include="Microsoft.Azure.Management.Websites" Version="1.7.1-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Websites" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj

@@ -44,8 +44,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Websites, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Websites.1.7.1-preview\lib\net452\Microsoft.Azure.Management.Websites.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.Websites, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Websites.2.0.0\lib\net452\Microsoft.Azure.Management.Websites.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/SSLBindingTests.ps1

@@ -22,7 +22,8 @@ $appname = "lketmtestantps10"
 $slot = "testslot"
 $prodHostname = "www.adorenow.net"
 $slotHostname = "testslot.adorenow.net"
-$thumbprint = "ECC61863C674D5CEE90AB06373D37342368F0413"
+$thumbprint = "EFB353A477464228CC8A155C38DCB8D02726A4C1"
+$thumbprintSlot = "F75A7A8C033FBEA02A1578812DB289277E23EAB1"
 
 <#
 .SYNOPSIS
@@ -37,7 +38,7 @@ function Test-CreateNewWebAppSSLBinding
 		Assert-AreEqual $prodHostname $createResult.Name
 
 		# Test - Create Ssl binding for web app slot
-		$createResult = New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprint
+		$createResult = New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprintSlot
 		Assert-AreEqual $slotHostname $createResult.Name
 	}
     finally
@@ -58,19 +59,17 @@ function Test-GetNewWebAppSSLBinding
 	{
 		# Setup - Create Ssl bindings
 		$createWebAppResult = New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Name $prodHostname -Thumbprint $thumbprint
-		$createWebAppSlotResult = New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprint
+		$createWebAppSlotResult = New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprintSlot
 
 		# Test - Get commands for web app
 		$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname
-		Assert-AreEqual 1 $getResult.Count
 		$currentHostNames = $getResult | Select -expand Name
 		Assert-True { $currentHostNames -contains $createWebAppResult.Name }
 		$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Name $prodHostname
 		Assert-AreEqual $getResult.Name $createWebAppResult.Name
 
 		# Test - Get commands for web app slot
 		$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot
-		Assert-AreEqual 1 $getResult.Count
 		$currentHostNames = $getResult | Select -expand Name
 		Assert-True { $currentHostNames -contains $createWebAppSlotResult.Name }
 		$getResult = Get-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname
@@ -94,7 +93,7 @@ function Test-RemoveNewWebAppSSLBinding
 	{
 		# Setup - Create Ssl bindings
 		New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Name $prodHostname -Thumbprint $thumbprint
-		New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprint
+		New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Slot $slot -Name $slotHostname -Thumbprint $thumbprintSlot
 
 		# Tests - Removing binding from web app and web app slot
 		Remove-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Name $prodHostname -Force
@@ -133,7 +132,7 @@ function Test-WebAppSSLBindingPipeSupport
 		$createResult = $webapp | New-AzureRMWebAppSSLBinding -Name $prodHostName -Thumbprint $thumbprint
 		Assert-AreEqual $prodHostName $createResult.Name
 
-		$createResult = $webappslot | New-AzureRMWebAppSSLBinding -Name $slotHostName -Thumbprint $thumbprint
+		$createResult = $webappslot | New-AzureRMWebAppSSLBinding -Name $slotHostName -Thumbprint $thumbprintSlot
 		Assert-AreEqual $slotHostName $createResult.Name
 
 		# Test - Retrieve Ssl bindings using web app and web app slot objects
@@ -174,11 +173,11 @@ function Test-GetWebAppCertificate
 		New-AzureRMWebAppSSLBinding -ResourceGroupName $rgname -WebAppName  $appname -Name $prodHostname -Thumbprint $thumbprint
 
 		# Tests - Retrieve web app certificate objects
-		$certificates = Get-AzureRMWebAppCertificate
+		$certificates = Get-AzureRMWebAppCertificate -ResourceGroupName $rgname
 		$thumbprints = $certificates | Select -expand Thumbprint
 		Assert-True { $thumbprints -contains $thumbprint }
 
-		$certificate = Get-AzureRMWebAppCertificate -Thumbprint $thumbprint
+		$certificate = Get-AzureRMWebAppCertificate -ResourceGroupName $rgname -Thumbprint $thumbprint
 		Assert-AreEqual $thumbprint $certificate.Thumbprint
 	}
     finally

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1

@@ -15,7 +15,7 @@
 # Snapshots require a Premium app to exist for several hours.
 # Deploy a Premium app and update these global variables to re-record the snapshots tests.
 $snapshotRgName = 'onesdksnapshots'
-$snapshotAppName = 'onesdkpremapp'
+$snapshotAppName = 'onesdkpremapp2'
 $snapshotAppSlot = 'staging'
 
 function Test-CreateNewWebAppBackup

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.ps1

@@ -26,7 +26,6 @@ function Test-GetWebAppSlot
 	$location = Get-Location
 	$planName = Get-WebHostPlanName
 	$tier = "Standard"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 
 	try
@@ -182,7 +181,6 @@ function Test-StartStopRestartWebAppSlot
 	$location = Get-Location
 	$planName = Get-WebHostPlanName
 	$tier = "Standard"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 
 	try
@@ -265,7 +263,6 @@ function Test-CloneWebAppToSlot
 	$location = Get-Location
 	$planName = Get-WebHostPlanName
 	$tier = "Premium"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 
 	try
@@ -317,7 +314,6 @@ function Test-CloneWebAppSlot
 	$planName = Get-WebHostPlanName
 	$slotname = "staging"
 	$tier = "Premium"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 
 	# Destination setup
@@ -383,7 +379,6 @@ function Test-CreateNewWebAppSlot
 	$slotname = "staging"
 	$planName = Get-WebHostPlanName
 	$tier = "Standard"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 	try
 	{

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppTests.ps1

@@ -527,12 +527,13 @@ Tests creating a new website on an ase
 function Test-CreateNewWebAppOnAse
 {
 	# Setup
+	# Creating and provisioning an ASE currently takes 30 mins to an hour, hence this test requires that the ASE & ASP are already created 
+	# before creating the app on the ASE
 	$rgname = "appdemorg"
 	$wname = Get-WebsiteName
 	$location = "West US"
 	$whpName = "travelproductionplan"
 	$aseName = "asedemops"
-	$apiversion = "2015-08-01"
 	$resourceType = "Microsoft.Web/sites"
 	try
 	{