Merge pull request Azure#6323 from cormacpayne/newtonsoft-fix

Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded

Author: cormacpayne

src/ResourceManager/Profile/AzureRM.Profile.psd1

@@ -80,7 +80,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Commands.Common.Authentication.Abstracti
                '.\Microsoft.Threading.Tasks.Extensions.dll', 
                '.\Microsoft.Threading.Tasks.Extensions.Desktop.dll', 
                '.\Microsoft.WindowsAzure.Management.dll', '.\Newtonsoft.Json.dll', 
-               '.\NewAssemblies\Newtonsoft.Json.dll', 
+               '.\Newtonsoft.Json.10.dll', 
                '.\System.Net.Http.Extensions.dll', 
                '.\System.Net.Http.Primitives.dll'
 

src/ResourceManager/Profile/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded on module import
 
 ## Version 5.1.0
 * Fix issue where running `Clear-AzureRmContext` would keep an empty context with the name of the previous default context, which prevented the user from creating a new context with the old name

src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

@@ -205,6 +205,6 @@
     </ItemGroup>
     <Copy SourceFiles="@(OutFiles)" DestinationFiles="@(OutFiles->'..\..\..\Stack\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Profile\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
-    <Copy SourceFiles="@(NewtonsoftJson)" DestinationFolder="$(OutputPath)\NewAssemblies\" ContinueOnError="false" />
+    <Copy SourceFiles="@(NewtonsoftJson)" DestinationFiles="$(OutputPath)\Newtonsoft.Json.10.dll" />
   </Target>
 </Project>