Merge pull request #514 from Azure/dev

HPF PR: dev <- Azure:dev

Author: huangpf

src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

@@ -149,6 +149,7 @@
     <Compile Include="Interfaces\IClientFactory.cs" />
     <Compile Include="Interfaces\IDataStore.cs" />
     <Compile Include="Interfaces\IProfileSerializer.cs" />
+    <Compile Include="LegacySupport.cs" />
     <Compile Include="Models\AzureAccount.cs" />
     <Compile Include="Models\AzureAccount.Methods.cs" />
     <Compile Include="Models\AzureContext.cs" />

src/Common/Commands.Common.Authentication/LegacySupport.cs

@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Common.Authentication;
+
+namespace Microsoft.Azure.Common.Authentication
+{
+    /// <summary>
+    /// Provide backward compatibility for setting User Agent values
+    /// </summary>
+    public static class AzureSession
+    {
+        /// <summary>
+        /// The ClientFactory used to produce management clients in this session
+        /// </summary>
+        public static IClientFactory ClientFactory
+        {
+            get { return Commands.Common.Authentication.AzureSession.ClientFactory; }
+        }
+    }
+}

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/RemoveAzureResourceLockCmdlet.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// The remove azure resource lock cmdlet.
     /// </summary>
-    [Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true), OutputType(typeof(PSObject))]
+    [Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.LockIdParameterSet), OutputType(typeof(PSObject))]
     public class RemoveAzureResourceLockCmdlet : ResourceLockManagementCmdletBase 
     {
         /// <summary>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll-Help.xml

@@ -4861,17 +4861,26 @@
     </maml:alertSet>
     <command:examples>
       <command:example>
-        <maml:title>--------------------------  RemoveLock1  --------------------------</maml:title>
+        <maml:title>-------------------------- Example 1: RemoveLock using ResourceId  --------------------------</maml:title>
         <maml:introduction>
-          <maml:paragraph>PS C:\&gt;</maml:paragraph>
         </maml:introduction>
         <dev:code>Remove-AzureRmResourceLock -ResourceId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
         <dev:remarks>
-          <maml:para />
-          <maml:para />
-          <maml:para />
-          <maml:para>
-          </maml:para>
+        </dev:remarks>
+        <command:commandLines>
+          <command:commandLine>
+            <command:commandText>
+              <maml:para />
+            </command:commandText>
+          </command:commandLine>
+        </command:commandLines>
+      </command:example>
+          <command:example>
+        <maml:title>-------------------------- Example 2: RemoveLock using LockId  --------------------------</maml:title>
+        <maml:introduction>
+        </maml:introduction>
+        <dev:code>Remove-AzureRmResourceLock -LockId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
+        <dev:remarks>
         </dev:remarks>
         <command:commandLines>
           <command:commandLine>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceLockTests.ps1

@@ -41,4 +41,8 @@ function Test-ResourceLockCRUD
 	$removed = Remove-AzureRMResourceLock -LockId $expectedSet.LockId -Force
 	Assert-AreEqual True $removed
 
+	$actual = New-AzureRMResourceLock -LockName $rname -LockLevel CanNotDelete -Force -Scope $rg.ResourceId
+	$removed = Remove-AzureRMResourceLock -ResourceId $actual.ResourceId -Force
+	Assert-AreEqual True $removed
+
 }