Merge pull request #13 from Azure/dev

Dev
Azure · Mar 12, 2015 · 3cbb7ff · 3cbb7ff
2 parents 3bd386d + 2ad01ed
commit 3cbb7ff
Show file tree

Hide file tree

Showing 5 changed files with 1,862 additions and 5 deletions.
diff --git a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
@@ -156,7 +156,11 @@
   <ItemGroup>
     <Content Include="Microsoft.Azure.Commands.Websites.dll-Help.xml">
       <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />

diff --git a/...esourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1 b/...esourceManager/Websites/Commands.Websites/Microsoft.Azure.Commands.Websites.dll-Help.psd1
@@ -61,7 +61,7 @@ FormatsToProcess = @()
 
 # Modules to import as nested modules of the module specified in ModuleToProcess
 NestedModules = @(
-    '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Commands.Websites.dll'
+    '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Websites\Microsoft.Azure.Commands.Websites.dll'
 )
 
 # Functions to export from this module