Skip to content

Commit d0b3bc9

Browse files
yaakoviyunyaakoviyun
committed
Merge pull request #8 from Azure/dev
Merge from master
2 parents 1099afb + b7d3a4d commit d0b3bc9

File tree

970 files changed

+134820
-77857
lines changed

Some content is hidden

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

970 files changed

+134820
-77857
lines changed

‎ChangeLog.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
## 2016.02.02 version 1.1.1
2+
* Azure RemoteApp: Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
3+
## 2016.01.12 version 1.1.0
14
* Azure SQL Database: Threat Detection policies:
25
* Using new Threat Detection Types
36
* Azure Redis Cache: new cmdlets for enabling and disabling diagnostics
47
* Set-AzureRmRedisCacheDiagnostics
58
* Remove-AzureRmRedisCacheDiagnostics
9+
* Azure Websites: New cmdlets for managing SSL binding
10+
* Get-AzureRmWebAppCertificate
11+
* New-AzureRmWebAppSSLBinding
12+
* Get-AzureRmWebAppSSLBinding
13+
* Remove-AzureRmWebAppSSLBinding
14+
* Added AseName and AseResourceGroupName parameters in New-AzureRmWebApp and New-AzureRmAppServicePlan cmdlet
15+
* Added support for cloning all deployment slots associated with source website
16+
* Azure Stream Analytics: Added new cmdlet support for Functions.
17+
* New-AzureRmStreamAnalyticsFunction
18+
* Get-AzureRmStreamAnalyticsFunction
19+
* Test-AzureRmStreamAnalyticsFunction
20+
* Get-AzureRmStreamAnalyticsDefaultFunctionDefinition
21+
* Remove-AzureRmStreamAnalyticsFunction
22+
* Azure Batch
23+
* New-AzureBatchTask now accepts a MultiInstanceSettings parameter
24+
* Get-AzureBatchSubtask cmdlet added
25+
* Enable-AzureBatchComputeNodeScheduling / Disable-AzureBatchComputeNodeScheduling cmdlets added
26+
* Enable-AzureBatchAutoScale and New-AzureBatchPool now accept an AutoScaleEvaluationInterval parameter.
27+
628
## 2015.12.14 version 1.0.2
729
* Azure Compute (ARM):
830
* Enable BGInfo extension by default

‎build.proj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
UnsignedFiles="@(DelaySignedAssembliesToSign)"
220220
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
221221
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
222-
Certificates="72, 10006"
222+
Certificates="72, 401"
223223
SigningLogPath="$(LibraryRoot)\signing.log"
224224
ToolsPath="$(CIToolsPath)"
225225
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
@@ -230,7 +230,7 @@
230230
UnsignedFiles="@(ScriptsToSign)"
231231
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
232232
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
233-
Certificates="10006"
233+
Certificates="402"
234234
SigningLogPath="$(LibraryRoot)\signing-scripts.log"
235235
ToolsPath="$(CIToolsPath)"
236236
Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
@@ -272,7 +272,7 @@
272272
UnsignedFiles="@(InstallersToSign)"
273273
DestinationPath="$(LibraryRoot)\signed"
274274
SigningLogPath="$(LibraryRoot)\msi-signing.log"
275-
Certificates="10006"
275+
Certificates="402"
276276
ToolsPath="$(CIToolsPath)"
277277
Condition="!$(DelaySign) and '@(InstallersToSign)' != ''"/>
278278

‎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/azurecmd.wxs‎

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

4-
<?define productName="Microsoft Azure PowerShell - December 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - January 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.2" ?>
9-
<?define versionedStartMenuFolder="Microsoft Azure" ?>
10-
<?define staleStartMenuFolder="Windows Azure" ?>
8+
<?define version="1.1.0" ?>
119

1210
<Product Id="*"
1311
Name="$(var.productName)"
@@ -31,11 +29,11 @@
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

@@ -63,10 +61,6 @@
6361
</Directory>
6462
</Directory>
6563
</Directory>
66-
<Directory Id="ProgramMenuFolder">
67-
<Directory Id="AzureSdkMenu" Name="$(var.versionedStartMenuFolder)"/>
68-
<Directory Id="StaleAzureSdkMenu" Name="$(var.staleStartMenuFolder)"/>
69-
</Directory>
7064
</Directory>
7165

7266
<Property Id="POWERSHELLPATH">
@@ -81,7 +75,7 @@
8175
<Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
8276
<CreateFolder />
8377
<!-- Work around bug that PowerShell does not always consider default module paths. -->
84-
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
78+
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\" System="yes" />
8579
</Component>
8680
</DirectoryRef>
8781

@@ -97,41 +91,17 @@
9791
</Component>
9892
</DirectoryRef>
9993

100-
<DirectoryRef Id="AzureSdkMenu">
101-
<Component Id="AzureSdkShortcut" Guid="A9B58A22-F746-451D-8840-F887D8014C3C">
102-
<Shortcut Id="AzureSdkStartMenuShortcut"
103-
Name="Microsoft Azure PowerShell"
104-
Description="Microsoft PowerShell cmdlets"
105-
Target="[POWERSHELLPATH]\powershell.exe"
106-
Arguments="-NoExit -ExecutionPolicy Bypass -File &quot;[PowerShellFolder]ServiceManagement\Azure\Services\ShortcutStartup.ps1&quot;"/>
107-
<RemoveFolder Id="AzureSdkMenu" On="uninstall"/>
108-
<RemoveFile Id="RemoveStaleFiles" Directory="StaleAzureSdkMenu" Name="Windows Azure PowerShell.lnk" On="both"/>
109-
<RegistryValue Root="HKCU" Key="SOFTWARE\Microsoft\Microsoft SDKs\WindowsAzure\$(var.version)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
110-
</Component>
111-
</DirectoryRef>
112-
11394
<Feature Id="azurecmd" Title="Microsoft Azure PowerShell" Level="1" Description="Windows PowerShell commandlets">
11495
<ComponentGroupRef Id="azurecmdfiles" />
11596
<ComponentRef Id="PSModulePath.System" />
116-
<ComponentRef Id="AzureSdkShortcut" />
11797
<ComponentRef Id="AzureSdkExecutionPolicyScript" />
11898
<ComponentRef Id="AzureSdkRemoveModulesScript" />
11999
</Feature>
120100

121101
<Binary Id="CustomActions" SourceFile="$(var.caSourceDir)\Microsoft.WindowsAzure.Setup.CA.dll"/>
122-
<CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
123-
<CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
124-
Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
125102
<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"/>
126103
<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"/>
127104

128-
<InstallExecuteSequence>
129-
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
130-
<Custom Action="RemoveGalleryModules" After="SetCustomActionDataValue">NOT Installed</Custom>
131-
<Custom Action="UpdatePSShortcut" After="RemoveGalleryModules">NOT Installed</Custom>
132-
<Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
133-
</InstallExecuteSequence>
134-
135105
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
136106
<UIRef Id="WixUI_Minimal" />
137107
<WixVariable Id="WixUIBannerBmp" Value="media\bannrbmp.bmp" />

0 commit comments

Comments
 (0)