Skip to content

Commit 1c58d60

Browse files
jianghaolujianghaolu
committed
Merge pull request Azure#1328 from KajalPowerShell/dev
Intune powershell Cmdlets module
2 parents 604f3de + 4e3ebd5 commit 1c58d60

File tree

92 files changed

+19104
-1
lines changed

Some content is hidden

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

92 files changed

+19104
-1
lines changed

‎ChangeLog.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,35 @@
55
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
66
* Get-AzureRemoteAppVmStaleAdObject
77
* Clear-AzureRemoteAppVmStaleAdObject
8+
* Azure Intune: New cmdlets for Mobile Application management:
9+
* Add-AzureRmIntuneAndroidMAMPolicyApp
10+
* Add-AzureRmIntuneAndroidMAMPolicyGroup
11+
* Add-AzureRmIntuneiOSMAMPolicyApp
12+
* Add-AzureRmIntuneiOSMAMPolicyGroup
13+
* Get-AzureRmIntuneAndroidMAMApp
14+
* Get-AzureRmIntuneAndroidMAMPolicy
15+
* Get-AzureRmIntuneAndroidMAMPolicyApp
16+
* Get-AzureRmIntuneAndroidMAMPolicyGroup
17+
* Get-AzureRmIntuneiOSMAMApp
18+
* Get-AzureRmIntuneiOSMAMPolicy
19+
* Get-AzureRmIntuneiOSMAMPolicyApp
20+
* Get-AzureRmIntuneiOSMAMPolicyGroup
21+
* Get-AzureRmIntuneMAMFlaggedUser
22+
* Get-AzureRmIntuneMAMStatus
23+
* Get-AzureRmIntuneMAMUserDevice
24+
* Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
25+
* Get-AzureRmIntuneOperationResult
26+
* Invoke-AzureRmIntuneMAMUserDeviceWipe
27+
* New-AzureRmIntuneAndroidMAMPolicy
28+
* New-AzureRmIntuneiOSMAMPolicy
29+
* Remove-AzureRmIntuneAndroidMAMPolicy
30+
* Remove-AzureRmIntuneAndroidMAMPolicyApp
31+
* Remove-AzureRmIntuneAndroidMAMPolicyGroup
32+
* Remove-AzureRmIntuneIOSMAMPolicy
33+
* Remove-AzureRmIntuneiOSMAMPolicyApp
34+
* Remove-AzureRmIntuneiOSMAMPolicyGroup
35+
* Set-AzureRmIntuneAndroidMAMPolicy
36+
* Set-AzureRmIntuneiOSMAMPolicy
837

938
## 2015.11.09 version 1.0.1
1039
* Azure Compute

‎setup/azurecmdfiles.wxi

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,71 @@
12071207
<File Id="filF161B346D39B2AA99CBA7434BC7AD7C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\System.Spatial.dll" />
12081208
</Component>
12091209
</Directory>
1210+
<Directory Id="dirF8BB5CC2A8AA03F23D432B214F947ADA" Name="AzureRM.Intune">
1211+
<Component Id="cmp26757C9254980E46634DDBF7FA3DC0EE" Guid="*">
1212+
<File Id="fil15F8D200C8D0DEF2FBDEC493EDAB1BB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\AzureRM.Intune.psd1" />
1213+
</Component>
1214+
<Component Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" Guid="*">
1215+
<File Id="fil1C925E148CCDCEC0309363FC8D38D29F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Hyak.Common.dll" />
1216+
</Component>
1217+
<Component Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" Guid="*">
1218+
<File Id="fil975F3E120A33EB1AD11D26AA54DC0E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.ApplicationInsights.dll" />
1219+
</Component>
1220+
<Component Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" Guid="*">
1221+
<File Id="fil383BA66850249A60C6F43C9B50FE1975" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll" />
1222+
</Component>
1223+
<Component Id="cmpC329903507D2C760A07068087F01E0F0" Guid="*">
1224+
<File Id="fil6BD6B84E30BE331FEED4195F69F365FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll-Help.xml" />
1225+
</Component>
1226+
<Component Id="cmpA98F34A253A4D33476481745DC338B72" Guid="*">
1227+
<File Id="fil2BB88DE9212FEEA5B5883B030C218237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1228+
</Component>
1229+
<Component Id="cmp3218E7B28F820C614786457C75F68FDE" Guid="*">
1230+
<File Id="fil2A8526A4DBACB5E1589A680FBBC5C68D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.Authentication.dll" />
1231+
</Component>
1232+
<Component Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" Guid="*">
1233+
<File Id="fil469E93C3E227C1882BBC95DF2B8EF8E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.dll" />
1234+
</Component>
1235+
<Component Id="cmp9D7D5FC99E7FB18787B78A246F386511" Guid="*">
1236+
<File Id="filBC526C0E7B432252967B14C5EDBE9ADE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.NetFramework.dll" />
1237+
</Component>
1238+
<Component Id="cmp01D375B8D50C7BB0584789AF3262E6EB" Guid="*">
1239+
<File Id="filCA529DB57BEA2658246C587E86778481" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Management.Intune.dll" />
1240+
</Component>
1241+
<Component Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" Guid="*">
1242+
<File Id="fil61C8BE5CFE6844DFC7DA11E02D2F3820" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Bcl.Build.Tasks.dll" />
1243+
</Component>
1244+
<Component Id="cmp71E32FD24E0F5940BB92662C539A00BA" Guid="*">
1245+
<File Id="fil1FCD51FDA84726CA73598C710DCF91C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1246+
</Component>
1247+
<Component Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" Guid="*">
1248+
<File Id="filD18744A14F342FBAF8AEEC84E7631535" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1249+
</Component>
1250+
<Component Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" Guid="*">
1251+
<File Id="filB56D69688254BE5906767249216D4B5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1252+
</Component>
1253+
<Component Id="cmpFF465588FB32BEF908242C7BC2621DF6" Guid="*">
1254+
<File Id="fil40E441D30C21729F47D1073C6C45C06E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.dll" />
1255+
</Component>
1256+
<Component Id="cmpDEF412B27E738D9D17F5B36668F8D91C" Guid="*">
1257+
<File Id="fil52611C34282A47F1829053BBE3A88C5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.dll" />
1258+
</Component>
1259+
<Component Id="cmp28E39E96F170CA278BC16412EA44C66B" Guid="*">
1260+
<File Id="filAFFBCF14874562DC60CBDBBD0023F27E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Threading.Tasks.dll" />
1261+
</Component>
1262+
<Component Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" Guid="*">
1263+
<File Id="fil87975FFE36159391F2BFE90DC9870D1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Commands.Common.dll" />
1264+
</Component>
1265+
<Component Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" Guid="*">
1266+
<File Id="fil254001240A6A5CC7E60E12E8993C003E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Management.dll" />
1267+
</Component>
1268+
<Component Id="cmp5A44264503BFAF83A7DA76A44878BC02" Guid="*">
1269+
<File Id="fil9CFE883503A62070640B22AC40754BF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Newtonsoft.Json.dll" />
1270+
</Component>
1271+
<Component Id="cmp3C91684B2D48E072C9B84111E717AC26" Guid="*">
1272+
<File Id="fil3B384C03C867008DE2C9E8A0F7926E84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\System.Management.Automation.dll" />
1273+
</Component>
1274+
</Directory>
12101275
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
12111276
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
12121277
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
@@ -5177,6 +5242,27 @@
51775242
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
51785243
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
51795244
<ComponentRef Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" />
5245+
<ComponentRef Id="cmp26757C9254980E46634DDBF7FA3DC0EE" />
5246+
<ComponentRef Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" />
5247+
<ComponentRef Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" />
5248+
<ComponentRef Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" />
5249+
<ComponentRef Id="cmpC329903507D2C760A07068087F01E0F0" />
5250+
<ComponentRef Id="cmpA98F34A253A4D33476481745DC338B72" />
5251+
<ComponentRef Id="cmp3218E7B28F820C614786457C75F68FDE" />
5252+
<ComponentRef Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" />
5253+
<ComponentRef Id="cmp9D7D5FC99E7FB18787B78A246F386511" />
5254+
<ComponentRef Id="cmp01D375B8D50C7BB0584789AF3262E6EB" />
5255+
<ComponentRef Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" />
5256+
<ComponentRef Id="cmp71E32FD24E0F5940BB92662C539A00BA" />
5257+
<ComponentRef Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" />
5258+
<ComponentRef Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" />
5259+
<ComponentRef Id="cmpFF465588FB32BEF908242C7BC2621DF6" />
5260+
<ComponentRef Id="cmpDEF412B27E738D9D17F5B36668F8D91C" />
5261+
<ComponentRef Id="cmp28E39E96F170CA278BC16412EA44C66B" />
5262+
<ComponentRef Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" />
5263+
<ComponentRef Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" />
5264+
<ComponentRef Id="cmp5A44264503BFAF83A7DA76A44878BC02" />
5265+
<ComponentRef Id="cmp3C91684B2D48E072C9B84111E717AC26" />
51805266
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
51815267
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
51825268
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />

‎src/ResourceManager.ForRefactoringOnly.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeStore.Test
135135
EndProject
136136
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataLakeAnalytics.Test", "ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\Commands.DataLakeAnalytics.Test.csproj", "{E6122DB1-1466-47EE-8BA0-73F9CA90F826}"
137137
EndProject
138+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune", "ResourceManager\Intune\Commands.Intune\Commands.Intune.csproj", "{189B40C3-7505-410A-9E55-7E7671BB2E14}"
139+
EndProject
140+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Intune.Test", "ResourceManager\Intune\Commands.Intune.Test\Commands.Intune.Test.csproj", "{CA5F571B-550B-4BE3-9BA3-06442DF52768}"
141+
EndProject
138142
Global
139143
GlobalSection(SolutionConfigurationPlatforms) = preSolution
140144
Debug|Any CPU = Debug|Any CPU
@@ -389,6 +393,14 @@ Global
389393
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Debug|Any CPU.Build.0 = Debug|Any CPU
390394
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.ActiveCfg = Release|Any CPU
391395
{E6122DB1-1466-47EE-8BA0-73F9CA90F826}.Release|Any CPU.Build.0 = Release|Any CPU
396+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
397+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
398+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.ActiveCfg = Release|Any CPU
399+
{189B40C3-7505-410A-9E55-7E7671BB2E14}.Release|Any CPU.Build.0 = Release|Any CPU
400+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
401+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Debug|Any CPU.Build.0 = Debug|Any CPU
402+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.ActiveCfg = Release|Any CPU
403+
{CA5F571B-550B-4BE3-9BA3-06442DF52768}.Release|Any CPU.Build.0 = Release|Any CPU
392404
EndGlobalSection
393405
GlobalSection(SolutionProperties) = preSolution
394406
HideSolutionNode = FALSE
@@ -421,5 +433,6 @@ Global
421433
{EA66BF2C-4E5F-42FE-912C-B62AEB588308} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
422434
{B0D03ECF-9F25-499A-BE25-D668E0D208AA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
423435
{E6122DB1-1466-47EE-8BA0-73F9CA90F826} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
436+
{CA5F571B-550B-4BE3-9BA3-06442DF52768} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
424437
EndGlobalSection
425438
EndGlobal

‎src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static AzureRMCmdlet()
4040
if (!TestMockSupport.RunningMocked)
4141
{
4242
AzureSession.DataStore = new DiskDataStore();
43-
}
43+
}
4444
}
4545

4646
/// <summary>

‎src/ResourceManager/Intune/.nuget/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="xunit.runner.console" version="2.0.0" />
4+
</packages>

‎src/ResourceManager/Intune/AzureRM.Intune.psd1

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
#
2+
# Module manifest for module 'AzureRM.Intune'
3+
#
4+
# Generated by: vrmurthy
5+
#
6+
# Generated on: 10/28/2015
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '1.0.1'
16+
17+
# ID used to uniquely identify this module
18+
GUID = '1be1e8c1-8b8a-41b3-82e9-88e7bc941fa0'
19+
20+
# Author of this module
21+
Author = 'Microsoft Corporation'
22+
23+
# Company or vendor of this module
24+
CompanyName = 'Microsoft Corporation'
25+
26+
# Copyright statement for this module
27+
Copyright = 'Microsoft Corporation. All rights reserved.'
28+
29+
# Description of the functionality provided by this module
30+
Description = 'Microsoft Azure PowerShell - Intune service cmdlets for Azure Resource Manager'
31+
32+
# Minimum version of the Windows PowerShell engine required by this module
33+
PowerShellVersion = '3.0'
34+
35+
# Name of the Windows PowerShell host required by this module
36+
PowerShellHostName = ''
37+
38+
# Minimum version of the Windows PowerShell host required by this module
39+
PowerShellHostVersion = ''
40+
41+
# Minimum version of the .NET Framework required by this module
42+
DotNetFrameworkVersion = '4.0'
43+
44+
# Minimum version of the common language runtime (CLR) required by this module
45+
CLRVersion='4.0'
46+
47+
# Processor architecture (None, X86, Amd64) required by this module
48+
# ProcessorArchitecture = 'None'
49+
50+
# Modules that must be imported into the global environment prior to importing this module
51+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.1'})
52+
53+
# Assemblies that must be loaded prior to importing this module
54+
# RequiredAssemblies = @()
55+
56+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
57+
# ScriptsToProcess = @()
58+
59+
# Type files (.ps1xml) to be loaded when importing this module
60+
# TypesToProcess = @()
61+
62+
# Format files (.ps1xml) to be loaded when importing this module
63+
FormatsToProcess = @()
64+
65+
# Modules to import as nested modules of the module specified in ModuleToProcess
66+
NestedModules = @(
67+
'.\Microsoft.Azure.Commands.Intune.dll'
68+
)
69+
70+
# Functions to export from this module
71+
FunctionsToExport = '*'
72+
73+
# Cmdlets to export from this module
74+
CmdletsToExport = '*'
75+
76+
# Variables to export from this module
77+
VariablesToExport = '*'
78+
79+
# Aliases to export from this module
80+
AliasesToExport = '*'
81+
82+
# DSC resources to export from this module
83+
# DscResourcesToExport = @()
84+
85+
# List of all modules packaged with this module
86+
# ModuleList = @()
87+
88+
# List of all files packaged with this module
89+
# FileList = @()
90+
91+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
92+
PrivateData = @{
93+
94+
PSData = @{
95+
96+
# Tags applied to this module. These help with module discovery in online galleries.
97+
# Tags = @()
98+
99+
# A URL to the license for this module.
100+
# LicenseUri = ''
101+
102+
# A URL to the main website for this project.
103+
# ProjectUri = ''
104+
105+
# A URL to an icon representing this module.
106+
# IconUri = ''
107+
108+
# ReleaseNotes of this module
109+
# ReleaseNotes = ''
110+
111+
} # End of PSData hashtable
112+
113+
} # End of PrivateData hashtable
114+
115+
# HelpInfo URI of this module
116+
# HelpInfoURI = ''
117+
118+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
119+
# DefaultCommandPrefix = ''
120+
121+
}

0 commit comments

Comments
 (0)