Skip to content

Commit 2839c4f

Browse files
committed
Merge pull request #5 from Azure/dev
Merge from master
2 parents fae57c3 + 3d52731 commit 2839c4f

File tree

1,577 files changed

+402957
-286986
lines changed

Some content is hidden

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

1,577 files changed

+402957
-286986
lines changed

ChangeLog.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
33
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
44
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
5+
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
6+
* Get-AzureRemoteAppVmStaleAdObject
7+
* 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
537

638
## 2015.11.09 version 1.0.1
739
* Azure Compute

build.proj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
5252
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
5353
<SetupSln Include=".\setup\azurepowershell.sln" />
54-
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
5554
</ItemGroup>
5655

5756
<!--
@@ -80,13 +79,6 @@
8079
Properties="Configuration=$(Configuration);Platform=Any CPU"
8180
ContinueOnError="false" />
8281

83-
<MSBuild
84-
Projects="@(SetupPowershellGetSln)"
85-
Targets="Clean"
86-
Properties="Configuration=$(Configuration);Platform=Any CPU"
87-
ContinueOnError="false"
88-
Condition=" '$(Scope)' == 'all' "/>
89-
9082
<!-- Delete the publish files -->
9183
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
9284
<ItemGroup>
@@ -161,14 +153,6 @@
161153

162154
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
163155

164-
<Message Importance="high" Text="Building Setup..." />
165-
<MSBuild
166-
Projects="@(SetupPowershellGetSln)"
167-
Targets="Build"
168-
Properties="Configuration=$(Configuration);Platform=Any CPU"
169-
ContinueOnError="false"
170-
Condition=" '$(Scope)' == 'all' "/>
171-
172156
<MSBuild
173157
Projects="@(SetupSln)"
174158
Targets="Build"
@@ -203,8 +187,6 @@
203187
</GetFrameworkSdkPath>
204188

205189
<!-- Copying shortcut to be signed -->
206-
<Copy SourceFiles="$(LibraryRoot)setup-powershellget\Setup\ShortcutStartup.ps1"
207-
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
208190
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
209191
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
210192
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
@@ -260,8 +242,6 @@
260242
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
261243

262244
<!-- Copying signed shortcut back -->
263-
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
264-
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
265245
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
266246
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
267247
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"

setup-powershellget/Setup/CustomAction.config

Lines changed: 0 additions & 32 deletions
This file was deleted.

setup-powershellget/Setup/CustomAction.cs

Lines changed: 0 additions & 110 deletions
This file was deleted.

setup-powershellget/Setup/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 48 deletions
This file was deleted.

setup-powershellget/Setup/Setup.csproj

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)