Skip to content

Commit e7ca8af

Browse files
markcowlmarkcowl
committed
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
1 parent 9afe8e5 commit e7ca8af

27 files changed

+47
-29
lines changed

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
9090
<CreateFolder />
9191
<!-- Work around bug that PowerShell does not always consider default module paths. -->
92-
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
92+
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager;[PowerShellFolder]ServiceManagement" System="yes" />
9393
</Component>
9494
</DirectoryRef>
9595

‎setup/azurecmdfiles.wxi

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<DirectoryRef Id="PowerShellFolder">
55
<Directory Id="dirB60B5B1F56FA5598EFFC960CA393FDCE" Name="ResourceManager">
66
<Directory Id="dir9E409EB63EF03736275B51044C819FD8" Name="AzureResourceManager">
7-
<Component Id="cmp96F13C307DA6E4AAC35F3D147F21553F" Guid="*">
8-
<File Id="fil96C82365E5F5A2F2747805236B563DF0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureResourceManager.psd1" />
9-
</Component>
107
<Directory Id="dirF9A46FF3188BA8C006D8942FCEFE5108" Name="Azure.Storage">
118
<Component Id="cmp0761C025FCF8EF027A5BC23C72777C52" Guid="*">
129
<File Id="fil80798000B169AC6D62DD8331A55CF6FF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1" />
@@ -504,6 +501,9 @@
504501
<Component Id="cmpC7297788AE102ED861765ADE84F7A59B" Guid="*">
505502
<File Id="filEA714AAE425D2451466447C9AFFE825E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRmProfileStartup.ps1" />
506503
</Component>
504+
<Component Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" Guid="*">
505+
<File Id="fil6EA712045B160BE36B4A3D2068D50F9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\CheckVersions.ps1" />
506+
</Component>
507507
<Component Id="cmpCC409403AF670A9E0538AC743C61BD66" Guid="*">
508508
<File Id="fil68CB35902CE5A11BE50C9DE228B61D12" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Hyak.Common.dll" />
509509
</Component>
@@ -1165,6 +1165,9 @@
11651165
<Component Id="cmpD29EA01597258746011AE6EF9FC3D15A" Guid="*">
11661166
<File Id="filCE0262D8D43EF7AB4CDB25A0752B7121" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Net.Http.Primitives.dll" />
11671167
</Component>
1168+
<Component Id="cmp8EE8340753317C13D69F692E7E42B175" Guid="*">
1169+
<File Id="filAE60D28516977FE205BBEB3D15EB53DE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Spatial.dll" />
1170+
</Component>
11681171
</Directory>
11691172
<Directory Id="dir76147B1D381C34B7638F2A844B5685DC" Name="AzureRM.Network">
11701173
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
@@ -1191,6 +1194,9 @@
11911194
<Component Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" Guid="*">
11921195
<File Id="fil6D69005A7EDC2EEA35252F1E602D935C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRmProfileStartup.ps1" />
11931196
</Component>
1197+
<Component Id="cmp065EDC002BB63B6AA573F18152B7240F" Guid="*">
1198+
<File Id="fil559CC58FC4CFCF2A101739440A55FBC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\CheckVersions.ps1" />
1199+
</Component>
11941200
<Component Id="cmp02E49F28BB0FA3174A478847B857A4D0" Guid="*">
11951201
<File Id="fil379E46A4E79152D00FBBBF3BF85A0BA2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Hyak.Common.dll" />
11961202
</Component>
@@ -1408,6 +1414,9 @@
14081414
<Component Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" Guid="*">
14091415
<File Id="filAF2791E9DF9A44B6D0F375786A415C61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRmProfileStartup.ps1" />
14101416
</Component>
1417+
<Component Id="cmp9002DD73D47754F2109499247914700F" Guid="*">
1418+
<File Id="filA918B8D44812C6306881A86655EAA785" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\CheckVersions.ps1" />
1419+
</Component>
14111420
<Component Id="cmpD738842B230F04E64FD98E3E850E6338" Guid="*">
14121421
<File Id="fil73F9971478A8661859398F414D5BDE00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Hyak.Common.dll" />
14131422
</Component>
@@ -1860,6 +1869,9 @@
18601869
<Component Id="cmpA3B81935598199F5BE6572F3D46DD2C5" Guid="*">
18611870
<File Id="fil8741CCFD373A03733A72E5956154D8FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\ResourceManagerStartup.ps1" />
18621871
</Component>
1872+
<Component Id="cmpD50A1D50B7385232643B15A0E7CBAA57" Guid="*">
1873+
<File Id="fil433065D93BBE30A527CE610D0FCF2B08" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\SqlStartup.ps1" />
1874+
</Component>
18631875
<Component Id="cmp56F9151EB19BE7D5CE2655D19ADF5C9A" Guid="*">
18641876
<File Id="filDC634F6E7D9EEFF24385BE6034AB2EE4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\System.Net.Http.Extensions.dll" />
18651877
</Component>
@@ -4425,7 +4437,6 @@
44254437
</Fragment>
44264438
<Fragment>
44274439
<ComponentGroup Id="azurecmdfiles">
4428-
<ComponentRef Id="cmp96F13C307DA6E4AAC35F3D147F21553F" />
44294440
<ComponentRef Id="cmp0761C025FCF8EF027A5BC23C72777C52" />
44304441
<ComponentRef Id="cmp658F4F28B5894F240AF3AE214E228C7A" />
44314442
<ComponentRef Id="cmpBE01F246267602912E7BB7FAC7C89B62" />
@@ -4588,6 +4599,7 @@
45884599
<ComponentRef Id="cmp9FDC7E987C84705E62A1E3E6958A7A34" />
45894600
<ComponentRef Id="cmp0BDDC10BCAFF9EC25710B20367203609" />
45904601
<ComponentRef Id="cmpC7297788AE102ED861765ADE84F7A59B" />
4602+
<ComponentRef Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" />
45914603
<ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
45924604
<ComponentRef Id="cmp8F649774D57C8E90EC765D8FCE36E32A" />
45934605
<ComponentRef Id="cmpFBB75A5451448B356C97E62D2C6C10A0" />
@@ -4805,6 +4817,7 @@
48054817
<ComponentRef Id="cmp8F99791178CB394FC285BF5F9DA21047" />
48064818
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
48074819
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
4820+
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
48084821
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
48094822
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
48104823
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />
@@ -4813,6 +4826,7 @@
48134826
<ComponentRef Id="cmp9F97686A6D38F8B72B2FB1D62529AF0F" />
48144827
<ComponentRef Id="cmpA398972142ABD0AC819F613EE832B65C" />
48154828
<ComponentRef Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" />
4829+
<ComponentRef Id="cmp065EDC002BB63B6AA573F18152B7240F" />
48164830
<ComponentRef Id="cmp02E49F28BB0FA3174A478847B857A4D0" />
48174831
<ComponentRef Id="cmp53B7AE5C484C188098FEE906B381461C" />
48184832
<ComponentRef Id="cmpFCCC1C3A49857F9109FEB6AE04888D08" />
@@ -4884,6 +4898,7 @@
48844898
<ComponentRef Id="cmpBBEEE168902DFD205E35F47468881929" />
48854899
<ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
48864900
<ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
4901+
<ComponentRef Id="cmp9002DD73D47754F2109499247914700F" />
48874902
<ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />
48884903
<ComponentRef Id="cmp2BE62623A92CD0986F0915CB16373E90" />
48894904
<ComponentRef Id="cmpCBBCCDE16C2F179A9160E366F5449CF4" />
@@ -5032,6 +5047,7 @@
50325047
<ComponentRef Id="cmp25F6948876AE28D1DB4430494E01EBB7" />
50335048
<ComponentRef Id="cmpE4F09171FB1B25EAC4AABD90F9EFA350" />
50345049
<ComponentRef Id="cmpA3B81935598199F5BE6572F3D46DD2C5" />
5050+
<ComponentRef Id="cmpD50A1D50B7385232643B15A0E7CBAA57" />
50355051
<ComponentRef Id="cmp56F9151EB19BE7D5CE2655D19ADF5C9A" />
50365052
<ComponentRef Id="cmp39A46C3BD11947E08479BBD49CB20104" />
50375053
<ComponentRef Id="cmpC1352E11D4D3526DFA43840F587B64D9" />

‎src/Common/Storage/Azure.Storage.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.1'
12+
ModuleVersion = '0.10.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'

‎src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'

‎src/ResourceManager/Compute/AzureRM.Compute.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'

‎src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d'

‎src/ResourceManager/Dns/AzureRM.Dns.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '5e5ed8bc-27bf-4380-9de1-4b22ba0920b2'

‎src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '3fd1475f-cb23-4ffb-bf08-33d94b7d1acb'

‎src/ResourceManager/Insights/AzureRM.Insights.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '698c387c-bd6b-41c6-82ce-721f1ef39548'

‎src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'fa236c1f-6464-4d6a-a48d-db47c0e7923d'

‎src/ResourceManager/Network/AzureRM.Network.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'eb75c732-e274-4a20-b502-e9958e63484a'

‎src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'e827799a-7abf-4538-a61f-94dc52a48bd4'

‎src/ResourceManager/Profile/AzureRM.Profile.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '342714fc-4009-4863-8afb-a9067e3db04b'

‎src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '820628d7-6938-488a-8760-43373a5ffce6'

‎src/ResourceManager/Resources/AzureRM.Resources.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'ab3ca893-26fe-44b0-bd3c-8933df144d7b'

‎src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'd1de7560-48e1-48f3-bc8c-4eea3af2bbe1'

‎src/ResourceManager/Sql/AzureRM.Sql.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '150d9544-6348-4373-806f-10cd0b4de4cb'

‎src/ResourceManager/Storage/AzureRM.Storage.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.1'
12+
ModuleVersion = '0.10.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'da67eaa7-4cb1-4bfa-a194-8bf3faae8ac5'

‎src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '59713673-194f-418a-b1f2-ac60db82edf9'

‎src/ResourceManager/Tags/AzureRM.Tags.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '59713673-194f-418a-b1f2-ac60db82edf9'

‎src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '59713673-194f-418a-b1f2-ac60db82edf9'

‎src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'e43e47c8-8bff-4013-b003-ded1741f403a'

‎src/ResourceManager/Websites/AzureRM.Websites.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.10.0'
12+
ModuleVersion = '0.10.1'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'cc69c625-e961-43f4-8b50-0061eba6e4b6'

‎tools/Installer/generate.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Write-Verbose "The output folder is set to $output"
3232
$serviceManagementPath = Join-Path $output "ServiceManagement\Azure"
3333
$resourceManagerPath = Join-Path $output "ResourceManager\AzureResourceManager"
3434

35+
Write-Verbose "Removing unneeded psd1 file for AzureResourceManager"
36+
Remove-Item -Force $resourceManagerPath\AzureResourceManager.psd1 -ErrorAction SilentlyContinue
3537
Write-Verbose "Removing duplicated Resources folder"
3638
Remove-Item -Recurse -Force $serviceManagementPath\Compute\Resources\ -ErrorAction SilentlyContinue
3739
Remove-Item -Recurse -Force $serviceManagementPath\Sql\Resources\ -ErrorAction SilentlyContinue

0 commit comments

Comments
 (0)