Skip to content

Commit 9459698

Browse files
author
Samuel Anudeep
committed
Merge pull request #169 from MabOneSdk/release
RI from release to dev1
2 parents 099b801 + 7e43917 commit 9459698

File tree

2,290 files changed

+448926
-240824
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,290 files changed

+448926
-240824
lines changed

ChangeLog.md

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,72 @@
1+
## 2016.02.03 version 1.2.0
2+
* Azure RemoteApp:
3+
* Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
4+
* Azure Stack Admin:
5+
* New module for the management of azure stack administrative resources such as plan, offer, subscription, resource provider and
6+
gallery items.
7+
* Azure Stack Storage Admin:
8+
* New module for the management of azure stack storage administrative resources such as configuration, infrastructure and health.
9+
* Azure Operational Insights new cmdlets:
10+
* Get-AzureRmOperationalInsightsSavedSearch
11+
* Get-AzureRmOperationalInsightsSavedSeearchResults
12+
* Get-AzureRmOperationalInsightsSavedSearches
13+
* Get-AzureRmOperationalInsightsSchema
14+
* Get-AzureRmOperationalInsightsSearchResult
15+
* Get-AzureRmOperationalInsightsSearchResultUpdate
16+
* Remove-AzureRmOperationalInsightsSavedSearch
17+
* Remove-AzureRmOperationalInsightsSavedSearch
18+
* Set-AzureRmOperationalInsightsSavedSearch
19+
* Add-AzureRmAccount fixed issue with wrong credential message
20+
* Get-AzureRmSubscription cmdlet now returns paginated results
21+
* Update-AzureRM now only updates when need unless -Force is used
22+
* Added telemetry to ARM and ASM cmdlets
23+
24+
## 2016.01.12 version 1.1.0
25+
* Azure SQL Database: Threat Detection policies:
26+
* Using new Threat Detection Types
27+
* Azure Redis Cache: new cmdlets for enabling and disabling diagnostics
28+
* Set-AzureRmRedisCacheDiagnostics
29+
* Remove-AzureRmRedisCacheDiagnostics
30+
* Azure Websites: New cmdlets for managing SSL binding
31+
* Get-AzureRmWebAppCertificate
32+
* New-AzureRmWebAppSSLBinding
33+
* Get-AzureRmWebAppSSLBinding
34+
* Remove-AzureRmWebAppSSLBinding
35+
* Added AseName and AseResourceGroupName parameters in New-AzureRmWebApp and New-AzureRmAppServicePlan cmdlet
36+
* Added support for cloning all deployment slots associated with source website
37+
* Azure Stream Analytics: Added new cmdlet support for Functions.
38+
* New-AzureRmStreamAnalyticsFunction
39+
* Get-AzureRmStreamAnalyticsFunction
40+
* Test-AzureRmStreamAnalyticsFunction
41+
* Get-AzureRmStreamAnalyticsDefaultFunctionDefinition
42+
* Remove-AzureRmStreamAnalyticsFunction
43+
* Azure Batch
44+
* New-AzureBatchTask now accepts a MultiInstanceSettings parameter
45+
* Get-AzureBatchSubtask cmdlet added
46+
* Enable-AzureBatchComputeNodeScheduling / Disable-AzureBatchComputeNodeScheduling cmdlets added
47+
* Enable-AzureBatchAutoScale and New-AzureBatchPool now accept an AutoScaleEvaluationInterval parameter.
48+
49+
## 2015.12.14 version 1.0.2
50+
* Azure Compute (ARM):
51+
* Enable BGInfo extension by default
52+
* Fix the issue when an OS disk is in a different resource group: Now New-AzureRmVM does not create a new storage account for boot diagnostics.
53+
* Add Set-AzureRmBginfoExtension cmdlet
54+
* Make WinRMCertificateUrl parameter mandatory when Set-AzureRmVMOperatingSystem cmdlet is performed with WinRMHttps switch
55+
* Azure Compute (Service Management):
56+
* Fix the issue when adding a new VM without a data disk
57+
* Add ExtensionId parameter for all extension cmdlets
58+
* Expose RemoteAccessCertificateThumbprint property for Get-AzureVM cmdlet
159
* Azure SQL Database: new cmdlets for managing database threat detection policies:
260
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
361
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
462
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
563
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
664
* Get-AzureRemoteAppVmStaleAdObject
765
* Clear-AzureRemoteAppVmStaleAdObject
8-
66+
* ARM Storage:
67+
* Fix alias missing issue
68+
69+
970
## 2015.11.09 version 1.0.1
1071
* Azure Compute
1172
* Added cmdlets for managing VM DiskEncryption extension

build.proj

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@
4545
<Scope Condition=" $(Scope) == '' " >all</Scope>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == 'all' "/>
48+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
49+
Exclude=".\src\ResourceManager\Intune\*.sln"
50+
Condition=" '$(Scope)' == 'all' "/>
4951
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"
5052
Condition=" '$(Scope)' != 'all' and '$(Scope)' != 'ServiceManagement' and '$(Scope)' != 'AzureStorage' "/>
5153
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
5254
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
5355
<SetupSln Include=".\setup\azurepowershell.sln" />
56+
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
5457
</ItemGroup>
5558

5659
<!--
@@ -159,6 +162,14 @@
159162
Properties="Configuration=$(Configuration);Platform=Any CPU"
160163
ContinueOnError="false"
161164
Condition=" '$(Scope)' == 'all' "/>
165+
166+
<MSBuild
167+
Projects="@(StaticAnalysis)"
168+
Targets="Build"
169+
Properties="Configuration=Debug;Platform=Any CPU"
170+
ContinueOnError="false" />
171+
172+
<CallTarget Targets="DependencyAnalysis" />
162173

163174
<CallTarget Targets="CodeSignInstaller"
164175
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
@@ -217,7 +228,7 @@
217228
UnsignedFiles="@(DelaySignedAssembliesToSign)"
218229
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
219230
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
220-
Certificates="72, 10006"
231+
Certificates="72, 401"
221232
SigningLogPath="$(LibraryRoot)\signing.log"
222233
ToolsPath="$(CIToolsPath)"
223234
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
@@ -228,7 +239,7 @@
228239
UnsignedFiles="@(ScriptsToSign)"
229240
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
230241
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
231-
Certificates="10006"
242+
Certificates="402"
232243
SigningLogPath="$(LibraryRoot)\signing-scripts.log"
233244
ToolsPath="$(CIToolsPath)"
234245
Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
@@ -270,14 +281,20 @@
270281
UnsignedFiles="@(InstallersToSign)"
271282
DestinationPath="$(LibraryRoot)\signed"
272283
SigningLogPath="$(LibraryRoot)\msi-signing.log"
273-
Certificates="10006"
284+
Certificates="402"
274285
ToolsPath="$(CIToolsPath)"
275286
Condition="!$(DelaySign) and '@(InstallersToSign)' != ''"/>
276287

277288
<!--If we are testing locally then we copy the binaries and do not submit to the code sign server-->
278289
<Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
279290
</Target>
280291

292+
<!-- Run Dependecy Analyzer -->
293+
<Target Name="DependencyAnalysis">
294+
<Message Importance="high" Text="Running Dependency Analysis..." />
295+
<Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package"/>
296+
</Target>
297+
281298
<!-- Publish all packages -->
282299
<Target Name="Publish">
283300
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />

setup/Setup/CustomAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.WindowsAzure.Setup
2121

2222
public class CustomAction
2323
{
24-
// The exception object which will store (if) exception which is occured in our sta thread
24+
// The exception object which will store (if) exception which is occurred in our sta thread
2525
private static Exception _STAThreadException;
2626

2727
private static uint[] powerShellDefaultColorTable = new uint[]
@@ -30,7 +30,7 @@ public class CustomAction
3030
0x808080, 0xFF0000, 0xFF00, 0xFFFF00, 0xFF, 0xFF00FF, 0xFFFF, 0xFFFFFF
3131
};
3232

33-
// Method which contains our custom action behaviour
33+
// Method which contains our custom action behavior
3434
private static void RunSTAThread(object sessionObject)
3535
{
3636
try

setup/Setup/RemoveGalleryModules.ps1

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
function Remove-Modules
16+
{
17+
param([string]$basePath)
18+
$paths = "Azure", "AzureRM", "AzureRM.*", "Azure.Storage"
19+
$paths | ForEach-Object {
20+
$modulePath = ([System.IO.Path]::Combine($basePath, $_))
21+
try {
22+
Write-Host Removing $_
23+
if (Test-Path $modulePath)
24+
{
25+
Remove-Item -Recurse $modulePath -Force
26+
}
27+
}
28+
catch {}
29+
}
30+
}
31+
32+
if (Test-Path 'Env:\ProgramFiles(x86)')
33+
{
34+
Remove-Modules ([System.IO.Path]::Combine(${env:ProgramFiles(x86)}, "WindowsPowerShell", "Modules"))
35+
}
36+
37+
if (Test-Path Env:\ProgramFiles)
38+
{
39+
Remove-Modules ([System.IO.Path]::Combine($env:ProgramFiles, "WindowsPowerShell", "Modules"))
40+
}
41+

setup/Setup/SetExecutionPolicy.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15-
1615
try
1716
{
1817
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue"

setup/azurecmd.wxs

Lines changed: 23 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - November 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - February 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.0.1" ?>
9-
<?define versionedStartMenuFolder="Microsoft Azure" ?>
10-
<?define staleStartMenuFolder="Windows Azure" ?>
11-
8+
<?define version="1.2.0" ?>
9+
1210
<Product Id="*"
1311
Name="$(var.productName)"
1412
Language="1033"
@@ -31,36 +29,18 @@
3129
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
3230
</Property>
3331

34-
<SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules" Before="AppSearch">
32+
<SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules\" Before="AppSearch">
3533
VersionNT64
3634
</SetProperty>
3735

38-
<SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules" Before="AppSearch">
36+
<SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules\" Before="AppSearch">
3937
NOT VersionNT64
4038
</SetProperty>
4139

4240
<SetProperty Id="POWERSHELLEXE" Value="[WindowsFolder]System32\WindowsPowerShell\v1.0\powershell.exe" Before="AppSearch"/>
43-
44-
<Property Id="POWERSHELLGETMODULESINSTALLED" >
45-
<DirectorySearch Id="PROGRAMFILESCONTAINER" Path="[BaseModulesFolder]">
46-
<DirectorySearch Id= "PROFILEMODULE" Path="AzureRM.Profile"/>
47-
</DirectorySearch>
48-
</Property>
49-
50-
<Property Id="POWERSHELLGETAZUREINSTALLED" >
51-
<DirectorySearch Id="AZURECONTAINER" Path="[BaseModulesFolder]">
52-
<DirectorySearch Id= "AZUREMODULE" Path="Azure"/>
53-
</DirectorySearch>
54-
</Property>
55-
56-
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
57-
<![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
58-
</Condition>
59-
60-
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
61-
<![CDATA[Installed or NOT(POWERSHELLGETAZUREINSTALLED >< "Azure")]]>
62-
</Condition>
63-
41+
42+
<util:CloseApplication Id="ClosePowerShellExe" Target="powershell.exe" ElevatedCloseMessage="yes" CloseMessage="yes" PromptToContinue="yes" Description="PowerShell must be closed to continue with this installation. Please close any PowerShell windows and click 'Retry', or click 'Cancel' to stop installation. If you click 'Ignore' the installer will attempt to close any open PowerShell window."/>
43+
<util:CloseApplication Id="ClosePowerShellIseExe" Target="powershell_ise.exe" ElevatedCloseMessage="yes" CloseMessage="yes" PromptToContinue="yes" Description="PowerShell ISE must be closed to continue with this installation. Please close any PowerShell ISE windows and click 'Retry', or click 'Cancel' to stop installation. If you click 'Ignore' the installer will attempt to close any open PowerShell ISE window."/>
6444

6545
<Condition Message="This setup requires the Windows PowerShell 3.0 or compatible version to be installed.">
6646
<!-- This condition will break if PowerShell has version x3.0 and it is not compatible with 3.0 -->
@@ -81,26 +61,22 @@
8161
</Directory>
8262
</Directory>
8363
</Directory>
84-
<Directory Id="ProgramMenuFolder">
85-
<Directory Id="AzureSdkMenu" Name="$(var.versionedStartMenuFolder)"/>
86-
<Directory Id="StaleAzureSdkMenu" Name="$(var.staleStartMenuFolder)"/>
87-
</Directory>
8864
</Directory>
8965

9066
<Property Id="POWERSHELLPATH">
91-
<RegistrySearch Id="POWERSHELLPATH"
92-
Type="raw"
93-
Root="HKLM"
94-
Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine"
95-
Name="ApplicationBase" />
67+
<RegistrySearch Id="POWERSHELLPATH"
68+
Type="raw"
69+
Root="HKLM"
70+
Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine"
71+
Name="ApplicationBase" />
9672
</Property>
9773

9874
<DirectoryRef Id="PowerShellFolder">
9975
<Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
10076
<CreateFolder />
10177
<!-- Work around bug that PowerShell does not always consider default module paths. -->
102-
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
103-
</Component>
78+
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\" System="yes" />
79+
</Component>
10480
</DirectoryRef>
10581

10682
<DirectoryRef Id="PowerShellFolder">
@@ -109,37 +85,22 @@
10985
</Component>
11086
</DirectoryRef>
11187

112-
<DirectoryRef Id="AzureSdkMenu">
113-
<Component Id="AzureSdkShortcut" Guid="A9B58A22-F746-451D-8840-F887D8014C3C">
114-
<Shortcut Id="AzureSdkStartMenuShortcut"
115-
Name="Microsoft Azure PowerShell"
116-
Description="Microsoft PowerShell cmdlets"
117-
Target="[POWERSHELLPATH]\powershell.exe"
118-
Arguments="-NoExit -ExecutionPolicy Bypass -File &quot;[PowerShellFolder]ServiceManagement\Azure\Services\ShortcutStartup.ps1&quot;"/>
119-
<RemoveFolder Id="AzureSdkMenu" On="uninstall"/>
120-
<RemoveFile Id="RemoveStaleFiles" Directory="StaleAzureSdkMenu" Name="Windows Azure PowerShell.lnk" On="both"/>
121-
<RegistryValue Root="HKCU" Key="SOFTWARE\Microsoft\Microsoft SDKs\WindowsAzure\$(var.version)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
88+
<DirectoryRef Id="PowerShellFolder">
89+
<Component Id="AzureSdkRemoveModulesScript" Guid="7d75fe67-88e4-40da-bc3d-874cb0438d30">
90+
<File Id="AzureSdkRemoveModulesScriptFile" KeyPath="yes" Source="$(var.SolutionDir)\Setup\RemoveGalleryModules.ps1" />
12291
</Component>
12392
</DirectoryRef>
12493

12594
<Feature Id="azurecmd" Title="Microsoft Azure PowerShell" Level="1" Description="Windows PowerShell commandlets">
12695
<ComponentGroupRef Id="azurecmdfiles" />
12796
<ComponentRef Id="PSModulePath.System" />
128-
<ComponentRef Id="AzureSdkShortcut" />
12997
<ComponentRef Id="AzureSdkExecutionPolicyScript" />
130-
</Feature>
98+
<ComponentRef Id="AzureSdkRemoveModulesScript" />
99+
</Feature>
131100

132101
<Binary Id="CustomActions" SourceFile="$(var.caSourceDir)\Microsoft.WindowsAzure.Setup.CA.dll"/>
133-
<CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
134-
<CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
135-
Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
136-
<CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]SetExecutionPolicy.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
137-
138-
<InstallExecuteSequence>
139-
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
140-
<Custom Action="UpdatePSShortcut" After="SetCustomActionDataValue">NOT Installed</Custom>
141-
<Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
142-
</InstallExecuteSequence>
102+
<CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]SetExecutionPolicy.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
103+
<CustomAction Id="RemoveGalleryModules" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]RemoveGalleryModules.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
143104

144105
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
145106
<UIRef Id="WixUI_Minimal" />

0 commit comments

Comments
 (0)