Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f571fe9
Fix issue where version 10.0.3 of Newtonsoft.Json wasn't being loaded
cormacpayne May 29, 2018
58917bc
Copy assembly instead of moving it to prevent build failures
cormacpayne May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/Profile/AzureRM.Profile.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
1 change: 1 addition & 0 deletions src/ResourceManager/Profile/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>