Merge websites-preview branch for BUILD #6046

markcowl · 2018-04-25T03:35:59Z

Description

Checklist

I have read the Submitting Changes section of CONTRIBUTING.md
The title of the PR is clear and informative
The appropriate change log has been updated
The PR does not introduce breaking changes
If applicable, the changes made in the PR have proper test coverage
For public API changes to cmdlets:
- the changes have gone through a cmdlet design review
- the cmdlet markdown files were generated using the platyPS module

… snapshots. Fixed Restore-AzureRmWebAppBackup cmdlet that was broken due to a breaking API change in a recent update.

…uild instead

…pp is not enumerated when written to the pipeline

…view.nupkg

… snapshot cmdlet. Changed get snapshot cmdlet name to be singular.

…T Standard project

…ET Standard build

versions, removed snapshots cmdlets for future work

Update websites-preview with latest from preview branch

…mand. Updated help file for the command. Fixed return type of get snapshot command.

Update websites-preview branch

…w-AzurRmAppServicePlan Tier parameter

…hell into websites-preview # Conflicts: # src/ServiceManagement/ServiceManagement.sln # tools/PublishModules.ps1

…zure#5471 for identity & httpsOnly property

…ithWebsitesPreview Pull in the latest from preview into websites-preview

…ppBackupRestoreTests.TestGetWebAppBackup

markcowl · 2018-04-25T06:06:30Z

on demand run here: https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/powershell-demand/771/

maddieclayton · 2018-04-25T17:51:52Z

src/ResourceManager/Websites/AzureRM.Websites.psd1

@@ -140,6 +141,8 @@ PrivateData = @{
        # External dependent modules of this module
        # ExternalModuleDependencies = @()

+        Prerelease = 'preview'


This should be reverted.

maddieclayton · 2018-04-25T17:52:37Z

src/ResourceManager/Websites/ChangeLog.md

@@ -32,6 +32,10 @@
 * Fixed issue with importing aliases
 * New-AzureRMWebApp - added parameter set for simplified WebApp creation, with local git repository support.

+## Version 5.0.0-preview


Move the content of this into ## Current Release

maddieclayton · 2018-04-25T17:53:13Z

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

@@ -84,6 +83,12 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


Remove clientruntime and system.management.automation references, as these are in common dependencies.

maddieclayton · 2018-04-25T17:53:30Z

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

@@ -323,6 +310,4 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Import Project="..\..\..\..\tools\Common.Dependencies.Test.targets" />


Add this back.

maddieclayton · 2018-04-25T17:54:48Z

src/ResourceManager/Websites/Commands.Websites.Test/packages.config

  <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
  <package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />


Remove these two references

maddieclayton · 2018-04-25T17:56:52Z

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

+  <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Websites" Version="1.7.1-preview" />
+    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />


Do we need all these package references?

maddieclayton · 2018-04-25T17:59:44Z

tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv

@@ -1144,6 +1144,9 @@
 "Microsoft.Azure.Commands.Compute.dll","Microsoft.Azure.Commands.Compute.Automation.SetAzureRmVmssStorageProfileCommand","Set-AzureRmVmssStorageProfile","0","3030","The generic type for 'parameter ManagedDisk' has been changed from 'System.Nullable`1[Microsoft.Azure.Management.Compute.Models.StorageAccountTypes]' to 'System.Nullable`1[Microsoft.Azure.Commands.Compute.Models.PSStorageAccountTypes]'. ","Change the generic type for 'parameter ManagedDisk' back to 'System.Nullable`1[Microsoft.Azure.Management.Compute.Models.StorageAccountTypes]'."
 "Microsoft.Azure.Commands.Subscription.dll","Microsoft.Azure.Commands.Subscription.Cmdlets.NewAzureRmSubscriptionDefinition","New-AzureRmSubscriptionDefinition","0","1000","The cmdlet 'New-AzureRmSubscriptionDefinition' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'New-AzureRmSubscriptionDefinition' back to the module, or add an alias to the original cmdlet name."
 "Microsoft.Azure.Commands.Subscription.dll","Microsoft.Azure.Commands.Subscription.Cmdlets.GetAzureRmSubscriptionDefinition","Get-AzureRmSubscriptionDefinition","0","1000","The cmdlet 'Get-AzureRmSubscriptionDefinition' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'Get-AzureRmSubscriptionDefinition' back to the module, or add an alias to the original cmdlet name."
+"Microsoft.Azure.Commands.Resources.dll","Microsoft.Azure.Commands.Resources.GetAzureRoleDefinitionCommand","Get-AzureRmRoleDefinition","0","2000","The cmdlet 'Get-AzureRmRoleDefinition' no longer supports the parameter 'AtScopeAndBelow' and no alias was found for the original parameter name.","Add the parameter 'AtScopeAndBelow' back to the cmdlet 'Get-AzureRmRoleDefinition', or add an alias to the original parameter name."


These three entries probably should be removed, as they aren't included in this PR.

maddieclayton · 2018-04-25T18:00:56Z

src/ResourceManager/Websites/AzureRM.Websites.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''

 # Version number of this module.
-ModuleVersion = '4.2.2'
+ModuleVersion = '5.0.0'


What version do we want this module to be? Having a preview and a stable module with the same version could be confusing and might cause problems for installation - do we want this to bump to 6.0.0?

maddieclayton · 2018-04-25T19:34:24Z

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

@@ -84,6 +83,9 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


Remove this clientruntime.azure reference and the system.management.automation reference below.

maddieclayton · 2018-04-25T19:35:05Z

src/ResourceManager/Websites/Commands.Websites.Test/packages.config

  <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
  <package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net452" />


Remove this reference as well.

maddieclayton · 2018-04-25T19:35:40Z

tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv

@@ -1144,6 +1144,8 @@
 "Microsoft.Azure.Commands.Compute.dll","Microsoft.Azure.Commands.Compute.Automation.SetAzureRmVmssStorageProfileCommand","Set-AzureRmVmssStorageProfile","0","3030","The generic type for 'parameter ManagedDisk' has been changed from 'System.Nullable`1[Microsoft.Azure.Management.Compute.Models.StorageAccountTypes]' to 'System.Nullable`1[Microsoft.Azure.Commands.Compute.Models.PSStorageAccountTypes]'. ","Change the generic type for 'parameter ManagedDisk' back to 'System.Nullable`1[Microsoft.Azure.Management.Compute.Models.StorageAccountTypes]'."
 "Microsoft.Azure.Commands.Subscription.dll","Microsoft.Azure.Commands.Subscription.Cmdlets.NewAzureRmSubscriptionDefinition","New-AzureRmSubscriptionDefinition","0","1000","The cmdlet 'New-AzureRmSubscriptionDefinition' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'New-AzureRmSubscriptionDefinition' back to the module, or add an alias to the original cmdlet name."
 "Microsoft.Azure.Commands.Subscription.dll","Microsoft.Azure.Commands.Subscription.Cmdlets.GetAzureRmSubscriptionDefinition","Get-AzureRmSubscriptionDefinition","0","1000","The cmdlet 'Get-AzureRmSubscriptionDefinition' has been removed and no alias was found for the original cmdlet name.","Add the cmdlet 'Get-AzureRmSubscriptionDefinition' back to the module, or add an alias to the original cmdlet name."
+"Microsoft.Azure.Commands.Resources.dll","Microsoft.Azure.Commands.Resources.GetAzureRoleDefinitionCommand","Get-AzureRmRoleDefinition","0","1050","The parameter set 'RoleDefinitionNameParameterSet' for cmdlet 'Get-AzureRmRoleDefinition' has been removed.","Add parameter set 'RoleDefinitionNameParameterSet' back to cmdlet 'Get-AzureRmRoleDefinition'."


This still has two extra lines that shouldn't be here.

maddieclayton · 2018-04-25T22:10:33Z

on demand run here: https://azuresdkci.westus2.cloudapp.azure.com/view/PowerShell/job/powershell-demand/774/

…rsion of Storage for websites test in desktop to be compatible with using MockContext, but still have the recordings work. Got the netcore Websites tests working but skip some because of the storage version being out-of-date.

Nicholas King and others added 30 commits October 27, 2017 13:59

Updated code to work with new Websites SDK. Added cmdlets for website…

b9e5dd1

… snapshots. Fixed Restore-AzureRmWebAppBackup cmdlet that was broken due to a breaking API change in a recent update.

Merge remote-tracking branch 'upstream/preview' into preview

c9792a7

Remove project reference for WebSites SDK and use an unsigned nupkg b…

7aefff0

…uild instead

Remove WebSites symbols nupkg file

bf7522b

Fixes an issue where the list of web apps returned by Get-AzureRmWebA…

f812965

…pp is not enumerated when written to the pipeline

Removing local build of Microsoft.Azure.Management.Websites.1.7.1-pre…

e4417c5

…view.nupkg

Fix build errors due to WebSites SDK update

923a665

Fix manifest files, add new recorded tests to the csproj

59ddf4b

Merge remote-tracking branch 'upstream/preview' into preview

05eeff5

Recorded failing PublishingProfile tests again

b934ba6

Generated markdown help files. Added SupportsShouldProcess to restore…

b234e0f

… snapshot cmdlet. Changed get snapshot cmdlet name to be singular.

Merge branch 'preview' into preview

5f51cc7

Update version of Microsoft.Azure.Management.Websites package for .NE…

fd05626

…T Standard project

Merge remote-tracking branch 'origin/preview' into preview

1419c46

Merge remote-tracking branch 'upstream/preview' into preview

d1f10f0

Remove old websites client extension methods that are breaking the .N…

bf5ac41

…ET Standard build

Change old SiteConfig type -> SiteConfigResource for .NET Standard build

50a29ee

A couple more patches of SiteConfig -> SiteConfigResource

38241ef

Merge remote-tracking branch 'upstream/preview' into preview

e61db4a

Fixes for code review. Removed redundant dependencies, updated module

b658a9e

versions, removed snapshots cmdlets for future work

Changed snapshot times to DateTimes instead of Strings

59bde91

Merge pull request Azure#5234 from Azure/preview

51cfa61

Update websites-preview with latest from preview branch

Merge branch 'websites-preview' into preview

730177b

Merge remote-tracking branch 'upstream/preview' into preview

fea8d33

Added AsJob option and Snapshot parameter set to restore snapshot com…

c98549d

…mand. Updated help file for the command. Fixed return type of get snapshot command.

Merge remote-tracking branch 'origin/preview' into preview

b9b4444

Merge pull request Azure#5308 from Azure/preview

7113b48

Update websites-preview branch

Merge branch 'websites-preview' into preview

dff2bc7

Fix module versions, change ValidateSet to PSArgumentCompleter for Ne…

4576653

…w-AzurRmAppServicePlan Tier parameter

Add breaking change exceptions for Websites module

c98f6e5

cormacpayne and others added 13 commits January 31, 2018 16:38

Fix bug in tooling around PowerShellGet 1.6.0

a224304

Merge branch 'updatesign' of https://github.com/markcowl/azure-powers…

0dd8638

…hell into websites-preview # Conflicts: # src/ServiceManagement/ServiceManagement.sln # tools/PublishModules.ps1

Re-recording RemoveWebAppTest & adding the changes from pull request A…

132cb06

…zure#5471 for identity & httpsOnly property

Merge pull request Azure#5592 from panchagnula/sisirap-mergedPreviewW…

21161d1

…ithWebsitesPreview Pull in the latest from preview into websites-preview

Merge branch 'websites-preview' into iss#5678

b5a7d23

Smart merge.

f9ff530

Merge remote-tracking branch 'upstr/preview' into iss#5678

09844ff

Another try to merge BreakingChangeIssue.csv

bff5c71

Test fix and re-recording.

587988d

re-recorded Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebA…

2888be6

…ppBackupRestoreTests.TestGetWebAppBackup

Tests fixed and re-recorded.

162c621

Merge remote-tracking branch 'upstream/preview' into iss#5678

c3c2251

Fix for Netcore build in websites update

05fc7f0

markcowl mentioned this pull request Apr 25, 2018

Merge branch 'websites-preview' into preview [iss #5678] #5967

Closed

8 tasks

azuresdkci added the needs-review label Apr 25, 2018

maddieclayton suggested changes Apr 25, 2018

View reviewed changes

maddieclayton assigned markcowl Apr 25, 2018

maddieclayton added needs-revision and removed needs-review labels Apr 25, 2018

Responding to review feedback on websites changes

848cf83

maddieclayton suggested changes Apr 25, 2018

View reviewed changes

Responding to review feedback

acd5331

maddieclayton approved these changes Apr 25, 2018

View reviewed changes

maddieclayton added Waiting for On Demand and removed needs-revision labels Apr 25, 2018

maddieclayton unassigned markcowl Apr 25, 2018

maddieclayton merged commit 47b26ee into Azure:release-6.0.0 Apr 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge websites-preview branch for BUILD #6046

Merge websites-preview branch for BUILD #6046

Uh oh!

markcowl commented Apr 25, 2018 •

edited

Loading

Uh oh!

markcowl commented Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

markcowl Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

markcowl Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton Apr 25, 2018

Uh oh!

maddieclayton commented Apr 25, 2018

Uh oh!

Uh oh!

Merge websites-preview branch for BUILD #6046

Merge websites-preview branch for BUILD #6046

Uh oh!

Conversation

markcowl commented Apr 25, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

markcowl commented Apr 25, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

maddieclayton commented Apr 25, 2018

Uh oh!

Uh oh!

markcowl commented Apr 25, 2018 •

edited

Loading