Merge pull request #575 from Azure/dev

huangpf · web-flow · commit 27b092c42d3a · 2016-07-14T05:02:37.000Z
huangpf PR: dev &lt;- Azure:dev
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/NewAzureResourceLockCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/NewAzureResourceLockCmdlet.cs
@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// The new azure resource lock cmdlet.
     /// </summary>
-    [Cmdlet(VerbsCommon.New, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.SubscriptionResourceLevelLock), OutputType(typeof(PSObject))]
+    [Cmdlet(VerbsCommon.New, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.ScopeLevelLock), OutputType(typeof(PSObject))]
     public class NewAzureResourceLockCmdlet : ResourceLockManagementCmdletBase
     {
         /// <summary>
diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/SetAzureResourceLockCmdlet.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/SetAzureResourceLockCmdlet.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// The set resource lock cmdlet.
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.SubscriptionResourceLevelLock), OutputType(typeof(PSObject))]
+    [Cmdlet(VerbsCommon.Set, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.ScopeLevelLock), OutputType(typeof(PSObject))]
     public class SetAzureResourceLockCmdlet : NewAzureResourceLockCmdlet
     {
         /// <summary>
diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj
@@ -135,7 +135,7 @@
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.ServiceBus, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ServiceBus.0.18.0-preview\lib\net40\Microsoft.WindowsAzure.Management.ServiceBus.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ServiceBus.0.19.0-preview\lib\net40\Microsoft.WindowsAzure.Management.ServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
diff --git a/src/ServiceManagement/Services/Commands/packages.config b/src/ServiceManagement/Services/Commands/packages.config
@@ -19,7 +19,7 @@
   <package id="Microsoft.WindowsAzure.Management.MediaServices" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Network" version="7.1.3" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Scheduler" version="6.0.0" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management.ServiceBus" version="0.18.0-preview" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.ServiceBus" version="0.19.0-preview" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Store" version="0.15.0-preview" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.TrafficManager" version="0.16.0-preview" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// The new azure resource lock cmdlet.`
`24`	`24`	`/// </summary>`
`25`		`- [Cmdlet(VerbsCommon.New, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.SubscriptionResourceLevelLock), OutputType(typeof(PSObject))]`
	`25`	`+ [Cmdlet(VerbsCommon.New, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.ScopeLevelLock), OutputType(typeof(PSObject))]`
`26`	`26`	`public class NewAzureResourceLockCmdlet : ResourceLockManagementCmdletBase`
`27`	`27`	`{`
`28`	`28`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`19`	`19`	`/// <summary>`
`20`	`20`	`/// The set resource lock cmdlet.`
`21`	`21`	`/// </summary>`
`22`		`- [Cmdlet(VerbsCommon.Set, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.SubscriptionResourceLevelLock), OutputType(typeof(PSObject))]`
	`22`	`+ [Cmdlet(VerbsCommon.Set, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.ScopeLevelLock), OutputType(typeof(PSObject))]`
`23`	`23`	`public class SetAzureResourceLockCmdlet : NewAzureResourceLockCmdlet`
`24`	`24`	`{`
`25`	`25`	`/// <summary>`