Skip to content

Dev #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangpf merged 5 commits into from
Dec 10, 2015
Merged

Dev #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d6323f
Adding subnet name as a parameter for updating a collection
arcadiahlyy Dec 7, 2015
6d1ab3b
Add subnet name as a parameter for patching a collection.
arcadiahlyy Dec 8, 2015
abceb35
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
arcadiahlyy Dec 8, 2015
df0dc13
Merge pull request #1444 from arcadiahlyy/dev
yadavbdev Dec 10, 2015
a518720
Merge pull request #238 from Azure/dev
huangpf Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.3\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<package id="Microsoft.Rest.ClientRuntime" version="1.4.1" targetFramework="net45" />
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.3" targetFramework="net45" />
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="xunit" version="1.9.2" targetFramework="net45" />
Expand Down
9 changes: 8 additions & 1 deletion ...rviceManagement/RemoteApp/Commands.RemoteApp/Collection/UpdateAzureRemoteAppCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ public class UpdateAzureRemoteAppCollection : RdsCmdlet
)]
public string ImageName { get; set; }

[Parameter(Mandatory = false,
ValueFromPipelineByPropertyName = true,
HelpMessage = "Name of the subnet to move the collection into."
)]
public string SubnetName { get; set; }

[Parameter(Mandatory = false,
HelpMessage = "Log off users immediately after the update has successfully completed")]
public SwitchParameter ForceLogoffWhenUpdateComplete { get; set; }
Expand All @@ -57,7 +63,8 @@ public override void ExecuteCmdlet()
details = new CollectionUpdateDetails()
{
TemplateImageName = ImageName,
WaitBeforeShutdownInMinutes = ForceLogoffWhenUpdateComplete ? -1 : 0
WaitBeforeShutdownInMinutes = ForceLogoffWhenUpdateComplete ? -1 : 0,
SubnetName = string.IsNullOrEmpty(SubnetName) ? null : SubnetName
};

if (ShouldProcess(CollectionName, Commands_RemoteApp.UpdateCollection))
Expand Down
5 changes: 3 additions & 2 deletions src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@
<Reference Include="Microsoft.WindowsAzure.Management.Network">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.4\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.3\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
Expand Down
20 changes: 20 additions & 0 deletions ...ement/RemoteApp/Commands.RemoteApp/Microsoft.WindowsAzure.Commands.RemoteApp.dll-help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5993,6 +5993,13 @@ TrackingId
</maml:description>
<command:parameterValue required="true" variableLength="false">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
<maml:name>SubnetName</maml:name>
<maml:description>
<maml:para>Name of subnet to move the collection into.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
<maml:name>ForceLogoffWhenUpdateComplete</maml:name>
<maml:description>
Expand Down Expand Up @@ -6054,6 +6061,19 @@ TrackingId
<dev:defaultValue>
</dev:defaultValue>
</command:parameter>
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="3">
<maml:name>SubnetName</maml:name>
<maml:description>
<maml:para>Name of the subnet to move the collection into.</maml:para>
</maml:description>
<command:parameterValue required="false" variableLength="false">string</command:parameterValue>
<dev:type>
<maml:name>string</maml:name>
<maml:uri />
</dev:type>
<dev:defaultValue>
</dev:defaultValue>
</command:parameter>
<command:parameter required="false" variableLength="true" globbing="false" pipelineInput="false" position="named">
<maml:name>Confirm</maml:name>
<maml:description>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Network" version="7.0.4" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.3" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
Expand Down