Skip to content

. #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2015
Merged

. #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c97568
Updating wix installer
markcowl Oct 29, 2015
4485b9b
Merge pull request #1203 from markcowl/wixfix
markcowl Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,9 @@
<Component Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" Guid="*">
<File Id="fil892929A39A2451E6645B06A1071C7377" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
<Component Id="cmpCD37CD8F92CDF2D1325CCF4EDCB62243" Guid="*">
<File Id="filD4DA4D8E757F8C680D2F6FF42AB03467" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.Tags.dll" />
</Component>
<Component Id="cmp88675FAFCC394892AE7CA0D31046C931" Guid="*">
<File Id="fil01D0A4B8CAE4F47AEBAC371F9D4F3CC6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Common.Authentication.dll" />
</Component>
Expand Down Expand Up @@ -876,6 +879,9 @@
<Component Id="cmpBE1007C3B5920359FED93D232612FA3D" Guid="*">
<File Id="fil047FE0D96A04BAE24E62453BB735322B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
<Component Id="cmpA9CADA5F5DC40E8AD15DF60107CC92D1" Guid="*">
<File Id="fil6F014B6352009ABA00697624C40BED36" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.dll" />
</Component>
<Component Id="cmp2FE5183EB7E0125AD6C4A8101AB4B55E" Guid="*">
<File Id="fil73D92F1878FF0973F6F1359DAA67D3E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Common.Authentication.dll" />
</Component>
Expand Down Expand Up @@ -1054,6 +1060,9 @@
<Component Id="cmp0A73501EDFCB1876C97F2D4B520F3E35" Guid="*">
<File Id="filD8B12535344A334C842789DD3B3774B3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmp7EBE3286268B848A8C4813AC64EA4C34" Guid="*">
<File Id="fil86BDA115F7354D65E9204115899B1774" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Graph.RBAC.dll" />
</Component>
<Component Id="cmp84DA44BC01768FB21E1664FF352CB56B" Guid="*">
<File Id="fil4A5FD068B0A21617E9A7ABB9BEDC9BBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Management.HDInsight.dll" />
</Component>
Expand Down Expand Up @@ -1128,6 +1137,9 @@
<Component Id="cmpDE49418D6A95612CBD93742D9123E2CF" Guid="*">
<File Id="filA451CC480035933973D458DE27E4D654" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Insights.dll-Help.xml" />
</Component>
<Component Id="cmp3096FA61D43597AB3DBA27FAB68B4EC2" Guid="*">
<File Id="fil62116E4EF563120D14399871EDB98344" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Insights.format.ps1xml" />
</Component>
<Component Id="cmp8F9B65CD236700EB14DA4817C1688FF7" Guid="*">
<File Id="filB91A22127B334BFB27FD1A7E442994C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
Expand Down Expand Up @@ -4851,6 +4863,7 @@
<ComponentRef Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" />
<ComponentRef Id="cmpBFBF6E4B62912618B79304EFC6838BAB" />
<ComponentRef Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" />
<ComponentRef Id="cmpCD37CD8F92CDF2D1325CCF4EDCB62243" />
<ComponentRef Id="cmp88675FAFCC394892AE7CA0D31046C931" />
<ComponentRef Id="cmpD3A3362A8365705FDC0C19B312EB61FC" />
<ComponentRef Id="cmp096EEC3ACF260985958CED2DC04BD9A9" />
Expand All @@ -4876,6 +4889,7 @@
<ComponentRef Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" />
<ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
<ComponentRef Id="cmpBE1007C3B5920359FED93D232612FA3D" />
<ComponentRef Id="cmpA9CADA5F5DC40E8AD15DF60107CC92D1" />
<ComponentRef Id="cmp2FE5183EB7E0125AD6C4A8101AB4B55E" />
<ComponentRef Id="cmp87FB43928F7A2ECF62C0141446D21A9F" />
<ComponentRef Id="cmpD2292657EF3D9CEAC5D4FA7DEB3E7E8E" />
Expand Down Expand Up @@ -4934,6 +4948,7 @@
<ComponentRef Id="cmp49102F1945E979B50A0C7307B0191B58" />
<ComponentRef Id="cmp327D63D4E47C0C921CB8B578A78012CD" />
<ComponentRef Id="cmp0A73501EDFCB1876C97F2D4B520F3E35" />
<ComponentRef Id="cmp7EBE3286268B848A8C4813AC64EA4C34" />
<ComponentRef Id="cmp84DA44BC01768FB21E1664FF352CB56B" />
<ComponentRef Id="cmpA1C271511C8C2910A9ADBC85D928D54C" />
<ComponentRef Id="cmp8F725CF358AB23BDABE18B5FE9B73BFA" />
Expand All @@ -4958,6 +4973,7 @@
<ComponentRef Id="cmp183CE3EAEAA01DB989815CD9E22E1975" />
<ComponentRef Id="cmp20A05509BD755C1EF519D072611A0E0F" />
<ComponentRef Id="cmpDE49418D6A95612CBD93742D9123E2CF" />
<ComponentRef Id="cmp3096FA61D43597AB3DBA27FAB68B4EC2" />
<ComponentRef Id="cmp8F9B65CD236700EB14DA4817C1688FF7" />
<ComponentRef Id="cmpBAEB22D1B0161CF31028E4EC6CFCE47E" />
<ComponentRef Id="cmpA848C04563692D93B90821EE8960E3B4" />
Expand Down
8 changes: 7 additions & 1 deletion tools/Installer/generate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ 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"
Write-Verbose "Removing unneeded psd1 and other files"
Remove-Item -Force $resourceManagerPath\AzureResourceManager.psd1 -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeAnalytics\AzureRM.Tags.psd1 -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.Tags.dll-Help.xml -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.Tags.format.ps1xml -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\AzureRM.Tags.psd1 -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.dll-Help.xml -ErrorAction SilentlyContinue
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.format.ps1xml -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
Expand Down