Skip to content

Commit 5aef7d9

Browse files
azdevxpsazdevxps
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into ACtests
2 parents 786ffff + afe4928 commit 5aef7d9

File tree

2,107 files changed

+1146640
-316319
lines changed

Some content is hidden

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

2,107 files changed

+1146640
-316319
lines changed

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@
55
*.cs text eol=crlf
66
*.csproj text eol=crlf
77
*.ps1 text eol=crlf
8+
*.psd1 text eol=crlf
9+
*.psm1 text eol=crlf
10+
*.ps1xml text eol=crlf
811
build.proj text eol=crlf

‎README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ This repository contains a set of PowerShell cmdlets for developers and administ
88
* For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](https://aka.ms/azpsdocs).
99
* For suggesting improvements, join our improvement discussion ([Issue #3692](https://github.com/Azure/azure-powershell/issues/3692)).
1010

11+
## Modules
12+
13+
Below is a table containing the various Azure PowerShell rollup modules found in this repository. For a full list of modules found in this repository, please see the [Azure PowerShell Modules](documentation/azure-powershell-modules.md) page.
14+
15+
| Description | Module Name | PowerShell Gallery Link |
16+
| --------------------------------------------------------------- | ----------------- | ----------------------- |
17+
| Rollup Module for ARM Cmdlets | `AzureRM` | [![AzureRM](https://img.shields.io/powershellgallery/v/AzureRM.svg?style=flat-square&label=AzureRM)](https://www.powershellgallery.com/packages/AzureRM/) |
18+
| Rollup Module for .NET Core Cmdlets | `AzureRM.Netcore` | [![AzureRM.Netcore](https://img.shields.io/powershellgallery/v/AzureRM.Netcore.svg?style=flat-square&label=AzureRM.Netcore)](https://www.powershellgallery.com/packages/AzureRM.Netcore/) |
19+
| Rollup Module for Administrative Modules in Azure Stack | `AzureStack` | [![AzureStack](https://img.shields.io/powershellgallery/v/AzureStack.svg?style=flat-square&label=AzureStack)](https://www.powershellgallery.com/packages/AzureStack/) |
20+
| Rolledup Module for Service Management Cmdlets | `Azure` | [![Azure](https://img.shields.io/powershellgallery/v/Azure.svg?style=flat-square&label=Azure)](https://www.powershellgallery.com/packages/Azure/) |
21+
1122
## Features
1223

1324
* Account management

‎TestMappings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,8 @@
173173
],
174174
"src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/": [
175175
".\\src\\ResourceManager\\MarketplaceOrdering\\Commands.MarketplaceOrdering.Test\\bin\\Debug\\Microsoft.Azure.Commands.MarketplaceOrdering.Test.dll"
176-
]
176+
],
177+
"src/ResourceManager/ApplicationInsights/": [
178+
".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
179+
]
177180
}

‎documentation/azure-powershell-modules.md

Lines changed: 110 additions & 0 deletions
Large diffs are not rendered by default.

‎setup/azurecmd.wxs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<Icon Id="icon.ico" SourceFile="media\WAIcon.ico"/>
2525
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
2626
<Property Id="ALLUSERS" Value="1" />
27+
<Property Id="ISVSINSTALL" Secure="yes"/>
2728
<!-- per machine install-->
2829
<Property Id="PSCOMPATIBLEVERSION">
2930
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
@@ -51,7 +52,7 @@
5152
<Condition Message="This setup requires the .NET Framework 4.5.2 or higher to be installed.">
5253
<!-- NETFRAMEWORK45 contains a DWORD with installed version key to versions is here: -->
5354
<!-- https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx#detect_net -->
54-
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893")]]>
55+
<![CDATA[Installed or (NETFRAMEWORK45 >= "#379893") or ISVSINSTALL]]>
5556
</Condition>
5657

5758
<Directory Id="TARGETDIR" Name="SourceDir">

‎setup/azurecmdfiles.wxi

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,72 @@
238238
<File Id="fil087657CB273F57C2B1D1A0D6C9DB2AAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\System.Spatial.dll" />
239239
</Component>
240240
</Directory>
241+
<Directory Id="dir20CB1A80CDFE9122E56ECAC691BE1645" Name="AzureRM.ApplicationInsights">
242+
<Component Id="cmp8C55810390E8F28E93B56F1884AD9454" Guid="*">
243+
<File Id="fil483CB450C649EBE923E613AF89DAB598" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\AzureRM.ApplicationInsights.psd1" />
244+
</Component>
245+
<Component Id="cmp538CC349E2758CF89712A01813EA0CA3" Guid="*">
246+
<File Id="fil1AD1B0AA7DC2E05AB964F14720ACB712" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Hyak.Common.dll" />
247+
</Component>
248+
<Component Id="cmp3BBCDF40370DA61F3F23DE95A63CC1A6" Guid="*">
249+
<File Id="fil22517B41198F1C94A49420033FC09F4A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.ApplicationInsights.dll" />
250+
</Component>
251+
<Component Id="cmpD7B7A9AB0C63378189A25C68D41EB41D" Guid="*">
252+
<File Id="fil5D2991EE25C0DC7E484A6F630A28B91F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Commands.ApplicationInsights.dll" />
253+
</Component>
254+
<Component Id="cmp0E8147BB73347D552FF52ECA0972975C" Guid="*">
255+
<File Id="fil47302078A2D62752E378902D6BBA2DFC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml" />
256+
</Component>
257+
<Component Id="cmp6DE0337272AFC21124E05BCF340D56A8" Guid="*">
258+
<File Id="filEC4AEA6515E204149E75ED6E47F74FB9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll" />
259+
</Component>
260+
<Component Id="cmpE077F87641DA6604C4631E209FC5B53A" Guid="*">
261+
<File Id="fil99BE332281DE043089AEFFCEEEE0A187" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
262+
</Component>
263+
<Component Id="cmpEF3BFBC0AB7F09F05FE0B42D8350C0A8" Guid="*">
264+
<File Id="fil1C50DB56A144086B8068B1259C4BDE05" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Common.dll" />
265+
</Component>
266+
<Component Id="cmpB79B8CCA3B4055F11395C074926DD665" Guid="*">
267+
<File Id="fil0B23F0AC610CE872320A7B484E9F9F3E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Common.NetFramework.dll" />
268+
</Component>
269+
<Component Id="cmp244B8C00CA11DDD6D774BABB4A6691DB" Guid="*">
270+
<File Id="filED251E8EDF9D35AD165BB2BF26B13D7E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.KeyVault.Core.dll" />
271+
</Component>
272+
<Component Id="cmpEC5F27A85A9CB1EA1797332909D3C9BC" Guid="*">
273+
<File Id="fil0FB8E91175929B1923DE5995253C5A55" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Azure.Management.ApplicationInsights.dll" />
274+
</Component>
275+
<Component Id="cmp12C1DCBBB450C51FB5769C66449C0107" Guid="*">
276+
<File Id="fil2E26550001D62A1D6520AD14EC43E005" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Rest.ClientRuntime.Azure.dll" />
277+
</Component>
278+
<Component Id="cmpEEAC1F092FA3CC4B0E745EA9CC1116FB" Guid="*">
279+
<File Id="fil6EEB3159CEF1627414B82EE444116F49" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Rest.ClientRuntime.dll" />
280+
</Component>
281+
<Component Id="cmpBBE5EE811E5F1092261A0C11A79744E5" Guid="*">
282+
<File Id="fil1DB5F2B006C062F6F3117CD7BA2E0760" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Threading.Tasks.dll" />
283+
</Component>
284+
<Component Id="cmp1D66A9A3184533BA9C77F41D099F3F8A" Guid="*">
285+
<File Id="fil4F8E6C53EA6470923964F0B0AD111E5F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
286+
</Component>
287+
<Component Id="cmp20A0C14656B9EDA21264A5C92CDBCA37" Guid="*">
288+
<File Id="fil44166CBDDC7A38DC94CB3BEA75D81158" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.Threading.Tasks.Extensions.dll" />
289+
</Component>
290+
<Component Id="cmp5C1BE524EFCCE40D37143AE4971EDB52" Guid="*">
291+
<File Id="filD3017A04DA3314F7C7DF89A9B3E6CC02" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.WindowsAzure.Commands.Common.dll" />
292+
</Component>
293+
<Component Id="cmp97880E3DE25F3C71B3DBEB6022AB34CD" Guid="*">
294+
<File Id="filC7B0201D7B50848FB7D7A7EB7FA16B52" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Microsoft.WindowsAzure.Management.dll" />
295+
</Component>
296+
<Component Id="cmp805E3AD4F18ED09177B0B3C5B23F68D4" Guid="*">
297+
<File Id="fil35B833A12B1C70E2397F3AF84B8B94B2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\Newtonsoft.Json.dll" />
298+
</Component>
299+
<Component Id="cmpF4CA603DC2DDF67FEA95003D704A42A1" Guid="*">
300+
<File Id="filF8D4DADB58D8CA61127034A03E0A0F7B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\System.Net.Http.Extensions.dll" />
301+
</Component>
302+
<Component Id="cmp1EBF9ED596A8BC170720F787104379F2" Guid="*">
303+
<File Id="fil76F711BFF53DE0F0E56699C0D8E90C27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApplicationInsights\System.Net.Http.Primitives.dll" />
304+
</Component>
305+
</Directory>
306+
241307
<Directory Id="dirC9565C26936EFCC1E289F1FDC5331E16" Name="AzureRM.Automation">
242308
<Component Id="cmpE48A93B0493B28E942E948BA2D821B91" Guid="*">
243309
<File Id="fil6502A76962642CDBF1F41647817A0DF2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\AzureRM.Automation.psd1" />
@@ -5941,6 +6007,27 @@
59416007
<ComponentRef Id="cmp905F9DF7496ED79C29FFDF87BA6CC145" />
59426008
<ComponentRef Id="cmpA341B5B54A0B03448E139EDB9A586B96" />
59436009
<ComponentRef Id="cmpCACCECAB9F530A76B2AD3660C5BF8E74" />
6010+
<ComponentRef Id="cmp8C55810390E8F28E93B56F1884AD9454" />
6011+
<ComponentRef Id="cmp538CC349E2758CF89712A01813EA0CA3" />
6012+
<ComponentRef Id="cmp3BBCDF40370DA61F3F23DE95A63CC1A6" />
6013+
<ComponentRef Id="cmpD7B7A9AB0C63378189A25C68D41EB41D" />
6014+
<ComponentRef Id="cmp0E8147BB73347D552FF52ECA0972975C" />
6015+
<ComponentRef Id="cmp6DE0337272AFC21124E05BCF340D56A8" />
6016+
<ComponentRef Id="cmpE077F87641DA6604C4631E209FC5B53A" />
6017+
<ComponentRef Id="cmpEF3BFBC0AB7F09F05FE0B42D8350C0A8" />
6018+
<ComponentRef Id="cmpB79B8CCA3B4055F11395C074926DD665" />
6019+
<ComponentRef Id="cmp244B8C00CA11DDD6D774BABB4A6691DB" />
6020+
<ComponentRef Id="cmpEC5F27A85A9CB1EA1797332909D3C9BC" />
6021+
<ComponentRef Id="cmp12C1DCBBB450C51FB5769C66449C0107" />
6022+
<ComponentRef Id="cmpEEAC1F092FA3CC4B0E745EA9CC1116FB" />
6023+
<ComponentRef Id="cmpBBE5EE811E5F1092261A0C11A79744E5" />
6024+
<ComponentRef Id="cmp1D66A9A3184533BA9C77F41D099F3F8A" />
6025+
<ComponentRef Id="cmp20A0C14656B9EDA21264A5C92CDBCA37" />
6026+
<ComponentRef Id="cmp5C1BE524EFCCE40D37143AE4971EDB52" />
6027+
<ComponentRef Id="cmp97880E3DE25F3C71B3DBEB6022AB34CD" />
6028+
<ComponentRef Id="cmp805E3AD4F18ED09177B0B3C5B23F68D4" />
6029+
<ComponentRef Id="cmpF4CA603DC2DDF67FEA95003D704A42A1" />
6030+
<ComponentRef Id="cmp1EBF9ED596A8BC170720F787104379F2" />
59446031
<ComponentRef Id="cmpE48A93B0493B28E942E948BA2D821B91" />
59456032
<ComponentRef Id="cmpAAE3D8C3D799370A38C04E499C10CEAD" />
59466033
<ComponentRef Id="cmp41036154EE783BC3DEFB1A4C67DC0771" />

‎src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class AzureEnvironment : IAzureEnvironment
5353
AzureDataLakeStoreFileSystemEndpointSuffix = AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix,
5454
GraphEndpointResourceId = AzureEnvironmentConstants.AzureGraphEndpoint,
5555
DataLakeEndpointResourceId = AzureEnvironmentConstants.AzureDataLakeServiceEndpointResourceId,
56+
BatchEndpointResourceId = AzureEnvironmentConstants.BatchEndpointResourceId,
5657
AdTenant = "Common"
5758
}
5859
},
@@ -77,6 +78,7 @@ public class AzureEnvironment : IAzureEnvironment
7778
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
7879
AzureDataLakeStoreFileSystemEndpointSuffix = null,
7980
GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
81+
BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
8082
AdTenant = "Common"
8183
}
8284
},
@@ -101,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
101103
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
102104
AzureDataLakeStoreFileSystemEndpointSuffix = null,
103105
GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
106+
BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
104107
AdTenant = "Common"
105108
}
106109
},
@@ -125,6 +128,7 @@ public class AzureEnvironment : IAzureEnvironment
125128
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
126129
AzureDataLakeStoreFileSystemEndpointSuffix = null,
127130
GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
131+
BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
128132
AdTenant = "Common"
129133
}
130134
}
@@ -228,6 +232,11 @@ public AzureEnvironment(IAzureEnvironment other)
228232
/// </summary>
229233
public string DataLakeEndpointResourceId { get; set; }
230234

235+
/// <summary>
236+
/// The token audience required for communicating with the Batch service in this enviornment
237+
/// </summary>
238+
public string BatchEndpointResourceId { get; set; }
239+
231240
/// <summary>
232241
/// The domain name suffix for Azure DataLake Catalog and Job services created in this environment
233242
/// </summary>
@@ -275,7 +284,8 @@ public static class Endpoint
275284
ManagementPortalUrl = "ManagementPortalUrl",
276285
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix",
277286
AzureDataLakeStoreFileSystemEndpointSuffix = "AzureDataLakeStoreFileSystemEndpointSuffix",
278-
DataLakeEndpointResourceId = "DataLakeEndpointResourceId";
287+
DataLakeEndpointResourceId = "DataLakeEndpointResourceId",
288+
BatchEndpointResourceId = "BatchEndpointResourceId";
279289

280290
}
281291
}

‎src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,10 @@ public static class AzureEnvironmentConstants
125125
/// The token audience for authorizing DataLake requests
126126
/// </summary>
127127
public const string AzureDataLakeServiceEndpointResourceId = "https://datalake.azure.net";
128+
129+
public const string BatchEndpointResourceId = "https://batch.core.windows.net/";
130+
public const string ChinaBatchEndpointResourceId = "https://batch.chinacloudapi.cn/";
131+
public const string USGovernmentBatchEndpointResourceId = "https://batch.core.usgovcloudapi.net/";
132+
public const string GermanBatchEndpointResourceId = "https://batch.cloudapi.de/";
128133
}
129134
}

‎src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
6565
case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
6666
endpoint = new Uri(environment.DataLakeEndpointResourceId);
6767
break;
68+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
69+
endpoint = new Uri(environment.BatchEndpointResourceId);
70+
break;
6871
default:
6972
result = false;
7073
break;
@@ -138,6 +141,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
138141
case AzureEnvironment.Endpoint.ServiceManagement:
139142
propertyValue = environment.ServiceManagementUrl;
140143
break;
144+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
145+
propertyValue = environment.BatchEndpointResourceId;
146+
break;
141147
default:
142148
break;
143149
}
@@ -226,6 +232,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
226232
case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
227233
environment.DataLakeEndpointResourceId = propertyValue;
228234
break;
235+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
236+
environment.BatchEndpointResourceId = propertyValue;
237+
break;
229238
case AzureEnvironment.Endpoint.ActiveDirectory:
230239
environment.ActiveDirectoryAuthority = propertyValue;
231240
break;
@@ -440,6 +449,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
440449
environment.AzureKeyVaultServiceEndpointResourceId =
441450
other.AzureKeyVaultServiceEndpointResourceId;
442451
}
452+
if (other.IsEndpointSet(AzureEnvironment.Endpoint.BatchEndpointResourceId))
453+
{
454+
environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
455+
}
443456

444457
environment.VersionProfiles.Clear();
445458
foreach (var profile in other.VersionProfiles)

‎src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public interface IAzureEnvironment : IExtensibleModel
107107
/// </summary>
108108
string DataLakeEndpointResourceId { get; set; }
109109

110+
/// <summary>
111+
/// The token audience required to authenticate with the Azure Batch service
112+
/// </summary>
113+
string BatchEndpointResourceId { get; set; }
114+
110115
/// <summary>
111116
/// The domain name suffix for Azure DataLake Catalog and Job services
112117
/// </summary>

0 commit comments

Comments
 (0)