Skip to content

Commit 7352114

Browse files
ogailogail
committed
Merge pull request Azure#35 from AzureRT/dev
AzureRT S42 PR #2
2 parents 723176f + d5051ca commit 7352114

File tree

28 files changed

+103
-36
lines changed

28 files changed

+103
-36
lines changed

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</Reference>
105105
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106106
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110110
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
17-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
17+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1919
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2020
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</Reference>
9494
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9595
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
96+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
9797
</Reference>
9898
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9999
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
17-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
17+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.0.1-prerelease" targetFramework="net45" />
2020
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</Reference>
9898
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9999
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
100+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1717
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1818
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</Reference>
9898
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9999
<SpecificVersion>False</SpecificVersion>
100-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
100+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
101101
</Reference>
102102
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103103
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management.Network" version="4.1.0" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</Reference>
100100
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101101
<SpecificVersion>False</SpecificVersion>
102-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
102+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
103103
</Reference>
104104
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105105
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMSqlServerExtensionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void TestCleanUp()
5858
}
5959

6060

61-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set,Remove)-AzureVMSqlServerExtension)")]
61+
[TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set,Remove)-AzureVMSqlServerExtension)")]
6262
public void GetAzureVMSqlServerExtensionTest()
6363
{
6464
try
@@ -97,7 +97,7 @@ public void GetAzureVMSqlServerExtensionTest()
9797
}
9898
}
9999

100-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
100+
[TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
101101
public void UpdateVMWithSqlServerExtensionTest()
102102
{
103103
try
@@ -130,7 +130,7 @@ public void UpdateVMWithSqlServerExtensionTest()
130130
}
131131
}
132132

133-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
133+
[TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
134134
public void AddRoleWithSqlServerExtensionTest()
135135
{
136136
try
@@ -161,7 +161,7 @@ public void AddRoleWithSqlServerExtensionTest()
161161
}
162162

163163

164-
[TestMethod(), TestCategory(Category.Sequential), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
164+
[TestMethod(), TestCategory("Scenario"), TestProperty("Feature", "IAAS"), Priority(0), Owner("seths"), Description("Test the cmdlet ((Get,Set)-AzureVMSqlServerExtension)")]
165165
public void UpdateRoleWithSqlServerExtensionTest()
166166
{
167167
try

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTestCommonVhd.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,14 @@ public void AzureVMImageTest()
148148

149149
string oldLabel = "old label";
150150
string newLabel = "new label";
151+
string vmSize = "Small";
152+
var iconUri = "http://www.bing.com";
153+
var smallIconUri = "http://www.bing.com";
154+
bool showInGui = true;
151155

152156
try
153157
{
154-
OSImageContext result = vmPowershellCmdlets.AddAzureVMImage(newImageName, mediaLocation, OS.Windows, oldLabel);
158+
OSImageContext result = vmPowershellCmdlets.AddAzureVMImage(newImageName, mediaLocation, OS.Windows, oldLabel, vmSize, iconUri, smallIconUri, showInGui);
155159

156160
OSImageContext resultReturned = vmPowershellCmdlets.GetAzureVMImage(newImageName)[0];
157161
Assert.IsTrue(!string.IsNullOrEmpty(resultReturned.IOType));

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/AddAzureVMImageCmdletInfo.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,25 @@ public AddAzureVMImageCmdletInfo(string imageName, string mediaLocation, OS os,
4343
}
4444
}
4545

46+
public AddAzureVMImageCmdletInfo(string imageName, string mediaLocation, OS os, string label, string recommendedSize, string iconUri, string smallIconUri, bool showInGui)
47+
: this(imageName, mediaLocation, os, label, recommendedSize)
48+
{
49+
if (!string.IsNullOrEmpty(iconUri))
50+
{
51+
cmdletParams.Add(new CmdletParam("IconUri", iconUri));
52+
}
53+
54+
if (!string.IsNullOrEmpty(iconUri))
55+
{
56+
cmdletParams.Add(new CmdletParam("SmallIconUri", smallIconUri));
57+
}
58+
59+
if (showInGui)
60+
{
61+
cmdletParams.Add(new CmdletParam("ShowInGui"));
62+
}
63+
}
64+
4665
public AddAzureVMImageCmdletInfo(
4766
string imageName,
4867
string mediaLocation,

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,31 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
5555

5656
public class ServiceManagementCmdletTestHelper
5757
{
58+
private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false, bool retryOnConflict = true)
59+
{
60+
var result = default(T);
61+
if (retryOnConflict)
62+
{
63+
Utilities.RetryActionUntilSuccess(
64+
() => result = RunPSCmdletAndReturnFirstHelper<T>(cmdlet),
65+
"ConflictError", 3, 60);
66+
}
67+
else
68+
{
69+
result = RunPSCmdletAndReturnFirstHelper<T>(cmdlet);
70+
}
71+
return result;
72+
73+
}
74+
5875
/// <summary>
5976
/// Run a powershell cmdlet that returns the first PSObject as a return value.
6077
/// </summary>
6178
/// <typeparam name="T"></typeparam>
6279
/// <param name="cmdlet"></param>
6380
/// <param name="debug"></param>
6481
/// <returns></returns>
65-
private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
82+
private T RunPSCmdletAndReturnFirstHelper<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
6683
{
6784
var azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(cmdlet);
6885
Collection<PSObject> result = azurePowershellCmdlet.Run(debug);
@@ -91,14 +108,31 @@ private T RunPSCmdletAndReturnFirst<T>(PowershellCore.CmdletsInfo cmdlet, bool d
91108
return default(T);
92109
}
93110

111+
private Collection<T> RunPSCmdletAndReturnAll<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false, bool retryOnConflict = true)
112+
{
113+
var result = new Collection<T>();
114+
if (retryOnConflict)
115+
{
116+
Utilities.RetryActionUntilSuccess(
117+
() => result = RunPSCmdletAndReturnAllHelper<T>(cmdlet),
118+
"ConflictError", 3, 60);
119+
}
120+
else
121+
{
122+
result = RunPSCmdletAndReturnAllHelper<T>(cmdlet);
123+
}
124+
return result;
125+
}
126+
127+
94128
/// <summary>
95129
/// Run a powershell cmdlet that returns a collection of PSObjects as a return value.
96130
/// </summary>
97131
/// <typeparam name="T"></typeparam>
98132
/// <param name="cmdlet"></param>
99133
/// <param name="debug"></param>
100134
/// <returns></returns>
101-
private Collection<T> RunPSCmdletAndReturnAll<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
135+
private Collection<T> RunPSCmdletAndReturnAllHelper<T>(PowershellCore.CmdletsInfo cmdlet, bool debug = false)
102136
{
103137
var azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(cmdlet);
104138
Collection<PSObject> result = azurePowershellCmdlet.Run(debug);
@@ -1314,21 +1348,19 @@ public SM.PersistentVMRoleContext ExportAzureVM(string vmName, string serviceNam
13141348
public ManagementOperationContext UpdateAzureVM(string vmName, string serviceName, SM.PersistentVM persistentVM)
13151349
{
13161350
ManagementOperationContext result = new ManagementOperationContext();
1317-
Utilities.RetryActionUntilSuccess(
1318-
() => result = RunPSCmdletAndReturnFirst<ManagementOperationContext>(new UpdateAzureVMCmdletInfo(vmName, serviceName, persistentVM)),
1319-
"409", 3, 60);
1351+
result = RunPSCmdletAndReturnFirst<ManagementOperationContext>(new UpdateAzureVMCmdletInfo(vmName, serviceName, persistentVM));
13201352
return result;
13211353
}
13221354

13231355
#endregion
13241356

13251357
#region AzureVMImage
13261358

1327-
public SM.OSImageContext AddAzureVMImage(string imageName, string mediaLocation, OS os, string label = null, string recommendedSize = null)
1359+
public SM.OSImageContext AddAzureVMImage(string imageName, string mediaLocation, OS os, string label = null, string recommendedSize = null, string iconUri = null, string smallIconUri = null, bool showInGui = false)
13281360
{
13291361
SM.OSImageContext result = new SM.OSImageContext();
13301362
Utilities.RetryActionUntilSuccess(
1331-
() => result = RunPSCmdletAndReturnFirst<SM.OSImageContext>(new AddAzureVMImageCmdletInfo(imageName, mediaLocation, os, label, recommendedSize)),
1363+
() => result = RunPSCmdletAndReturnFirst<SM.OSImageContext>(new AddAzureVMImageCmdletInfo(imageName, mediaLocation, os, label, recommendedSize, iconUri, smallIconUri, showInGui)),
13321364
"409", 3, 60);
13331365
return result;
13341366
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ public static void RetryActionUntilSuccess(Action act, string errorMessage, int
586586
}
587587
catch (Exception e)
588588
{
589-
if (e.ToString().Contains(errorMessage))
589+
if (e.ToString().Contains(errorMessage) || (e.InnerException != null && e.InnerException.ToString().Contains(errorMessage)))
590590
{
591591
Console.WriteLine("{0} error occurs! retrying ...", errorMessage);
592592
if (e.InnerException != null)

‎src/ServiceManagement/Compute/Commands.ServiceManagement.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.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
16-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
16+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management.Network" version="4.1.0" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1919
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</Reference>
100100
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101101
<SpecificVersion>False</SpecificVersion>
102-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
102+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
103103
</Reference>
104104
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105105
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/AddAzureVMImage.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ public class AddAzureVMImage : ServiceManagementBaseCmdlet
6565
[Parameter(Position = 9, ValueFromPipelineByPropertyName = true, HelpMessage = " Specifies the size to use for the virtual machine that is created from the OS image.")]
6666
public string RecommendedVMSize { get; set; }
6767

68+
[Parameter(Position = 10, ValueFromPipelineByPropertyName = true, HelpMessage = "Icon Uri.")]
69+
public Uri IconUri { get; set; }
70+
71+
[Parameter(Position = 11, ValueFromPipelineByPropertyName = true, HelpMessage = "Small Icon Uri.")]
72+
public Uri SmallIconUri { get; set; }
73+
74+
[Parameter(Position = 12, ValueFromPipelineByPropertyName = true, HelpMessage = "To show in GUI.")]
75+
public SwitchParameter ShowInGui { get; set; }
76+
6877
public void ExecuteCommand()
6978
{
7079
var imageType = new VirtualMachineImageHelper(this.ComputeClient).GetImageType(this.ImageName);
@@ -94,7 +103,10 @@ public void ExecuteCommand()
94103
ImageFamily = this.ImageFamily,
95104
PublishedDate = this.PublishedDate,
96105
PrivacyUri = this.PrivacyUri,
97-
RecommendedVMSize = this.RecommendedVMSize
106+
RecommendedVMSize = this.RecommendedVMSize,
107+
IconUri = this.IconUri,
108+
SmallIconUri = this.SmallIconUri,
109+
ShowInGui = this.ShowInGui
98110
};
99111

100112
this.ExecuteClientActionNewSM(

‎src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management" version="2.1.0" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.0.0" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management.Compute" version="6.1.2" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management.Network" version="4.1.0" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

0 commit comments

Comments
 (0)