Merge pull request Azure#1995 from kuangweizhang/dev

CDN psd1 fix

Author: Hovsep

setup/azurecmdfiles.wxi

@@ -500,8 +500,8 @@
                         </Component>
                     </Directory>
                     <Directory Id="dir75F2C4F350248207C418DE5A1C651FB6" Name="AzureRM.Cdn">
-                        <Component Id="cmpD18084727DDF26BDFCE36BE4EF3E3FBC" Guid="*">
-                            <File Id="fil94E16717A827E81C325C0FF864D01FFC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRm.Cdn.psd1" />
+                        <Component Id="cmpB7108FC1E0DA3A2DABE2F5A549025C62" Guid="*">
+                            <File Id="filB74B1CDF4E2C5B548CAC901E51955AA5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRM.Cdn.psd1" />
                         </Component>
                         <Component Id="cmp87DFE6BA28632B552074C8A05968ED49" Guid="*">
                             <File Id="filB29D13A0412832DF84301430FAF5C2EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRM.Tags.psd1" />
@@ -5064,7 +5064,7 @@
             <ComponentRef Id="cmp8E6B2CBC9EF2E6C9012C5090F2932C68" />
             <ComponentRef Id="cmp30F0EC1B207C0F4C59F81099974C18E3" />
             <ComponentRef Id="cmp22BC5873E0018F5801CD486C6CBCE0C5" />
-            <ComponentRef Id="cmpD18084727DDF26BDFCE36BE4EF3E3FBC" />
+            <ComponentRef Id="cmpB7108FC1E0DA3A2DABE2F5A549025C62" />
             <ComponentRef Id="cmp87DFE6BA28632B552074C8A05968ED49" />
             <ComponentRef Id="cmpFCC54BA077C7C12B0A49F42DD3039435" />
             <ComponentRef Id="cmp984FE30B4A873A5B1BC8F7E85B1CEF85" />

src/ResourceManager/Cdn/AzureCdn.psd1 renamed to src/ResourceManager/Cdn/AzureRM.Cdn.psd1

@@ -135,7 +135,7 @@ public void RunPsTestWorkflow(
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     _helper.RMProfileModule,
                     _helper.RMResourceModule,
-                    @"AzureRm.Cdn.psd1");
+                    @"AzureRM.Cdn.psd1");
 
                 try
                 {

src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/TestController.cs

@@ -168,7 +168,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="AzureRm.Cdn.psd1">
+	<None Include="..\AzureRM.Cdn.psd1">
+      <Link>AzureRM.Cdn.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Microsoft.Azure.Commands.Cdn.dll-help.psd1" />