Skip to content

Commit e9807c1

Browse files
author
Avijit Gupta
committed
Merge branch 'ignite' of https://github.com/Azure/azure-powershell-pr into ignite
2 parents 6e1a2ee + e0044d8 commit e9807c1

File tree

78 files changed

+10890
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+10890
-26
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,62 @@
77
<Component Id="cmp96F13C307DA6E4AAC35F3D147F21553F" Guid="*">
88
<File Id="fil96C82365E5F5A2F2747805236B563DF0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureResourceManager.psd1" />
99
</Component>
10+
<Directory Id="dir7FBB567B67962EF87B803F2D40A1C91D" Name="Automation">
11+
<Component Id="cmpCBE516C3EB8B0C94FD1B235D0806CC33" Guid="*">
12+
<File Id="fil0DD0F16890E95B85B2B03CBB03E6CF07" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Hyak.Common.dll" />
13+
</Component>
14+
<Component Id="cmp68BDEE6A58AAA5F726580770E9601A3D" Guid="*">
15+
<File Id="fil5C98DD8F02F6AD1FA2DAB0082AF93CD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll" />
16+
</Component>
17+
<Component Id="cmpAED5C5457E91FCFC34AB7C4734D3E8E0" Guid="*">
18+
<File Id="fil1AD0E938948206F4BFB4C07C8A7BC5ED" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Commands.Automation.dll-help.xml" />
19+
</Component>
20+
<Component Id="cmp43D0BBEF842D51EF47A01BB491C5FE91" Guid="*">
21+
<File Id="filCD14219FE6648B06D2ED55AA4D03D139" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Common.Authentication.dll" />
22+
</Component>
23+
<Component Id="cmp121FE264F0774940E8B7D4B8454AA11A" Guid="*">
24+
<File Id="filC976148702FB7521F6EA3F8B98DA5E05" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Common.dll" />
25+
</Component>
26+
<Component Id="cmp8880FFE618D68E10E47597CBF47E2761" Guid="*">
27+
<File Id="fil0F7BABA4374AD2ED24F931AC6D83F84E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Common.NetFramework.dll" />
28+
</Component>
29+
<Component Id="cmp0620AB9CA072695357C29E3BA7EE196D" Guid="*">
30+
<File Id="filBF3AA5408BBA44BD18F731CBA047EFD3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.Management.Automation.dll" />
31+
</Component>
32+
<Component Id="cmp4EB15DA2D54E2EF37C07373154FBFA4E" Guid="*">
33+
<File Id="fil96A589521F9AD31A5B522AB192A481AE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Azure.ResourceManager.dll" />
34+
</Component>
35+
<Component Id="cmpD178B2E6669B7AC31A7E244BBD03808F" Guid="*">
36+
<File Id="filC51013D94F011020DAE5CCB7C83F81FE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
37+
</Component>
38+
<Component Id="cmp457EC024C533597346108E59A9C5440E" Guid="*">
39+
<File Id="filDC060C33616AC9E7436E4981971DF06F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
40+
</Component>
41+
<Component Id="cmp0A14ADA01E08BAE6F49F03E6840D7059" Guid="*">
42+
<File Id="filD9C4CE5D7F7E899000FAEB4AFA5DD6D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Threading.Tasks.dll" />
43+
</Component>
44+
<Component Id="cmp5444417E80E807FE2D0F623C1753952B" Guid="*">
45+
<File Id="fil7C78AB9FE620F1F000A8E807DE24D1C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
46+
</Component>
47+
<Component Id="cmp14180170F6BCBFC2F74231297CA8C0A9" Guid="*">
48+
<File Id="fil9A8F8F4AB771874AD01149B7048ADB1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.Threading.Tasks.Extensions.dll" />
49+
</Component>
50+
<Component Id="cmpBC9B7FD5B042A8A11F9D2ADF85A77D59" Guid="*">
51+
<File Id="fil705F6D62066DED992397301574B36E6B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Microsoft.WindowsAzure.Commands.Common.dll" />
52+
</Component>
53+
<Component Id="cmp6D75743A111FF22883E40817C0253AA1" Guid="*">
54+
<File Id="fil14213DE4C4ADAF75F73FE282DABA537D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\Newtonsoft.Json.dll" />
55+
</Component>
56+
<Component Id="cmp6DBF879ED21E537983293A8230D414C3" Guid="*">
57+
<File Id="filA4B09996A344DA8FDB04A3751945608F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\System.Net.Http.Extensions.dll" />
58+
</Component>
59+
<Component Id="cmp0EA7B1A75545315150C0D194E197D085" Guid="*">
60+
<File Id="fil2E7F090A2F9A8D48D9DCC4D3044F04D6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\System.Net.Http.Formatting.dll" />
61+
</Component>
62+
<Component Id="cmp47534337D86993B60F1616D43D3AE489" Guid="*">
63+
<File Id="filB7DFDD0ACAF2679C28F3AF1B6DC0A867" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Automation\System.Net.Http.Primitives.dll" />
64+
</Component>
65+
</Directory>
1066
<Directory Id="dir2BEEAACE1371947984B11E66ADCB80DD" Name="Batch">
1167
<Component Id="cmp7D23FBEE3847FF584460769B5AE3E319" Guid="*">
1268
<File Id="filDAA85018E0B209874BB796A169C0F372" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Batch\Hyak.Common.dll" />
@@ -2783,6 +2839,24 @@
27832839
<Fragment>
27842840
<ComponentGroup Id="azurecmdfiles">
27852841
<ComponentRef Id="cmp96F13C307DA6E4AAC35F3D147F21553F" />
2842+
<ComponentRef Id="cmpCBE516C3EB8B0C94FD1B235D0806CC33" />
2843+
<ComponentRef Id="cmp68BDEE6A58AAA5F726580770E9601A3D" />
2844+
<ComponentRef Id="cmpAED5C5457E91FCFC34AB7C4734D3E8E0" />
2845+
<ComponentRef Id="cmp43D0BBEF842D51EF47A01BB491C5FE91" />
2846+
<ComponentRef Id="cmp121FE264F0774940E8B7D4B8454AA11A" />
2847+
<ComponentRef Id="cmp8880FFE618D68E10E47597CBF47E2761" />
2848+
<ComponentRef Id="cmp0620AB9CA072695357C29E3BA7EE196D" />
2849+
<ComponentRef Id="cmp4EB15DA2D54E2EF37C07373154FBFA4E" />
2850+
<ComponentRef Id="cmpD178B2E6669B7AC31A7E244BBD03808F" />
2851+
<ComponentRef Id="cmp457EC024C533597346108E59A9C5440E" />
2852+
<ComponentRef Id="cmp0A14ADA01E08BAE6F49F03E6840D7059" />
2853+
<ComponentRef Id="cmp5444417E80E807FE2D0F623C1753952B" />
2854+
<ComponentRef Id="cmp14180170F6BCBFC2F74231297CA8C0A9" />
2855+
<ComponentRef Id="cmpBC9B7FD5B042A8A11F9D2ADF85A77D59" />
2856+
<ComponentRef Id="cmp6D75743A111FF22883E40817C0253AA1" />
2857+
<ComponentRef Id="cmp6DBF879ED21E537983293A8230D414C3" />
2858+
<ComponentRef Id="cmp0EA7B1A75545315150C0D194E197D085" />
2859+
<ComponentRef Id="cmp47534337D86993B60F1616D43D3AE489" />
27862860
<ComponentRef Id="cmp7D23FBEE3847FF584460769B5AE3E319" />
27872861
<ComponentRef Id="cmp0F050B6B9709FCF0F3A1624615831882" />
27882862
<ComponentRef Id="cmp8E2BA91A40B8D59412A2943485B811AE" />

‎src/AzurePowershell.sln

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "R
168168
EndProject
169169
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
170170
EndProject
171+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
172+
EndProject
171173
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}"
172174
EndProject
173175
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp", "ServiceManagement\RemoteApp\Commands.RemoteApp\Commands.RemoteApp.csproj", "{492D2AF2-950B-4F2E-8079-8794305313FD}"
@@ -420,6 +422,14 @@ Global
420422
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
421423
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
422424
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.Build.0 = Release|Any CPU
425+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
426+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
427+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
428+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.Build.0 = Release|Any CPU
429+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
430+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
431+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
432+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.Build.0 = Release|Any CPU
423433
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
424434
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
425435
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/ResourceManager.sln

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.21005.1
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -49,12 +49,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
5151
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}"
53+
EndProject
5254
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
5355
EndProject
5456
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{F4ABAD68-64A5-4B23-B09C-42559A7524DE}"
5557
EndProject
5658
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "ResourceManager\Insights\Commands.Insights.Test\Commands.Insights.Test.csproj", "{469F20E0-9D40-41AD-94C3-B47AD15A4C00}"
5759
EndProject
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
61+
EndProject
5862
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceManager\Dns\Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}"
5963
EndProject
6064
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
@@ -141,6 +145,10 @@ Global
141145
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
142146
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
143147
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
150+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
151+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.Build.0 = Release|Any CPU
144152
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145153
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
146154
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -153,6 +161,10 @@ Global
153161
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Debug|Any CPU.Build.0 = Debug|Any CPU
154162
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.ActiveCfg = Release|Any CPU
155163
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.Build.0 = Release|Any CPU
164+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
166+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
167+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.Build.0 = Release|Any CPU
156168
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157169
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
158170
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -174,6 +186,9 @@ Global
174186
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
175187
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
176188
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
189+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
190+
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
191+
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
177192
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
178193
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
179194
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}

0 commit comments

Comments
 (0)