Skip to content

Commit 71b7811

Browse files
sphibbssphibbs
committed
Merge pull request Azure#2163 from markcowl/helpFix
Update help analyzer to catch missing help xml files and fix missing help files
2 parents fea4bb8 + 8be962c commit 71b7811

File tree

7 files changed

+100
-10
lines changed

7 files changed

+100
-10
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,6 +2148,9 @@
21482148
<Component Id="cmp97DCE18753534AD69AF7E7D8D9E44502" Guid="*">
21492149
<File Id="fil90907D4E09BBD5280D1418AC997233C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
21502150
</Component>
2151+
<Component Id="cmpB32ADC3C63EDA08D6532967360D34D43" Guid="*">
2152+
<File Id="filE08640EF6FC290EA9D7AE25D975604D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.Azure.dll" />
2153+
</Component>
21512154
<Component Id="cmpDE6C92AC2ECEED1C03C8D6728B42EA70" Guid="*">
21522155
<File Id="filB8103ADF161FDE5CAC0F8629BB53738D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Rest.ClientRuntime.dll" />
21532156
</Component>
@@ -2627,8 +2630,8 @@
26272630
<Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
26282631
<File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
26292632
</Component>
2630-
<Component Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" Guid="*">
2631-
<File Id="fil6C5492894C2F4DDD80E710891D53B6D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
2633+
<Component Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" Guid="*">
2634+
<File Id="fil6844E5CF8B2186F0D283DF52A5892125" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
26322635
</Component>
26332636
<Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
26342637
<File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
@@ -3015,6 +3018,9 @@
30153018
<Component Id="cmp8F839B12289A46E7A8870014F8111911" Guid="*">
30163019
<File Id="fil449FE2073F074013C18B88473DD9F75D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll" />
30173020
</Component>
3021+
<Component Id="cmpAC5BC334718546D9DDEBC02E08A4532E" Guid="*">
3022+
<File Id="fil0058CD8D090E7A70802FC54C74FADBEE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll-Help.xml" />
3023+
</Component>
30183024
<Component Id="cmp2488ACCABA4CB85A6B69DBB1D9FDD233" Guid="*">
30193025
<File Id="fil021881BAF48E9A0C07D3E790AA0F5590" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Common.dll" />
30203026
</Component>
@@ -4074,12 +4080,12 @@
40744080
<Component Id="cmpB379F478799A33A4B4343BA15AC89F48" Guid="*">
40754081
<File Id="fil0239F2F240D028259DDB85300C39829C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
40764082
</Component>
4077-
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
4078-
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
4079-
</Component>
40804083
<Component Id="cmpB69D649FD24EBC270A2013375C2AF99B" Guid="*">
40814084
<File Id="fil8C7BE3D686B22FA7B371793DE9DFCCDD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll" />
40824085
</Component>
4086+
<Component Id="cmpC1D7C834CACA385FC5B0D004675BC3BA" Guid="*">
4087+
<File Id="filF8B866285975B9616E0830999DFCE229" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll-help.xml" />
4088+
</Component>
40834089
<Component Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" Guid="*">
40844090
<File Id="filD24F4EB26C2FA956CA7A93BCAF4A2AD7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.dll" />
40854091
</Component>
@@ -5762,6 +5768,7 @@
57625768
<ComponentRef Id="cmpD5D6E28B9232D19A4D3FC543B56214DB" />
57635769
<ComponentRef Id="cmp6DCD11F46E1DCE998C423CD0BC09CD15" />
57645770
<ComponentRef Id="cmp97DCE18753534AD69AF7E7D8D9E44502" />
5771+
<ComponentRef Id="cmpB32ADC3C63EDA08D6532967360D34D43" />
57655772
<ComponentRef Id="cmpDE6C92AC2ECEED1C03C8D6728B42EA70" />
57665773
<ComponentRef Id="cmpC601580257AEA8DA8522AD7F32FE545C" />
57675774
<ComponentRef Id="cmp1BF396A297DE4BB9EFCE53AA38D5EF41" />
@@ -5919,7 +5926,7 @@
59195926
<ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
59205927
<ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
59215928
<ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
5922-
<ComponentRef Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" />
5929+
<ComponentRef Id="cmp954D77FCB95677621EC6B1C52E8B4AB2" />
59235930
<ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
59245931
<ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
59255932
<ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />
@@ -6045,6 +6052,7 @@
60456052
<ComponentRef Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" />
60466053
<ComponentRef Id="cmpC3F5E35306467501723E692635390B24" />
60476054
<ComponentRef Id="cmp8F839B12289A46E7A8870014F8111911" />
6055+
<ComponentRef Id="cmpAC5BC334718546D9DDEBC02E08A4532E" />
60486056
<ComponentRef Id="cmp2488ACCABA4CB85A6B69DBB1D9FDD233" />
60496057
<ComponentRef Id="cmp67AFEBC05483435B1BCA6071E6B47F01" />
60506058
<ComponentRef Id="cmp2C2622C3604F560651F9A1522DE2A835" />
@@ -6382,8 +6390,8 @@
63826390
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
63836391
<ComponentRef Id="cmpC0EA9433103A723191792448380E84AB" />
63846392
<ComponentRef Id="cmpB379F478799A33A4B4343BA15AC89F48" />
6385-
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
63866393
<ComponentRef Id="cmpB69D649FD24EBC270A2013375C2AF99B" />
6394+
<ComponentRef Id="cmpC1D7C834CACA385FC5B0D004675BC3BA" />
63876395
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
63886396
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />
63896397
<ComponentRef Id="cmp6842A5697846B92CCF6ED50688A26C1A" />

‎src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@
232232
<Name>Commands.Resources</Name>
233233
</ProjectReference>
234234
</ItemGroup>
235-
<ItemGroup />
235+
<ItemGroup>
236+
<None Include="Microsoft.Azure.Commands.Websites.dll-Help.xml">
237+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
238+
</None>
239+
</ItemGroup>
236240
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
237241
</Project>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServicesRdfe.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<Content Include="lib\Security.Cryptography.dll">
226226
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227227
</Content>
228-
<Content Include="Microsoft.Azure.Commands.RecoveryServices.dll-help.xml">
228+
<Content Include="Microsoft.Azure.Commands.RecoveryServicesRdfe.dll-help.xml">
229229
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230230
</Content>
231231
</ItemGroup>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Microsoft.Azure.Commands.RecoveryServices.dll-help.xml renamed to ‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Microsoft.Azure.Commands.RecoveryServicesRdfe.dll-help.xml

File renamed without changes.

‎tools/Installer/generate.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\AzureRM.Tags.psd1
4141
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.dll-Help.xml -ErrorAction SilentlyContinue
4242
Remove-Item -Force $resourceManagerPath\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Tags.format.ps1xml -ErrorAction SilentlyContinue
4343
Remove-Item -Force $resourceManagerPath\AzureRM.Intune\AzureRM.Intune.psd1 -ErrorAction SilentlyContinue
44+
Remove-Item -Force $resourceManagerPath\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.psd1 -ErrorAction SilentlyContinue
4445
Write-Verbose "Removing duplicated Resources folder"
4546
Remove-Item -Recurse -Force $serviceManagementPath\Compute\Resources\ -ErrorAction SilentlyContinue
4647
Remove-Item -Recurse -Force $serviceManagementPath\Sql\Resources\ -ErrorAction SilentlyContinue
@@ -55,7 +56,7 @@ Write-Verbose "Removing XML help files for helper dlls from $output"
5556
$exclude = @("*.dll-Help.xml", "Scaffold.xml", "RoleSettings.xml", "WebRole.xml", "WorkerRole.xml")
5657
$include = @("*.xml", "*.lastcodeanalysissucceeded", "*.dll.config", "*.pdb")
5758
Get-ChildItem -Include $include -Exclude $exclude -Recurse -Path $output | Remove-Item -Force -Recurse
58-
59+
Get-ChildItem -Recurse -Path $output -Include *.dll-Help.psd1 | Remove-Item -Force
5960
if (Get-Command "heat.exe" -ErrorAction SilentlyContinue)
6061
{
6162
$azureFiles = Join-Path $env:AzurePSRoot 'setup\azurecmdfiles.wxi'

0 commit comments

Comments
 (0)