Skip to content

fix #7814 and 8091: update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest#8087

Merged
sebastienros merged 4 commits into
OrchardCMS:devfrom
jayharris:fix-7814
Aug 9, 2018
Merged

fix #7814 and 8091: update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest#8087
sebastienros merged 4 commits into
OrchardCMS:devfrom
jayharris:fix-7814

Conversation

@jayharris

Copy link
Copy Markdown
Contributor

Updating Newtonsoft.Json to the latest version. Doing so also caused several other modifications to project files and web.config files throughout the solution.

Updating Newtonsoft.Json will also open the doors for a few other NuGet package updates, and some enhancements to the OpenId module, since most of the newer OpenIdConnect and Microsoft.IdentityModel packages require Newtonsoft.Json >= 10.

Automatically-Generated Changes include:

  • removing <private>true</private> from assembly references as
    this is the default value and not included by default since many
    moons ago.
  • adding several missing binding redirects
  • revising project inclusion of packages.config from Content type
    to the proper None type
  • relocating <system.codedom> to the end of the Web.config, the
    default location that the block is injected by its NuGet pkg.
  • adding missing EnsureNuGetPackageBuildImports targets

These changes are regenerated, reformatted, or reformatted by
NuGet updates and not done by hand.

Fixes #7814

updating Newtonsoft.Json to the latest version caused many other
modifications to project files and web.config files throughout
the solution. Separated these modifications out from the
Newtonsoft.Json update to isolate the commits.

Changes include:
- removing `<private>true</private>` from assembly references as
this is the default value and not included by default since many
moons ago.
- adding several missing binding redirects
- revising project includion of packages.config from Content type
to the proper None type
- relocating `<system.codedom>` to the end of the Web.config, the
default location that the block is injected by its NuGet pkg.
- adding missing `EnsureNuGetPackageBuildImports` target

These changes are regenerated, reformatted, or reformatted by
NuGet updates.

References OrchardCMS#7814
@jayharris jayharris changed the title fix #7814: update Newtonsoft.Json to v11.0.2 fix #7814 and 8091: update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest Aug 3, 2018
@jayharris

Copy link
Copy Markdown
Contributor Author

Revised this PR to also include updates to Microsoft.Owin., Microsoft.IdentityModel., and System.IdentityModel.*. There are several opportunities that open up, particularly with Orchard.OpenId, if these others are also updated. I included them in the same PR since they are all inter-related—the IdentityModel updates require OWIN updates and the OWIN updates require Newtonsoft.Json updates.

@sebastienros
sebastienros merged commit 3649844 into OrchardCMS:dev Aug 9, 2018
@sebastienros

Copy link
Copy Markdown
Member

Fixes #8091

csutorasr pushed a commit to csutorasr/Orchard that referenced this pull request Aug 10, 2018
MatteoPiovanelli pushed a commit to LaserSrl/Orchard that referenced this pull request May 17, 2019
…ardCMS#8087)

# Conflicts:
#	src/Orchard.Azure.Tests/App.config
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure.Tests/packages.config
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Specs/App.Config
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Tests.Modules/packages.config
#	src/Orchard.Tests/packages.config
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
#	src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj
#	src/Orchard.Web/Modules/Orchard.Glimpse/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
#	src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj
#	src/Orchard.Web/Modules/Orchard.OpenId/Web.config
#	src/Orchard.Web/Modules/Orchard.OpenId/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
#	src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
#	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Orchard.Framework.csproj
#	src/Orchard/packages.config
#	src/Tools/Orchard.Tests/Orchard.Tests.csproj
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants