Skip to content

Commit df0dc13

Browse files
committed
Merge pull request Azure#1444 from arcadiahlyy/dev
Adding subnet name as a parameter for updating a collection
2 parents 2156f2c + abceb35 commit df0dc13

File tree

6 files changed

+34
-6
lines changed

6 files changed

+34
-6
lines changed

src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
146146
</Reference>
147147
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
148-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
148+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.3\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
149149
</Reference>
150150
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
151151
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="Microsoft.Rest.ClientRuntime" version="1.4.1" targetFramework="net45" />
1414
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
16-
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
16+
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.3" targetFramework="net45" />
1717
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1919
<package id="xunit" version="1.9.2" targetFramework="net45" />

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/UpdateAzureRemoteAppCollection.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ public class UpdateAzureRemoteAppCollection : RdsCmdlet
3838
)]
3939
public string ImageName { get; set; }
4040

41+
[Parameter(Mandatory = false,
42+
ValueFromPipelineByPropertyName = true,
43+
HelpMessage = "Name of the subnet to move the collection into."
44+
)]
45+
public string SubnetName { get; set; }
46+
4147
[Parameter(Mandatory = false,
4248
HelpMessage = "Log off users immediately after the update has successfully completed")]
4349
public SwitchParameter ForceLogoffWhenUpdateComplete { get; set; }
@@ -57,7 +63,8 @@ public override void ExecuteCmdlet()
5763
details = new CollectionUpdateDetails()
5864
{
5965
TemplateImageName = ImageName,
60-
WaitBeforeShutdownInMinutes = ForceLogoffWhenUpdateComplete ? -1 : 0
66+
WaitBeforeShutdownInMinutes = ForceLogoffWhenUpdateComplete ? -1 : 0,
67+
SubnetName = string.IsNullOrEmpty(SubnetName) ? null : SubnetName
6168
};
6269

6370
if (ShouldProcess(CollectionName, Commands_RemoteApp.UpdateCollection))

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@
120120
<Reference Include="Microsoft.WindowsAzure.Management.Network">
121121
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
122122
</Reference>
123-
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
124-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
123+
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124+
<SpecificVersion>False</SpecificVersion>
125+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.3\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
125126
</Reference>
126127
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
127128
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Microsoft.WindowsAzure.Commands.RemoteApp.dll-help.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5993,6 +5993,13 @@ TrackingId
59935993
</maml:description>
59945994
<command:parameterValue required="true" variableLength="false">string</command:parameterValue>
59955995
</command:parameter>
5996+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
5997+
<maml:name>SubnetName</maml:name>
5998+
<maml:description>
5999+
<maml:para>Name of subnet to move the collection into.</maml:para>
6000+
</maml:description>
6001+
<command:parameterValue required="false" variableLength="false">string</command:parameterValue>
6002+
</command:parameter>
59966003
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
59976004
<maml:name>ForceLogoffWhenUpdateComplete</maml:name>
59986005
<maml:description>
@@ -6054,6 +6061,19 @@ TrackingId
60546061
<dev:defaultValue>
60556062
</dev:defaultValue>
60566063
</command:parameter>
6064+
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
6065+
<maml:name>SubnetName</maml:name>
6066+
<maml:description>
6067+
<maml:para>Name of the subnet to move the collection into.</maml:para>
6068+
</maml:description>
6069+
<command:parameterValue required="false" variableLength="false">string</command:parameterValue>
6070+
<dev:type>
6071+
<maml:name>string</maml:name>
6072+
<maml:uri />
6073+
</dev:type>
6074+
<dev:defaultValue>
6075+
</dev:defaultValue>
6076+
</command:parameter>
60576077
<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="false" position="named">
60586078
<maml:name>Confirm</maml:name>
60596079
<maml:description>

src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.4" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.3" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

0 commit comments

Comments
 (0)