Skip to content

Commit

Permalink
Merge pull request #5 from Azure/dev
Browse files Browse the repository at this point in the history
Merge from master
  • Loading branch information
yaakoviyun committed Dec 6, 2015
2 parents fae57c3 + 3d52731 commit 2839c4f
Show file tree
Hide file tree
Showing 1,577 changed files with 402,957 additions and 286,986 deletions.
32 changes: 32 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,38 @@
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
* Get-AzureRemoteAppVmStaleAdObject
* Clear-AzureRemoteAppVmStaleAdObject
* Azure Intune: New cmdlets for Mobile Application management:
* Add-AzureRmIntuneAndroidMAMPolicyApp
* Add-AzureRmIntuneAndroidMAMPolicyGroup
* Add-AzureRmIntuneiOSMAMPolicyApp
* Add-AzureRmIntuneiOSMAMPolicyGroup
* Get-AzureRmIntuneAndroidMAMApp
* Get-AzureRmIntuneAndroidMAMPolicy
* Get-AzureRmIntuneAndroidMAMPolicyApp
* Get-AzureRmIntuneAndroidMAMPolicyGroup
* Get-AzureRmIntuneiOSMAMApp
* Get-AzureRmIntuneiOSMAMPolicy
* Get-AzureRmIntuneiOSMAMPolicyApp
* Get-AzureRmIntuneiOSMAMPolicyGroup
* Get-AzureRmIntuneMAMFlaggedUser
* Get-AzureRmIntuneMAMStatus
* Get-AzureRmIntuneMAMUserDevice
* Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
* Get-AzureRmIntuneOperationResult
* Invoke-AzureRmIntuneMAMUserDeviceWipe
* New-AzureRmIntuneAndroidMAMPolicy
* New-AzureRmIntuneiOSMAMPolicy
* Remove-AzureRmIntuneAndroidMAMPolicy
* Remove-AzureRmIntuneAndroidMAMPolicyApp
* Remove-AzureRmIntuneAndroidMAMPolicyGroup
* Remove-AzureRmIntuneIOSMAMPolicy
* Remove-AzureRmIntuneiOSMAMPolicyApp
* Remove-AzureRmIntuneiOSMAMPolicyGroup
* Set-AzureRmIntuneAndroidMAMPolicy
* Set-AzureRmIntuneiOSMAMPolicy

## 2015.11.09 version 1.0.1
* Azure Compute
Expand Down
20 changes: 0 additions & 20 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
<SetupSln Include=".\setup\azurepowershell.sln" />
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -80,13 +79,6 @@
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false" />

<MSBuild
Projects="@(SetupPowershellGetSln)"
Targets="Clean"
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false"
Condition=" '$(Scope)' == 'all' "/>

<!-- Delete the publish files -->
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
<ItemGroup>
Expand Down Expand Up @@ -161,14 +153,6 @@

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

<Message Importance="high" Text="Building Setup..." />
<MSBuild
Projects="@(SetupPowershellGetSln)"
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false"
Condition=" '$(Scope)' == 'all' "/>

<MSBuild
Projects="@(SetupSln)"
Targets="Build"
Expand Down Expand Up @@ -203,8 +187,6 @@
</GetFrameworkSdkPath>

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

<!-- Copying signed shortcut back -->
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"
Expand Down
32 changes: 0 additions & 32 deletions setup-powershellget/Setup/CustomAction.config

This file was deleted.

110 changes: 0 additions & 110 deletions setup-powershellget/Setup/CustomAction.cs

This file was deleted.

48 changes: 0 additions & 48 deletions setup-powershellget/Setup/Properties/AssemblyInfo.cs

This file was deleted.

50 changes: 0 additions & 50 deletions setup-powershellget/Setup/Setup.csproj

This file was deleted.

Loading

0 comments on commit 2839c4f

Please sign in to comment.