From 9afe8e5a56ee71046c274a74fe8f36521745a2b9 Mon Sep 17 00:00:00 2001 From: markcowl Date: Mon, 19 Oct 2015 11:11:04 -0700 Subject: [PATCH 1/7] Adding in execution policy update --- setup/azurecmd.wxs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index 1bae7ad67941..dcaa26e0212c 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -39,6 +39,8 @@ NOT VersionNT64 + + @@ -114,10 +116,12 @@ + NOT Installed NOT Installed + NOT Installed From e7ca8af484d3003e374df6a90aac22f9606d7023 Mon Sep 17 00:00:00 2001 From: markcowl Date: Mon, 19 Oct 2015 12:48:17 -0700 Subject: [PATCH 2/7] Update installer and installer generate process to remove AzureResourceManager.psd1, Update paths, add set execution policy task, update versions due to common.authentication public OM change --- setup/azurecmd.wxs | 2 +- setup/azurecmdfiles.wxi | 24 +++++++++++++++---- src/Common/Storage/Azure.Storage.psd1 | 2 +- .../ApiManagement/AzureRM.ApiManagement.psd1 | 2 +- .../Automation/AzureRM.Automation.psd1 | 2 +- .../AzureBackup/AzureRM.Backup.psd1 | 2 +- .../AzureBatch/AzureRM.Batch.psd1 | 2 +- .../Compute/AzureRM.Compute.psd1 | 2 +- .../DataFactories/AzureRM.DataFactories.psd1 | 2 +- src/ResourceManager/Dns/AzureRM.Dns.psd1 | 2 +- .../HDInsight/AzureRM.HDInsight.psd1 | 2 +- .../Insights/AzureRM.Insights.psd1 | 2 +- .../KeyVault/AzureRM.KeyVault.psd1 | 2 +- .../Network/AzureRM.Network.psd1 | 2 +- .../AzureRM.OperationalInsights.psd1 | 2 +- .../Profile/AzureRM.Profile.psd1 | 2 +- .../RedisCache/AzureRM.RedisCache.psd1 | 2 +- .../Resources/AzureRM.Resources.psd1 | 2 +- .../SiteRecovery/AzureRM.SiteRecovery.psd1 | 2 +- src/ResourceManager/Sql/AzureRM.Sql.psd1 | 2 +- .../Storage/AzureRM.Storage.psd1 | 2 +- .../AzureRM.StreamAnalytics.psd1 | 2 +- src/ResourceManager/Tags/AzureRM.Tags.psd1 | 2 +- .../AzureRM.TrafficManager.psd1 | 2 +- .../AzureRM.UsageAggregates.psd1 | 2 +- .../Websites/AzureRM.Websites.psd1 | 2 +- tools/Installer/generate.ps1 | 2 ++ 27 files changed, 47 insertions(+), 29 deletions(-) diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index dcaa26e0212c..3827767a6ad6 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -89,7 +89,7 @@ - + diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 1057e8bca48b..d04e6c3d2805 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -4,9 +4,6 @@ - - - @@ -504,6 +501,9 @@ + + + @@ -1165,6 +1165,9 @@ + + + @@ -1191,6 +1194,9 @@ + + + @@ -1408,6 +1414,9 @@ + + + @@ -1860,6 +1869,9 @@ + + + @@ -4425,7 +4437,6 @@ - @@ -4588,6 +4599,7 @@ + @@ -4805,6 +4817,7 @@ + @@ -4813,6 +4826,7 @@ + @@ -4884,6 +4898,7 @@ + @@ -5032,6 +5047,7 @@ + diff --git a/src/Common/Storage/Azure.Storage.psd1 b/src/Common/Storage/Azure.Storage.psd1 index 40c802de1bfe..695da30a9b31 100644 --- a/src/Common/Storage/Azure.Storage.psd1 +++ b/src/Common/Storage/Azure.Storage.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.1' +ModuleVersion = '0.10.2' # ID used to uniquely identify this module GUID = '00612bca-fa22-401d-a671-9cc48b010e3b' diff --git a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 index 1c9d78acc997..17550cc4d0df 100644 --- a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 +++ b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13' diff --git a/src/ResourceManager/Automation/AzureRM.Automation.psd1 b/src/ResourceManager/Automation/AzureRM.Automation.psd1 index 2eb24fb608e0..845bc92c3a36 100644 --- a/src/ResourceManager/Automation/AzureRM.Automation.psd1 +++ b/src/ResourceManager/Automation/AzureRM.Automation.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3' diff --git a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 index de4a65774490..887ff6c4aa34 100644 --- a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 +++ b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4' diff --git a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 index f37c80a0731f..fb0d32d14a76 100644 --- a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 +++ b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf' diff --git a/src/ResourceManager/Compute/AzureRM.Compute.psd1 b/src/ResourceManager/Compute/AzureRM.Compute.psd1 index 007c20830ef2..f6e305e60de4 100644 --- a/src/ResourceManager/Compute/AzureRM.Compute.psd1 +++ b/src/ResourceManager/Compute/AzureRM.Compute.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37' diff --git a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 index 1e187935a9ba..bd4165713c01 100644 --- a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 +++ b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d' diff --git a/src/ResourceManager/Dns/AzureRM.Dns.psd1 b/src/ResourceManager/Dns/AzureRM.Dns.psd1 index b5c380a00ee3..1daaf7f4e6c7 100644 --- a/src/ResourceManager/Dns/AzureRM.Dns.psd1 +++ b/src/ResourceManager/Dns/AzureRM.Dns.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '5e5ed8bc-27bf-4380-9de1-4b22ba0920b2' diff --git a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 index e7c2987b6e5a..4372cd0163d0 100644 --- a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 +++ b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '3fd1475f-cb23-4ffb-bf08-33d94b7d1acb' diff --git a/src/ResourceManager/Insights/AzureRM.Insights.psd1 b/src/ResourceManager/Insights/AzureRM.Insights.psd1 index 09964ef0e789..5a243ef424bb 100644 --- a/src/ResourceManager/Insights/AzureRM.Insights.psd1 +++ b/src/ResourceManager/Insights/AzureRM.Insights.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '698c387c-bd6b-41c6-82ce-721f1ef39548' diff --git a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 index a0e053c3cfef..f62f8f0bf805 100644 --- a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 +++ b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'fa236c1f-6464-4d6a-a48d-db47c0e7923d' diff --git a/src/ResourceManager/Network/AzureRM.Network.psd1 b/src/ResourceManager/Network/AzureRM.Network.psd1 index 6755c9615aa1..d8121bd3abf4 100644 --- a/src/ResourceManager/Network/AzureRM.Network.psd1 +++ b/src/ResourceManager/Network/AzureRM.Network.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'eb75c732-e274-4a20-b502-e9958e63484a' diff --git a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 index 27e3577c057b..f1f57bb89476 100644 --- a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 +++ b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'e827799a-7abf-4538-a61f-94dc52a48bd4' diff --git a/src/ResourceManager/Profile/AzureRM.Profile.psd1 b/src/ResourceManager/Profile/AzureRM.Profile.psd1 index 7f7e795f2a4a..e3c9ca9d0b47 100644 --- a/src/ResourceManager/Profile/AzureRM.Profile.psd1 +++ b/src/ResourceManager/Profile/AzureRM.Profile.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '342714fc-4009-4863-8afb-a9067e3db04b' diff --git a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 index 5f2b40ccd5ff..acb96fb30fc1 100644 --- a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 +++ b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '820628d7-6938-488a-8760-43373a5ffce6' diff --git a/src/ResourceManager/Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.psd1 index f7890b0226f7..35728df6e21c 100644 --- a/src/ResourceManager/Resources/AzureRM.Resources.psd1 +++ b/src/ResourceManager/Resources/AzureRM.Resources.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'ab3ca893-26fe-44b0-bd3c-8933df144d7b' diff --git a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 index 67eba130c34d..3a5bc22f667c 100644 --- a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 +++ b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'd1de7560-48e1-48f3-bc8c-4eea3af2bbe1' diff --git a/src/ResourceManager/Sql/AzureRM.Sql.psd1 b/src/ResourceManager/Sql/AzureRM.Sql.psd1 index eb25701f91f7..0d93078aac2c 100644 --- a/src/ResourceManager/Sql/AzureRM.Sql.psd1 +++ b/src/ResourceManager/Sql/AzureRM.Sql.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '150d9544-6348-4373-806f-10cd0b4de4cb' diff --git a/src/ResourceManager/Storage/AzureRM.Storage.psd1 b/src/ResourceManager/Storage/AzureRM.Storage.psd1 index 1397ef5c9313..174e7a92ed1d 100644 --- a/src/ResourceManager/Storage/AzureRM.Storage.psd1 +++ b/src/ResourceManager/Storage/AzureRM.Storage.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.1' +ModuleVersion = '0.10.2' # ID used to uniquely identify this module GUID = 'da67eaa7-4cb1-4bfa-a194-8bf3faae8ac5' diff --git a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 index d46f9efa833b..a9ea2edf1061 100644 --- a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 +++ b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '59713673-194f-418a-b1f2-ac60db82edf9' diff --git a/src/ResourceManager/Tags/AzureRM.Tags.psd1 b/src/ResourceManager/Tags/AzureRM.Tags.psd1 index 0d078baf8a62..93a8b97f33dc 100644 --- a/src/ResourceManager/Tags/AzureRM.Tags.psd1 +++ b/src/ResourceManager/Tags/AzureRM.Tags.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '59713673-194f-418a-b1f2-ac60db82edf9' diff --git a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 index 7e666e8cf3bf..d01ff1f7bdd0 100644 --- a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 +++ b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = '59713673-194f-418a-b1f2-ac60db82edf9' diff --git a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 index 8f72d515bf3a..52ebf3b0b4c5 100644 --- a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 +++ b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'e43e47c8-8bff-4013-b003-ded1741f403a' diff --git a/src/ResourceManager/Websites/AzureRM.Websites.psd1 b/src/ResourceManager/Websites/AzureRM.Websites.psd1 index 0d484a1bfd51..a952ec80f873 100644 --- a/src/ResourceManager/Websites/AzureRM.Websites.psd1 +++ b/src/ResourceManager/Websites/AzureRM.Websites.psd1 @@ -9,7 +9,7 @@ @{ # Version number of this module. -ModuleVersion = '0.10.0' +ModuleVersion = '0.10.1' # ID used to uniquely identify this module GUID = 'cc69c625-e961-43f4-8b50-0061eba6e4b6' diff --git a/tools/Installer/generate.ps1 b/tools/Installer/generate.ps1 index eef23adce6f5..bb0173e743e8 100644 --- a/tools/Installer/generate.ps1 +++ b/tools/Installer/generate.ps1 @@ -32,6 +32,8 @@ Write-Verbose "The output folder is set to $output" $serviceManagementPath = Join-Path $output "ServiceManagement\Azure" $resourceManagerPath = Join-Path $output "ResourceManager\AzureResourceManager" +Write-Verbose "Removing unneeded psd1 file for AzureResourceManager" +Remove-Item -Force $resourceManagerPath\AzureResourceManager.psd1 -ErrorAction SilentlyContinue Write-Verbose "Removing duplicated Resources folder" Remove-Item -Recurse -Force $serviceManagementPath\Compute\Resources\ -ErrorAction SilentlyContinue Remove-Item -Recurse -Force $serviceManagementPath\Sql\Resources\ -ErrorAction SilentlyContinue From bceaad158a61a465242300cf6e59c21ee539178e Mon Sep 17 00:00:00 2001 From: markcowl Date: Tue, 20 Oct 2015 01:15:45 -0700 Subject: [PATCH 3/7] Adding executionpolicy change command --- setup/Setup/SetExecutionPolicy.ps1 | 25 +++++++++++++++++++++++++ setup/azurecmd.wxs | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 setup/Setup/SetExecutionPolicy.ps1 diff --git a/setup/Setup/SetExecutionPolicy.ps1 b/setup/Setup/SetExecutionPolicy.ps1 new file mode 100644 index 000000000000..79b355b0efc5 --- /dev/null +++ b/setup/Setup/SetExecutionPolicy.ps1 @@ -0,0 +1,25 @@ +# ---------------------------------------------------------------------------------- +# +# Copyright Microsoft Corporation +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ---------------------------------------------------------------------------------- + +Get-ExecutionPolicy -List | Where-Object {$_.ExecutionPolicy -eq "Restricted"} | +% { + try + { + Set-ExecutionPolicy -Scope $_.Scope -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue" + } + catch + { + # do not fail if execution policy cannot be set for this scope + } +} diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index 3827767a6ad6..57308e8b8b69 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -93,6 +93,12 @@ + + + + + + + - + NOT Installed From 00837360c32198c75040d1e8d854195c8dd0bb21 Mon Sep 17 00:00:00 2001 From: markcowl Date: Tue, 20 Oct 2015 11:13:13 -0700 Subject: [PATCH 4/7] Fixing policy script --- setup/Setup/SetExecutionPolicy.ps1 | 19 +++++++++---------- setup/azurecmd.wxs | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/setup/Setup/SetExecutionPolicy.ps1 b/setup/Setup/SetExecutionPolicy.ps1 index 79b355b0efc5..a704ba29b004 100644 --- a/setup/Setup/SetExecutionPolicy.ps1 +++ b/setup/Setup/SetExecutionPolicy.ps1 @@ -12,14 +12,13 @@ # limitations under the License. # ---------------------------------------------------------------------------------- -Get-ExecutionPolicy -List | Where-Object {$_.ExecutionPolicy -eq "Restricted"} | -% { - try - { - Set-ExecutionPolicy -Scope $_.Scope -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue" - } - catch - { - # do not fail if execution policy cannot be set for this scope - } + +try +{ + Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force -ErrorAction "SilentlyContinue" +} +catch +{ + # do not fail if execution policy cannot be set for this scope } + diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index 57308e8b8b69..b6dee135d280 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -123,7 +123,7 @@ - + NOT Installed From 83bae4371d22cfd144a757a9ba57437d71cd41c0 Mon Sep 17 00:00:00 2001 From: markcowl Date: Tue, 20 Oct 2015 11:21:37 -0700 Subject: [PATCH 5/7] Fixing shortcut startup file --- .../Services/Commands.Utilities/ShortcutStartup.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ServiceManagement/Services/Commands.Utilities/ShortcutStartup.ps1 b/src/ServiceManagement/Services/Commands.Utilities/ShortcutStartup.ps1 index 54b434483269..debce4aa79a0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/ShortcutStartup.ps1 +++ b/src/ServiceManagement/Services/Commands.Utilities/ShortcutStartup.ps1 @@ -22,10 +22,8 @@ $modulePath = Join-Path $(Split-Path (Get-ScriptDirectory)) "Azure.psd1" Import-Module $modulePath cd c:\ $welcomeMessage = @" -For a list of all Azure cmdlets type 'help azure'. +For a list of all Azure cmdlets type 'get-help azure'. For a list of Windows Azure Pack cmdlets type 'Get-Command *wapack*'. -For Node.js cmdlets type 'help node-dev'. -For PHP cmdlets type 'help php-dev'. "@ Write-Output $welcomeMessage From a8408b762e5380fa71f7179ce37466e6192d2929 Mon Sep 17 00:00:00 2001 From: markcowl Date: Tue, 20 Oct 2015 12:33:48 -0700 Subject: [PATCH 6/7] Adding reboot and updating executionpolicy script --- setup/azurecmd.wxs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index b6dee135d280..ca2d1e000279 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -123,12 +123,13 @@ - + NOT Installed NOT Installed NOT Installed + From 618e6e8eefa239193defe669aba255758e204c7e Mon Sep 17 00:00:00 2001 From: markcowl Date: Tue, 20 Oct 2015 13:57:29 -0700 Subject: [PATCH 7/7] removing forced reboot --- setup/azurecmd.wxs | 1 - 1 file changed, 1 deletion(-) diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index ca2d1e000279..80fd77a1afa0 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -129,7 +129,6 @@ NOT Installed NOT Installed NOT Installed -