Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
7738ff9
Fix New-AzureDeployment cmdlet
hyonholee Oct 9, 2015
9b1d98a
Update ASM AzureRT test setup
hyonholee Oct 9, 2015
fe8c01e
Update DMLib.
EmmaZhu Nov 23, 2015
e58bbf8
new cmdlet: delete dsc config
balukambala Dec 1, 2015
c0af461
sln merge fix
balukambala Dec 1, 2015
f732887
fixed code review comments
balukambala Dec 2, 2015
e282418
Adds search and saved search powershell cmdlets
chfunk Dec 4, 2015
3cc4006
Add session records
chfunk Dec 4, 2015
81fd5a4
Fix xml help file
chfunk Dec 4, 2015
e87a327
Fix format xml
chfunk Dec 4, 2015
4ade1f0
Define storage cmdlets aliases in AzureStorageStartup.ps1
EmmaZhu Dec 12, 2015
0fb7696
Merge branch 'release-1.0.2' of https://github.com/Azure/azure-powers…
EmmaZhu Dec 12, 2015
553b88e
Make sure session records are copied and add code review fixes
chfunk Dec 15, 2015
d3a01ba
Update session records
chfunk Dec 15, 2015
919f0f2
Fixed functions that take id's as parameters
chfunk Dec 17, 2015
5793f02
Adopt DMLib 0.2.0
EmmaZhu Dec 17, 2015
e375c18
Updated display message while deleting the config
balukambala Dec 18, 2015
b379fd8
Added cmdlet to delete Node configuration
balukambala Dec 18, 2015
cb1c81e
Updated help message
balukambala Dec 18, 2015
fb59b41
Fix some minor issue for Get-AzureServiceDiagnosticsExtension. 1) Mak…
yantang-msft Dec 18, 2015
0d3cd53
Added flag IgnoreNodeMappings
balukambala Dec 18, 2015
0879fbd
Fix the issue that when -Role is not specified, Remove-AzureServiceDi…
yantang-msft Dec 21, 2015
49d8ed3
Revert the change so ServiceName is not a mandatory parameter when ge…
yantang-msft Dec 21, 2015
5065efb
Resolve a build issue.
EmmaZhu Dec 21, 2015
8ed26ca
Fix the bug that user must first remove the extension before applying…
yantang-msft Dec 21, 2015
ce2ffc2
Deleting node config if there is no mapping also without switch param…
balukambala Dec 21, 2015
e8c7c11
Make Set-AzureServiceDiagnosticsExtension command able to read .wadcf…
yantang-msft Dec 21, 2015
9023890
Add StorageAccountName, StorageAccountKey, StorageAccountEndpoint as …
yantang-msft Dec 22, 2015
eb44b9d
Fixes for code review
chfunk Dec 23, 2015
ba6bd5d
Make New-AzureServiceDiagnosticsExtensionConfig also accept storage r…
yantang-msft Dec 23, 2015
1f41627
Some minor improvements.
yantang-msft Dec 23, 2015
cfac4b4
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
EmmaZhu Dec 23, 2015
89ac373
Add parameter -DiagnosticsConfiguration, so the Set-AzureServiceDiagn…
yantang-msft Dec 23, 2015
d278c4f
Add test cases for cloud service diagnostics extension commands
yantang-msft Dec 25, 2015
1e17b0f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
EmmaZhu Dec 28, 2015
0e5c609
Move some utility functions to DiagnosticsHelper, so it can be used b…
yantang-msft Dec 31, 2015
746443b
Apply the storage validation logic to IaaS.
yantang-msft Jan 4, 2016
8c93c76
Start-AARunbook with Wait
safeermohammed Jan 4, 2016
4bf6139
Adds force and confirm for saved searches
chfunk Jan 5, 2016
9b4d8c1
Add Subscription ID property
Bpoe Jan 7, 2016
905d3bb
Merge pull request #12 from Bpoe/dev
safeermohammed Jan 8, 2016
624cb18
Some minor changes to make the code more readable
yantang-msft Jan 8, 2016
2fc985b
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Jan 11, 2016
f3fcdb8
Fix issue of cannot create a storage context with azure environment.
EmmaZhu Jan 11, 2016
73f1db1
Mark scenario test record file as Copy Always. Otherwise it will fail…
yantang-msft Jan 11, 2016
07ae246
Disabling passing Parameters value from pipeline per Bug 1731159
Bpoe Jan 11, 2016
6c9059d
Merge pull request #13 from Bpoe/dev
safeermohammed Jan 11, 2016
e65464d
Merge pull request #1635 from Azure/master
Jan 13, 2016
dca94b6
support OS Version in Get-AzureRole
takekazuomi Jan 13, 2016
e6a42fa
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
EmmaZhu Jan 13, 2016
3f58181
Fix a PowerShell test for Fairfax environment
pomortaz Jan 13, 2016
b6971e9
-wait with object
safeermohammed Jan 13, 2016
01c9abd
Merge pull request #1642 from pomortaz/dev
Jan 13, 2016
0e2dd8d
Removing StartedBy param addition. Adding StartedBy property to job o…
Bpoe Jan 13, 2016
0dd816c
Merge pull request #1 from AzureAutomationTeam/dev
Bpoe Jan 13, 2016
612c7de
Merge pull request #1638 from takekazuomi/osversion
Jan 13, 2016
c267c94
white space alignment in RoleContext
Jan 13, 2016
f979353
Move exception messages to resource file
yantang-msft Jan 13, 2016
b477224
Merge pull request #1644 from hovsepm/dev
Jan 13, 2016
02ac8a9
Merge pull request #1614 from yantang-msft/IaaS
Jan 14, 2016
ab9a469
RDBug 5516712:[PSH] We should add help for the behavior change of Get…
blueww Jan 14, 2016
774faf0
Support json config file for diagnostics extension
yantang-msft Jan 14, 2016
91e1858
Merge pull request #1652 from Azure/master
Jan 14, 2016
75c7647
string change
safeermohammed Jan 14, 2016
d72ac68
Latest changes from team
safeermohammed Jan 14, 2016
56bdd81
Reverted the nuget package id
balukambala Jan 14, 2016
b6f700c
Added trailing backslash to PSMoudlePath during msi installation.
Jan 14, 2016
ed5b592
Merge branch 'dev' of github.com:Azure/azure-powershell into trailing…
Jan 14, 2016
65adca4
Enable package restore
chfunk Jan 15, 2016
e2e8f45
Add ServiceClientTracingInterceptor to PSCmdlet
Jan 15, 2016
65926d3
Merge pull request #14 from Bpoe/dev
safeermohammed Jan 15, 2016
c93c6f8
Merge remote-tracking branch 'upstream/dev' into dev
chfunk Jan 15, 2016
51f3836
Remove nuget references
chfunk Jan 15, 2016
cbe447e
fixed[#111792922] Add-AzureRmAccount :: Incorrect credentials aren't …
Jan 15, 2016
8e4121b
Added test to handle Adal Exception during login.
Jan 15, 2016
793c806
Fix session record
chfunk Jan 15, 2016
ffc60d5
Fixed tests errors.
Jan 16, 2016
d639661
Resolve the issue that cannot upload blob with 0 size..
EmmaZhu Jan 15, 2016
957b831
Use error messages in TransferException's InnerException for that DML…
EmmaZhu Jan 18, 2016
c4b554f
Should return more meaningful error message when the input blob type …
EmmaZhu Jan 19, 2016
cd763f2
Update-AzureRM now only updates when need unless -Force is used
SimonWahlin Jan 19, 2016
a752edd
Merge pull request #1667 from hovsepm/dev
Jan 19, 2016
6956627
updated type from false to force
SimonWahlin Jan 19, 2016
c3bd49a
updated typo from false to force
SimonWahlin Jan 19, 2016
4c1173a
Merge branch 'dev' of github.com:Azure/azure-powershell into trailing…
Jan 19, 2016
0342f3a
Minor refactoring: changed ServiceClientTracingListener.cs to Service…
Jan 19, 2016
31ae30f
Merge pull request #1662 from haocs/trailingslash-fix
Jan 19, 2016
6cc3cf8
Updated AzureRm module to include major versions for each package
Jan 19, 2016
3fade8b
Merge pull request #1679 from SimonWahlin/Fix-Update-AzureRM
Jan 20, 2016
b083a01
Typo fix in the comments
Jan 20, 2016
4f5dd00
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Jan 20, 2016
f1144eb
Addressed review comments
Jan 20, 2016
1fc95aa
Merge pull request #1678 from hovsepm/dev
Jan 20, 2016
0eff60e
Merge branch 'dev' of https://github.com/wastoresh/azure-powershell i…
EmmaZhu Jan 20, 2016
0a50a85
Merge branch 'newdmlib' of https://github.com/wastoresh/azure-powersh…
EmmaZhu Jan 20, 2016
59604a5
Added telemetry to PowerShell ARM and ASM cmdlets.
Jan 20, 2016
ef5e61a
Start-AACmdlet Timeout to 10800
safeermohammed Jan 20, 2016
6aba7e4
Merge branch 'dev' of https://github.com/AzureAutomationTeam/azure-po…
safeermohammed Jan 20, 2016
1da8425
Changed Telemetry exception message to exclude user specific informat…
Jan 20, 2016
6e49043
Merge pull request #1686 from hovsepm/dev
stankovski Jan 20, 2016
a4c4988
Fixed Newtonsoft.Json dependency 6.0.4, 6.0.6 -> 6.0.8
Jan 20, 2016
c85f94c
Aligned Odata and Edm references to 5.6.0, 5.6.2 -> 5.6.4
Jan 20, 2016
1375ab7
Merge pull request #1661 from independentwork/dev
Jan 20, 2016
d1e9b48
Merge pull request #1689 from hovsepm/dev
Jan 20, 2016
dae76d6
Merge branch 'dev' of github.com:Azure/azure-powershell into ODataFix
Jan 20, 2016
1292175
Regenerated wxi file
Jan 21, 2016
c2c4c86
Resolve some minor code review comments
yantang-msft Jan 21, 2016
6acb9fa
Reference 3.2.0 version of Microsoft.WindowsAzure.ConfigurationManager
Jan 21, 2016
51485b4
Aligned Microsoft.Data.Services.Client , OData and Edm packages acros…
Jan 21, 2016
b3cd1a5
Fixed Newtonsoft.Json once more
Jan 21, 2016
b6150c0
Merge pull request #1692 from hovsepm/dev
Jan 21, 2016
e51c883
Merge pull request #1690 from hovsepm/ODataFix
Jan 21, 2016
98cfd6c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
hyonholee Jan 21, 2016
9f343ff
Updated Hyak.Common to version 1.0.3
Jan 21, 2016
bc491a4
Updated Spatial versions 5.6.0, 5.6.2 -> 5.6.4
Jan 21, 2016
45489d7
Fixed DataLake wrong package reference in packages.config
Jan 21, 2016
88bc078
Fix Set-AzureDiskEncryptionExtension issue dut to client library update
hyonholee Jan 21, 2016
dce7a1a
Updated Microsoft.Azure.Management.Resources to version 2.18.11-preview
Jan 21, 2016
593816a
Revert unnecessary change
hyonholee Jan 21, 2016
f5b9356
Fixed ASM mock tests build failure for Resource Library
Jan 21, 2016
80754b9
RemoteApp Organizational Unit accepts unicode characters
zaevans Jan 21, 2016
94a6829
RemoteApp Organizational Unit accepts unicode characters
zaevans Jan 21, 2016
dfc4cf3
Merge pull request #1693 from hovsepm/dev
Jan 21, 2016
f279e59
Merge branch 'azureDev' into zaevansDev
zaevans Jan 21, 2016
93c9156
Added size limit for debug stream queue as well as unit test.
Jan 21, 2016
2b50322
Merge branch 'dev' of github.com:Azure/azure-powershell into bugfix
Jan 21, 2016
1336ba8
Merge pull request #1698 from haocs/bugfix
Jan 21, 2016
4b9ba97
Update ChangeLog.md
Jan 21, 2016
5ff699e
Updated WindowsAzure.Storage package reference for
Jan 21, 2016
fdafd00
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Jan 21, 2016
d0573f3
Merge branch 'azureDev' into zaevansDev
zaevans Jan 21, 2016
56ab638
Added changes to changelog
zaevans Jan 21, 2016
f337217
Bumped up ASM.HDInsight reference of WindowsAzure.Storage to version 6.0
Jan 21, 2016
363e815
Merge pull request #15 from balukambala/dev
safeermohammed Jan 22, 2016
af9ca94
Fix check-in test failures by recording sessions.
EmmaZhu Jan 22, 2016
aa496e3
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Jan 22, 2016
4483f1a
Resolve test failures by re-recording.
EmmaZhu Jan 22, 2016
8e0711f
Fixed removing key vault access policy when the service principal is …
pomortaz Jan 22, 2016
1fa7322
Don't send value/reference to JSON serialization if it is null.
linweigao Jan 22, 2016
4d1a5a7
fixed reference to HDInsightJob and Insights SDK nuget package
Jan 22, 2016
bee3257
Get ride of startmenu shortcut of msi.
Jan 22, 2016
9efaa8b
Merge branch 'dev' of github.com:Azure/azure-powershell into bugfix
Jan 22, 2016
308678f
Merge pull request #1704 from pomortaz/dev
Jan 22, 2016
5c08105
Merge pull request #1699 from zaevans/zaevansDev
Jan 22, 2016
abb3cbf
Merge pull request #1705 from linweigao/dev
mayurid Jan 22, 2016
dee1e68
Merge pull request #1701 from hovsepm/dev
Jan 23, 2016
cd26014
Merge pull request #1706 from haocs/bugfix
Jan 23, 2016
9d076fd
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Jan 23, 2016
bd5cdd0
Upgrade XSCL from 6.0 to 6.1
EmmaZhu Jan 23, 2016
a8d71d9
Added scenario tests for Azure automation
balukambala Jan 25, 2016
79e3815
Update ADF OM.
Jan 25, 2016
024d42f
Merge branch 'dev' of https://github.com/AzureAutomationTeam/azure-po…
balukambala Jan 25, 2016
6c6ca2d
made changes to fix nodeid/reportid issue
balukambala Jan 25, 2016
0c240ce
fixed spelling
balukambala Jan 25, 2016
909bd3d
Merge pull request #1709 from yitao-zhang/dev
Jan 25, 2016
a0a4924
fixed test cmdlets to use new version 'Rm'
balukambala Jan 25, 2016
4a33c53
Merge pull request #1694 from hyonholee/hotfix
Jan 25, 2016
059d020
Add cmdlet documentation for Azure SQL Server communication links
adumitr Jan 25, 2016
862f6ce
Merge pull request #16 from balukambala/dev
safeermohammed Jan 26, 2016
c9a7419
Resolving Merge Conflixt
safeermohammed Jan 26, 2016
5e2989f
Fix storage scenario test failures.
EmmaZhu Jan 26, 2016
eaf716c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Jan 26, 2016
9c23be2
Fixing test project reference
safeermohammed Jan 26, 2016
30a8f01
Merge pull request #1684 from wastoresh/dev
Jan 26, 2016
192d3f2
Addressed review comments
safeermohammed Jan 26, 2016
537e844
Merge pull request #1708 from yantang-msft/JsonConfig
Jan 26, 2016
37ba219
Updating Authentication and Resources SDK to the latest version.
Jan 26, 2016
6ffd053
Bumped up all Authentication library references to 1.6.1
Jan 26, 2016
6a467a9
Merge branch 'AuthenticationResources' of github.com:hovsepm/azure-po…
Jan 26, 2016
0dcb284
Merge pull request #1718 from hovsepm/AuthenticationResources
Jan 27, 2016
e453f3c
Added warning if the selected Subscription is not in the Enabled stat…
Jan 27, 2016
78e2cdf
Update graph and resources client, Ad changes from Shubham's fork
vivsriaus Jan 27, 2016
e2712ba
Fixed test failures
Jan 27, 2016
7e0b393
Set the graph endpoint in tests
vivsriaus Jan 27, 2016
41952e4
Merge pull request #1712 from adumitr/cross_server_gt
Jan 27, 2016
1d15258
Merge pull request #1722 from hovsepm/dev
Jan 27, 2016
9313bd9
Changed skip message to need x64 test framework per azure team
safeermohammed Jan 27, 2016
09e5d63
fixed Commands.Automation.Test test dll reference.
safeermohammed Jan 27, 2016
496a575
New records for failing AdUser tests
vivsriaus Jan 27, 2016
1f54522
New records
vivsriaus Jan 27, 2016
6a73f2a
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Jan 27, 2016
ccfae47
Added pagination in Get-AzureRmSubscription cmdlet
Jan 27, 2016
f4f8202
Add new Microsoft.Azure.TestFramework binaries
vivsriaus Jan 27, 2016
919a583
Update one test
vivsriaus Jan 27, 2016
4cd750e
Revert to old Test Framework version
vivsriaus Jan 27, 2016
776ad94
fixed Commands.Automation.Test test dll reference for system.managame…
safeermohammed Jan 27, 2016
74ad69c
Enable OS detection.
Jan 27, 2016
2c45093
Initial DataCollection Change
TravisEz13 Oct 27, 2015
99331b3
Address Code review comments
TravisEz13 Oct 28, 2015
6793064
Move DataCollection into the Privacy node of the Extension Settings
TravisEz13 Nov 3, 2015
f9e4b37
Merge pull request #1728 from hovsepm/dev
Jan 28, 2016
86a7bbc
Merge pull request #1730 from haocs/fix
Jan 28, 2016
ff2b6e9
Update help
TravisEz13 Jan 28, 2016
80f8c52
Merge pull request #1714 from AzureAutomationTeam/dev
Jan 28, 2016
41e0ddd
bumped up everyone for version 1.9.0
Jan 28, 2016
f7e4cbe
Merge pull request #1732 from hovsepm/DependencyTest
Jan 28, 2016
a76073f
Support collection query in resource get
vivsriaus Jan 28, 2016
4597b0f
Remove the commented line
vivsriaus Jan 28, 2016
b7d3a4d
Merge pull request #1734 from vivsriaus/CollectionGet
Jan 28, 2016
8673816
adding azurestack admin powershell cmdlets
bganapa Jan 27, 2016
8d64a59
published package version changes from 0.9.01 to 0.9.1
bganapa Jan 28, 2016
7c05895
Azure Stack Storage Admin PowerShell cmdlets with testing
Jan 28, 2016
27cafb2
remove local temp files commit by mistake
Jan 28, 2016
4f9dc01
Removing the app.config reference in the csproj file
bganapa Jan 28, 2016
066bde1
Merge branch 'dev' of https://github.com/bganapa/azure-powershell int…
bganapa Jan 28, 2016
4d273d3
fixing csproj files and packages
bganapa Jan 28, 2016
5904e07
Bumped up installer and AzureRm module versions.
Jan 28, 2016
9d8d62d
setup changes for azurestackstorage
bganapa Jan 28, 2016
449b775
Bumped up module versions.
Jan 28, 2016
c7b444f
Merge remote-tracking branch 'hovsepm/release-1.2.0' into release
bganapa Jan 28, 2016
9d444a3
bumped up AzureRM.psm1 versions
Jan 28, 2016
dc11faf
adding a description for azurestack modules in the changelog
bganapa Jan 29, 2016
d0eafdc
Merge pull request #1740 from hovsepm/release-1.2.0
Jan 29, 2016
06e721c
Merge remote-tracking branch 'upstream/release-1.2.0' into release
bganapa Jan 29, 2016
fd712a3
Revert ARM to package using older api version
vivsriaus Jan 29, 2016
c92b2dd
Update profile to use latest ARM
vivsriaus Jan 29, 2016
ab1c665
updating csproj references and including psd1 file in setup
bganapa Jan 29, 2016
e12e19b
Merge pull request #1743 from vivsriaus/RevertApiVersion
Jan 29, 2016
f4aa9e6
Merge pull request #1741 from bganapa/release
Jan 29, 2016
23fa0ce
Fixed on demand job failing tests.
Jan 29, 2016
8025934
Update ChangeLog.md
Jan 29, 2016
a51d518
Change DMLib to 5.0.1
EmmaZhu Jan 29, 2016
2176efd
Merge pull request #1744 from hovsepm/release-1.2.0
Jan 29, 2016
83e41cb
Merge branch 'release-1.2.0' of github.com:Azure/azure-powershell int…
Jan 29, 2016
1033da5
Fixed couple of test project nuget references
Jan 29, 2016
e85f962
Merge pull request #1748 from hovsepm/storage
Jan 29, 2016
d3e43d0
Merge pull request #1749 from dscsolutions/DataCollectionRb2
Jan 29, 2016
ca4858e
nit fix of referenced assembly names.
Jan 30, 2016
ba25fb2
Fixed casing for AzureRM.AzureStackAdmin
Jan 30, 2016
4e40cc5
Merge pull request #1751 from hovsepm/release-1.2.0
Jan 30, 2016
2e61316
Remove invalid help for Set-AzureRMVMChecfExtension cmdlet
markcowl Feb 1, 2016
d62e893
Merge pull request #1756 from markcowl/fixhelp
Feb 1, 2016
991e6f1
Fixed AzureRM module script.
Feb 1, 2016
95fe1e1
Merge pull request #1757 from hovsepm/release-1.2.0
Feb 1, 2016
8411c23
Update ChangeLog.md
Feb 3, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
## 2016.02.03 version 1.2.0
* Azure RemoteApp:
* Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
* Azure Stack Admin:
* New module for the management of azure stack administrative resources such as plan, offer, subscription, resource provider and
gallery items.
* Azure Stack Storage Admin:
* New module for the management of azure stack storage administrative resources such as configuration, infrastructure and health.
* Azure Operational Insights new cmdlets:
* Get-AzureRmOperationalInsightsSavedSearch
* Get-AzureRmOperationalInsightsSavedSeearchResults
* Get-AzureRmOperationalInsightsSavedSearches
* Get-AzureRmOperationalInsightsSchema
* Get-AzureRmOperationalInsightsSearchResult
* Get-AzureRmOperationalInsightsSearchResultUpdate
* Remove-AzureRmOperationalInsightsSavedSearch
* Remove-AzureRmOperationalInsightsSavedSearch
* Set-AzureRmOperationalInsightsSavedSearch
* Add-AzureRmAccount fixed issue with wrong credential message
* Get-AzureRmSubscription cmdlet now returns paginated results
* Update-AzureRM now only updates when need unless -Force is used
* Added telemetry to ARM and ASM cmdlets

## 2016.01.12 version 1.1.0
* Azure SQL Database: Threat Detection policies:
* Using new Threat Detection Types
Expand Down
40 changes: 5 additions & 35 deletions setup/azurecmd.wxs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

<?define productName="Microsoft Azure PowerShell - January 2016" ?>
<?define productName="Microsoft Azure PowerShell - February 2016" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="1.1.0" ?>
<?define versionedStartMenuFolder="Microsoft Azure" ?>
<?define staleStartMenuFolder="Windows Azure" ?>
<?define version="1.2.0" ?>

<Product Id="*"
Name="$(var.productName)"
Expand All @@ -31,11 +29,11 @@
<RegistrySearch Id="PSCOMPATIBLEVERSION" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine" Name="PSCompatibleVersion" Type="raw" />
</Property>

<SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules" Before="AppSearch">
<SetProperty Action="SetBase64" Id="BaseModulesFolder" Value="[ProgramFiles64Folder]WindowsPowerShell\Modules\" Before="AppSearch">
VersionNT64
</SetProperty>

<SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules" Before="AppSearch">
<SetProperty Action="SetBase32" Id="BaseModulesFolder" Value="[ProgramFilesFolder]WindowsPowerShell\Modules\" Before="AppSearch">
NOT VersionNT64
</SetProperty>

Expand Down Expand Up @@ -63,10 +61,6 @@
</Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="AzureSdkMenu" Name="$(var.versionedStartMenuFolder)"/>
<Directory Id="StaleAzureSdkMenu" Name="$(var.staleStartMenuFolder)"/>
</Directory>
</Directory>

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

Expand All @@ -97,41 +91,17 @@
</Component>
</DirectoryRef>

<DirectoryRef Id="AzureSdkMenu">
<Component Id="AzureSdkShortcut" Guid="A9B58A22-F746-451D-8840-F887D8014C3C">
<Shortcut Id="AzureSdkStartMenuShortcut"
Name="Microsoft Azure PowerShell"
Description="Microsoft PowerShell cmdlets"
Target="[POWERSHELLPATH]\powershell.exe"
Arguments="-NoExit -ExecutionPolicy Bypass -File &quot;[PowerShellFolder]ServiceManagement\Azure\Services\ShortcutStartup.ps1&quot;"/>
<RemoveFolder Id="AzureSdkMenu" On="uninstall"/>
<RemoveFile Id="RemoveStaleFiles" Directory="StaleAzureSdkMenu" Name="Windows Azure PowerShell.lnk" On="both"/>
<RegistryValue Root="HKCU" Key="SOFTWARE\Microsoft\Microsoft SDKs\WindowsAzure\$(var.version)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>

<Feature Id="azurecmd" Title="Microsoft Azure PowerShell" Level="1" Description="Windows PowerShell commandlets">
<ComponentGroupRef Id="azurecmdfiles" />
<ComponentRef Id="PSModulePath.System" />
<ComponentRef Id="AzureSdkShortcut" />
<ComponentRef Id="AzureSdkExecutionPolicyScript" />
<ComponentRef Id="AzureSdkRemoveModulesScript" />
</Feature>

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

<InstallExecuteSequence>
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
<Custom Action="RemoveGalleryModules" After="SetCustomActionDataValue">NOT Installed</Custom>
<Custom Action="UpdatePSShortcut" After="RemoveGalleryModules">NOT Installed</Custom>
<Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
</InstallExecuteSequence>

<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
<UIRef Id="WixUI_Minimal" />
<WixVariable Id="WixUIBannerBmp" Value="media\bannrbmp.bmp" />
Expand Down
Loading