Skip to content

Commit 2a7454e

Browse files
author
Maddie Clayton
authored
Merge pull request Azure#8914 from Nking92/websites_2.1.0sdk
Update Websites SDK to v2.1.0. Fix compilation errors and record tests.
2 parents 1a50534 + aada28c commit 2a7454e

File tree

11 files changed

+8168
-17946
lines changed

11 files changed

+8168
-17946
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ assign a custom domain to it and update global variable values.
1717
#>
1818

1919
#Global variables
20-
$rgname = "lketmtestantps10"
21-
$appname = "lketmtestantps10"
20+
$rgname = "nickingssltests"
21+
$appname = "nickingssltests"
2222
$slot = "testslot"
23-
$prodHostname = "www.adorenow.net"
24-
$slotHostname = "testslot.adorenow.net"
25-
$thumbprint = "F75A7A8C033FBEA02A1578812DB289277E23EAB1"
23+
$prodHostname = "www.nkazuressltest.net"
24+
$slotHostname = "testslot.nkazuressltest.net"
25+
$thumbprint = "0A894BAD9CBD1161AEBBF177BFF5EDC98048516C"
2626

2727
<#
2828
.SYNOPSIS

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.SSLBindingTests/TestCreateNewWebAppSSLBinding.json

Lines changed: 1314 additions & 1311 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.SSLBindingTests/TestGetNewWebAppSSLBinding.json

Lines changed: 1840 additions & 1837 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.SSLBindingTests/TestGetWebAppCertificate.json

Lines changed: 746 additions & 10538 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.SSLBindingTests/TestRemoveNewWebAppSSLBinding.json

Lines changed: 1838 additions & 1835 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.SSLBindingTests/TestWebAppSSLBindingPipeSupport.json

Lines changed: 2418 additions & 2415 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/Websites.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.Websites" Version="2.0.1" />
14+
<PackageReference Include="Microsoft.Azure.Management.Websites" Version="2.1.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/Websites/Websites/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020
## Upcoming Release
2121
* Updated cmdlets with plural nouns to singular, and deprecated plural names.
22+
* Updated the WebSites SDK.
23+
* Removed the AdminSiteName property from PSAppServicePlan.
2224

2325
## Version 1.1.2
2426
* Fix ARM template bug that breaks cloning all slots using `New-AzWebApp -IncludeSourceWebAppSlots`

src/Websites/Websites/Cmdlets/AppServicePlans/NewAzureAppServicePlan.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,14 @@ public override void ExecuteCmdlet()
106106
{
107107
Location = Location,
108108
Sku = sku,
109-
AdminSiteName = null,
110109
PerSiteScaling = PerSiteScaling,
111110
IsXenon = HyperV.IsPresent
112111
};
113112

113+
AppServicePlan retPlan = WebsitesClient.CreateOrUpdateAppServicePlan(ResourceGroupName, Name, appServicePlan, AseName, aseResourceGroupName);
114+
PSAppServicePlan psPlan = new PSAppServicePlan(retPlan);
114115

115-
WriteObject(new PSAppServicePlan(WebsitesClient.CreateOrUpdateAppServicePlan(ResourceGroupName, Name, appServicePlan, AseName, aseResourceGroupName)), true);
116+
WriteObject(psPlan, true);
116117
}
117118
}
118119
}

src/Websites/Websites/Models.WebApp/PSAppServicePlan.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public PSAppServicePlan(AppServicePlan other): base(
2929
workerTierName: other.WorkerTierName,
3030
status: other.Status,
3131
subscription: other.Subscription,
32-
adminSiteName: other.AdminSiteName,
3332
hostingEnvironmentProfile: other.HostingEnvironmentProfile,
3433
maximumNumberOfWorkers: other.MaximumNumberOfWorkers,
3534
geoRegion: other.GeoRegion,

src/Websites/Websites/Websites.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.Websites" Version="2.0.1" />
14+
<PackageReference Include="Microsoft.Azure.Management.Websites" Version="2.1.0" />
1515
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
1616
</ItemGroup>
1717

0 commit comments

Comments
 (0)