Skip to content

Commit e84e613

Browse files
markcowlmarkcowl
committed
Merge pull request #1762 from hovsepm/dev
[#112912571] Removed *.dll-help.psd1 files form MSI.
2 parents 355fca3 + 515eede commit e84e613

File tree

46 files changed

+29
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+29
-185
lines changed

‎setup/azurecmdfiles.wxi‎

Lines changed: 0 additions & 92 deletions
Large diffs are not rendered by default.

‎src/Common/Storage/Commands.Storage/Commands.Storage.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
<SpecificVersion>False</SpecificVersion>
106106
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
107107
</Reference>
108-
<Reference Include="Microsoft.WindowsAzure.Configuration">
109-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
110-
</Reference>
111108
<Reference Include="Microsoft.WindowsAzure.Management">
112109
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113110
</Reference>

‎src/Common/Storage/Commands.Storage/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2019
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2120
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2221
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
101101
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
102102
</Reference>
103-
<Reference Include="Microsoft.WindowsAzure.Configuration">
104-
<SpecificVersion>False</SpecificVersion>
105-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
106-
</Reference>
107103
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108104
<SpecificVersion>False</SpecificVersion>
109105
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2221
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2322
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2423
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@
115115
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
116116
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
117117
</Reference>
118-
<Reference Include="Microsoft.WindowsAzure.Configuration">
119-
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
121-
</Reference>
122118
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123119
<SpecificVersion>False</SpecificVersion>
124120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2221
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2322
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2423
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,10 @@
197197
<Link>AzureRM.Backup.psd1</Link>
198198
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
199199
</None>
200-
<None Include="Microsoft.Azure.Commands.AzureBackup.dll-help.psd1" />
200+
<None Include="Microsoft.Azure.Commands.AzureBackup.dll-help.psd1" >
201+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
202+
<SubType>Designer</SubType>
203+
</None>
201204
<None Include="Microsoft.Azure.Commands.AzureBackup.format.ps1xml">
202205
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
203206
<SubType>Designer</SubType>

‎src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@
100100
<SpecificVersion>False</SpecificVersion>
101101
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
102102
</Reference>
103-
<Reference Include="Microsoft.WindowsAzure.Configuration">
104-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
105-
</Reference>
106103
<Reference Include="Microsoft.Azure.KeyVault.Core">
107104
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
108105
<Private>True</Private>

‎src/ResourceManager/AzureBatch/Commands.Batch/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2221
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2322
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2423
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />

0 commit comments

Comments
 (0)