[6.1.1] Merge release --> master #6324

cormacpayne · 2018-05-29T16:34:15Z

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

…icy set on Gateway. and fix build merge errors.

…nto preview1

Moved the Websites dependency of LogicApp into commons

…nto dependency_logicapp

…nto preview1

…nto dependency_logicapp

…colconfig Update test for test-ConnectivityTroubleshoot

Fix local build issues because of a netcore sln file introduced accidentally

* Fix for #535 Dependency fixes for ServiceFabric in this commit * Add signing stuff and netcode projects to fix netcore build. * Added exception for breaking changes * Update all the sln projects with the newest Keyvault common project * Took care of Cormac's comments * Fix bad merge * Fix breaking build as oer comments from Cormac * Fix file name * Fix sln files for new dependencies * Fix netcore csproj * Fic netcode proj for storage.management * Fix dependency paths and project names * Fix assembly name in assembluInfo * Fix KEyVault guid * Add csproj fils for the new common modules to profile * Fix names of csproj files * Netcore projects are case sensitive, and when i changed Keyvault to KeyVault, none of the folder names or file names reflected the change in git... git still sees them as Keyvault * Fix caseing in one more netcore project * Fix casing on the namespace... * Fix the folder name mixup. Step 1 of 2 * Fix the foldername mixup, Step 2 of 2 * Fix project references to point to the correct location * Fix namespace casing in test projet * Fix bad merge * Fix mad merge * Fix project dependencies * As poer feedback, add 2018_04_01 version for compute * Update sevice fabric dependency on the common compute code * Suppress warnings about passwords in generated code. * Credscan can not hanndle secrets in comments.. just removing the offending comments * Fix tests to be able to record them and other small changes * Fix bad merge * Remove UTF8 BOM encoding from file * Fix bad merge in profile psd1 file * Took care of Maddie's comment * iFix assembly name in profile csproj * Add common projects to the stack solution as well

…ueJobCommand (#6196) * 5545 - Set Auth to value from PSServiceBusAuthenticationParams * Change log updates

Fix AKS doc

…te-new-sp # Conflicts: # src/Stack.sln

* Fix issue with Properties property of PSResource * Add test coverage for Properties property

Update AzureRM.psm1

Add-AzureApplicationGatewayRequestRoutingRule <-- incorrect Add-AzureRmApplicationGatewayRequestRoutingRule <--corrected command

$ AppGw is not a valid powershell variable $AppGw has been proposed instead

Get-AzureRmApplicationGatewayFrontendIPort is no a valid command Get-AzureRmApplicationGatewayFrontendPort proposed as the corrected powershell command

The example and description's slot names should match.

adding right powershell command

removing adding space causing powershell error in example

Typo in powershell command

* Merged RecoveryServices.Backup code in to RecoveryServices * Updating change log * Adding ignored file * Updating test targets and mappings * Moving changelog and documentation files of RS and RS.Backup to their respective module folders

Remove-AzureRmWebAppSlot - Fixes inconsistent slot names

…K for GA (#6271) * Initial migration commit * Move ManagementGroups to AzureRM.Resources * Update powershell to use the latest SDK and API, minor changes to responses and help files * Add installer file * Revert "Add installer file" This reverts commit 0d9b92c. * Update tests and run tests again * Update Help * Update helpfiles * more changes to help files * Changes to Netcore.psd1 * Changes to Netcore.csproj * Update help file * Regenerate all help files * Move help files to AzureRM.Resource help files * Update package version * Update local feed and rerun tests * Remove local feed

Revert default role assignment for New-AzureRmADServicePrincipal

Nilambari and others added 30 commits April 9, 2018 12:00

#1443089: New Powershell commandlets for feature:P2S Ipsec custom pol…

83c4ac9

…icy set on Gateway. and fix build merge errors.

#1443089: Fix build merge errors

9e31a3f

#1443089: Update change log

28d982e

#1443089: Fix build merge conflicts

3dc3dbf

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

bef682b

…nto preview1

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

929bb90

…nto preview1

fix in AzureRM.Network.psd1

0fba59b

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

7a6117d

…nto preview1

Fix for issue #5365

105eefa

Moved the Websites dependency of LogicApp into commons

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

2038a1f

…nto dependency_logicapp

Add websites dll to required assemblies part of Profile

dadb6a6

Fic sln files to include the dependencies

5770c13

Fic dependency paths and projects

648c96a

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

cf94f8e

…nto dependency_logicapp

Fix Build merge conflicts

0d6d129

Fix dll name

62a4097

Add/update help files for PS command lets

7167152

Incorporate code review comments

889886f

Add csproj files for the new common module to Profile

b101bb1

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

c21e488

…nto dependency_logicapp

Fix build

a59eb58

Fix dll name (WebSites -> Websites) in the pofile psd1

bb7d887

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

20de82c

…nto preview1

Record failing tests

2c9d4a7

Merge branch 'preview' of https://github.com/Azure/azure-powershell i…

04a31ab

…nto dependency_logicapp

Merge branch 'preview' into dependency_logicapp

71b8478

Merge branch 'preview' into dependency_logicapp

3f8dca5

#Fix merge conflicts

3350cef

[Maps] Rename folders and files from LocationBasedServices

a8a4744

[Maps] Rename help file names

1fda5d6

cormacpayne and others added 24 commits May 23, 2018 15:45

Merge pull request #6286 from junyezhu/juliet/feat/updatetestforproto…

4feb4a2

…colconfig Update test for test-ConnectivityTroubleshoot

Merge pull request #6285 from praries880/dependency_logicapp

a854558

Fix local build issues because of a netcore sln file introduced accidentally

Fix Issue 5545 - Set Auth Values on UpdateAzureSchedulerServiceBusQue…

02c0c66

…ueJobCommand (#6196) * 5545 - Set Auth to value from PSServiceBusAuthenticationParams * Change log updates

Merge pull request #6288 from maddieclayton/aksdoc

de13e78

Fix AKS doc

Merge branch 'preview' of github.com:Azure/azure-powershell into upda…

a7b2839

…te-new-sp # Conflicts: # src/Stack.sln

Update versions for release of AzureRM.Resources

215888e

Fix issue with Properties property of PSResource (#6218)

06925b7

* Fix issue with Properties property of PSResource * Add test coverage for Properties property

Release Maps (#6287)

c1de8ef

Update VMSS VM feature (#6170)

8c83c74

Add test coverage for no role assignment in default SP creation scenario

25fb72a

Update AzureRM.psm1

2009d39

Merge pull request #6296 from Azure/fix-azurerm-psm1

05b1bbf

Update AzureRM.psm1

adding right powershell command

cc3e3cc

Add-AzureApplicationGatewayRequestRoutingRule <-- incorrect Add-AzureRmApplicationGatewayRequestRoutingRule <--corrected command

removing adding space causing powershell error in example

aa17403

$ AppGw is not a valid powershell variable $AppGw has been proposed instead

Typo in powershell command

0a1b2a2

Get-AzureRmApplicationGatewayFrontendIPort is no a valid command Get-AzureRmApplicationGatewayFrontendPort proposed as the corrected powershell command

Fixes inconsistent slot name in example

59401d3

The example and description's slot names should match.

Merge pull request #6303 from Azure/chunsiongtan-patch-1

3be330b

adding right powershell command

Merge pull request #6304 from Azure/chunsiongtan-patch-2

d24ef28

removing adding space causing powershell error in example

Merge pull request #6305 from Azure/chunsiongtan-patch-3

2ca14a3

Typo in powershell command

Merge pull request #6306 from cornem/patch-1

1ac17f6

Remove-AzureRmWebAppSlot - Fixes inconsistent slot names

Merge pull request #6272 from cormacpayne/update-new-sp

33da488

Revert default role assignment for New-AzureRmADServicePrincipal

azuresdkci added the needs-review label May 29, 2018

maddieclayton approved these changes May 29, 2018

View reviewed changes

cormacpayne added Waiting for CI and removed needs-review labels May 29, 2018

maddieclayton merged commit 34d8f7b into master May 29, 2018

maddieclayton deleted the release-6.1.1 branch May 30, 2018 18:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[6.1.1] Merge release --> master #6324

[6.1.1] Merge release --> master #6324

Uh oh!

cormacpayne commented May 29, 2018 •

edited

Loading

Uh oh!

Uh oh!

[6.1.1] Merge release --> master #6324

[6.1.1] Merge release --> master #6324

Uh oh!

Conversation

cormacpayne commented May 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

Uh oh!

cormacpayne commented May 29, 2018 •

edited

Loading