lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 04:32:23 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.10.x-to-dev' into dev
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Details
Compile / Compile Client-side Assets (push) Has been cancelled
Details
SpecFlow tests / SpecFlow tests (1.10.x) (push) Has been cancelled
Details
SpecFlow tests / SpecFlow tests (dev) (push) Has been cancelled
Details
Build Crowdin Translation Packages / build-crowdin-translation-packages (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Benedek Farkas 2025-01-17 19:55:39 +01:00
commit c38c9bf398
27 changed files with 481 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Core.Tests/App.config
View File

@ -26,6 +26,22 @@
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

22
src/Orchard.Specs/App.Config
View File

@ -39,16 +39,28 @@
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" /> <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

16
src/Orchard.Tests.Modules/App.config
View File

@ -42,6 +42,22 @@
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

22
src/Orchard.Web.Tests/app.config
View File

@ -31,16 +31,28 @@
<bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" /> <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

18
src/Orchard.Web/Modules/Markdown/Markdown.csproj
View File

@ -62,20 +62,20 @@
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> <HintPath>..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath> <HintPath>..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> <HintPath>..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Web" /> <Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
@ -231,4 +231,4 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

16
src/Orchard.Web/Modules/Markdown/Web.config
View File

@ -68,6 +68,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

10
src/Orchard.Web/Modules/Markdown/packages.config
View File

@ -6,8 +6,8 @@
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" /> <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" /> <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" /> <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.4" targetFramework="net48" /> <package id="System.Memory" version="4.6.0" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" /> <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" /> <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
</packages> </packages>

16
src/Orchard.Web/Modules/Orchard.Blogs/Web.config
View File

@ -68,6 +68,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

16
src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
View File

@ -69,6 +69,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

16
src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
View File

@ -69,6 +69,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

16
src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
View File

@ -71,6 +71,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

34
src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
View File

@ -55,8 +55,11 @@
<Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"> <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath> <HintPath>..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference> </Reference>
<Reference Include="MailKit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL"> <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\MailKit.3.1.1\lib\net48\MailKit.dll</HintPath> <HintPath>..\..\..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="MailKit, Version=4.9.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\MailKit.4.9.0\lib\net48\MailKit.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath> <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@ -65,23 +68,42 @@
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference> </Reference>
<Reference Include="MimeKit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL"> <Reference Include="MimeKit, Version=4.9.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\MimeKit.3.1.1\lib\net48\MimeKit.dll</HintPath> <HintPath>..\..\..\packages\MimeKit.4.9.0\lib\net48\MimeKit.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> <HintPath>..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Configuration"> <Reference Include="System.Configuration">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Formats.Asn1, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />

12
src/Orchard.Web/Modules/Orchard.Email/Web.config
View File

@ -69,6 +69,18 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

13
src/Orchard.Web/Modules/Orchard.Email/packages.config
View File

@ -1,13 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MailKit" version="3.1.1" targetFramework="net48" /> <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net48" />
<package id="MailKit" version="4.9.0" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" /> <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" /> <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" /> <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" /> <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
<package id="MimeKit" version="3.1.1" targetFramework="net48" /> <package id="MimeKit" version="4.9.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" /> <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
<package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net48" /> <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" /> <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
<package id="System.Formats.Asn1" version="8.0.1" targetFramework="net48" />
<package id="System.Memory" version="4.6.0" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
</packages> </packages>

16
src/Orchard.Web/Modules/Orchard.Layouts/Web.config
View File

@ -81,6 +81,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

23
src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs
View File

@ -1,9 +1,13 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using Orchard.ContentManagement;
using Orchard.Core.Title.Models; using Orchard.Core.Title.Models;
using Orchard.DisplayManagement;
using Orchard.Forms.Services; using Orchard.Forms.Services;
using Orchard.Localization;
using Orchard.Mvc; using Orchard.Mvc;
using Orchard.Projections.Descriptors.Filter; using Orchard.Projections.Descriptors.Filter;
using Orchard.Projections.Descriptors.Layout; using Orchard.Projections.Descriptors.Layout;
@ -11,13 +15,9 @@ using Orchard.Projections.Descriptors.SortCriterion;
using Orchard.Projections.Models; using Orchard.Projections.Models;
using Orchard.Projections.Services; using Orchard.Projections.Services;
using Orchard.Projections.ViewModels; using Orchard.Projections.ViewModels;
using Orchard.ContentManagement;
using Orchard.DisplayManagement;
using Orchard.Localization;
using Orchard.UI.Notify;
using System;
using Orchard.Settings; using Orchard.Settings;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.UI.Notify;
namespace Orchard.Projections.Controllers { namespace Orchard.Projections.Controllers {
[ValidateInput(false)] [ValidateInput(false)]
@ -84,7 +84,7 @@ namespace Orchard.Projections.Controllers {
var model = new AdminIndexViewModel { var model = new AdminIndexViewModel {
Queries = results.Select(x => new QueryEntry { Queries = results.Select(x => new QueryEntry {
Query = x.As<QueryPart>().Record, Query = x.As<QueryPart>().Record,
QueryId = x.Id, QueryId = x.Id,
Name = x.As<QueryPart>().Name Name = x.As<QueryPart>().Name
}).ToList(), }).ToList(),
@ -158,16 +158,21 @@ namespace Orchard.Projections.Controllers {
Category = f.Category, Category = f.Category,
Type = f.Type, Type = f.Type,
FilterRecordId = filter.Id, FilterRecordId = filter.Id,
DisplayText = String.IsNullOrWhiteSpace(filter.Description) ? f.Display(new FilterContext {State = FormParametersHelper.ToDynamic(filter.State)}).Text : filter.Description DisplayText = String.IsNullOrWhiteSpace(filter.Description) ? f.Display(new FilterContext { State = FormParametersHelper.ToDynamic(filter.State) }).Text : filter.Description
}); });
} }
} }
filterGroupEntries.Add( new FilterGroupEntry { Id = group.Id, Filters = filterEntries } ); filterGroupEntries.Add(new FilterGroupEntry { Id = group.Id, Filters = filterEntries });
} }
viewModel.FilterGroups = filterGroupEntries; viewModel.FilterGroups = filterGroupEntries;
if (viewModel.FilterGroups.Any(group => group.Filters.Count() == 0)) {
_services.Notifier.Warning(
T("This Query has at least one empty filter group, which will cause all content items to be returned, unless the Projection using this Query limits the number of content items displayed."));
}
#endregion #endregion
#region Load Sort criterias #region Load Sort criterias
@ -185,7 +190,7 @@ namespace Orchard.Projections.Controllers {
Category = f.Category, Category = f.Category,
Type = f.Type, Type = f.Type,
SortCriterionRecordId = sortCriterion.Id, SortCriterionRecordId = sortCriterion.Id,
DisplayText = String.IsNullOrWhiteSpace(sortCriterion.Description) ? f.Display(new SortCriterionContext { State = FormParametersHelper.ToDynamic(sortCriterion.State) }).Text : sortCriterion.Description DisplayText = String.IsNullOrWhiteSpace(sortCriterion.Description) ? f.Display(new SortCriterionContext { State = FormParametersHelper.ToDynamic(sortCriterion.State) }).Text : sortCriterion.Description
}); });
} }
} }

184
src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
View File

@ -20,10 +20,12 @@ using Orchard.Projections.Settings;
using Orchard.Projections.ViewModels; using Orchard.Projections.ViewModels;
using Orchard.Tokens; using Orchard.Tokens;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.UI.Notify;
using Orchard.Utility.Extensions; using Orchard.Utility.Extensions;
namespace Orchard.Projections.Drivers { namespace Orchard.Projections.Drivers {
public class ProjectionPartDriver : ContentPartDriver<ProjectionPart> { public class ProjectionPartDriver : ContentPartDriver<ProjectionPart> {
private readonly IOrchardServices _orchardServices;
private readonly IRepository<QueryPartRecord> _queryRepository; private readonly IRepository<QueryPartRecord> _queryRepository;
private readonly IProjectionManager _projectionManager; private readonly IProjectionManager _projectionManager;
private readonly IFeedManager _feedManager; private readonly IFeedManager _feedManager;
@ -33,25 +35,25 @@ namespace Orchard.Projections.Drivers {
private const string TemplateName = "Parts/ProjectionPart"; private const string TemplateName = "Parts/ProjectionPart";
public ProjectionPartDriver( public ProjectionPartDriver(
IOrchardServices services, IOrchardServices orchardServices,
IRepository<QueryPartRecord> queryRepository, IRepository<QueryPartRecord> queryRepository,
IProjectionManager projectionManager, IProjectionManager projectionManager,
IFeedManager feedManager, IFeedManager feedManager,
ITokenizer tokenizer, ITokenizer tokenizer,
IDisplayHelperFactory displayHelperFactory, IDisplayHelperFactory displayHelperFactory,
IWorkContextAccessor workContextAccessor) { IWorkContextAccessor workContextAccessor) {
_orchardServices = orchardServices;
_queryRepository = queryRepository; _queryRepository = queryRepository;
_projectionManager = projectionManager; _projectionManager = projectionManager;
_feedManager = feedManager; _feedManager = feedManager;
_tokenizer = tokenizer; _tokenizer = tokenizer;
_displayHelperFactory = displayHelperFactory; _displayHelperFactory = displayHelperFactory;
_workContextAccessor = workContextAccessor; _workContextAccessor = workContextAccessor;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
Services = services;
} }
public Localizer T { get; set; } public Localizer T { get; set; }
public IOrchardServices Services { get; set; }
protected override string Prefix { get { return "ProjectionPart"; } } protected override string Prefix { get { return "ProjectionPart"; } }
@ -59,7 +61,7 @@ namespace Orchard.Projections.Drivers {
var query = part.Record.QueryPartRecord; var query = part.Record.QueryPartRecord;
// retrieving paging parameters // retrieving paging parameters
var queryString = Services.WorkContext.HttpContext.Request.QueryString; var queryString = _orchardServices.WorkContext.HttpContext.Request.QueryString;
var pageKey = String.IsNullOrWhiteSpace(part.Record.PagerSuffix) ? "page" : "page-" + part.Record.PagerSuffix; var pageKey = String.IsNullOrWhiteSpace(part.Record.PagerSuffix) ? "page" : "page-" + part.Record.PagerSuffix;
var page = 0; var page = 0;
@ -81,16 +83,14 @@ namespace Orchard.Projections.Drivers {
var pageSizeKey = "pageSize" + part.Record.PagerSuffix; var pageSizeKey = "pageSize" + part.Record.PagerSuffix;
if (queryString.AllKeys.Contains(pageSizeKey)) { if (queryString.AllKeys.Contains(pageSizeKey)) {
int qsPageSize; if (Int32.TryParse(queryString[pageSizeKey], out int qsPageSize)) {
if (Int32.TryParse(queryString[pageSizeKey], out qsPageSize)) {
if (part.Record.MaxItems == 0 || qsPageSize <= part.Record.MaxItems) { if (part.Record.MaxItems == 0 || qsPageSize <= part.Record.MaxItems) {
pageSize = qsPageSize; pageSize = qsPageSize;
} }
} }
} }
var pager = new Pager(Services.WorkContext.CurrentSite, page, pageSize); var pager = new Pager(_orchardServices.WorkContext.CurrentSite, page, pageSize);
var pagerShape = shapeHelper.Pager(pager) var pagerShape = shapeHelper.Pager(pager)
.ContentPart(part) .ContentPart(part)
@ -107,7 +107,7 @@ namespace Orchard.Projections.Drivers {
ContentShape("Parts_ProjectionPart_List", shape => { ContentShape("Parts_ProjectionPart_List", shape => {
// generates a link to the RSS feed for this term // generates a link to the RSS feed for this term
var metaData = Services.ContentManager.GetItemMetadata(part.ContentItem); var metaData = _orchardServices.ContentManager.GetItemMetadata(part.ContentItem);
_feedManager.Register(metaData.DisplayText, "rss", new RouteValueDictionary { { "projection", part.Id } }); _feedManager.Register(metaData.DisplayText, "rss", new RouteValueDictionary { { "projection", part.Id } });
// execute the query // execute the query
@ -130,8 +130,8 @@ namespace Orchard.Projections.Drivers {
// renders in a standard List shape if no specific layout could be found // renders in a standard List shape if no specific layout could be found
if (layoutDescriptor == null) { if (layoutDescriptor == null) {
var list = Services.New.List(); var list = _orchardServices.New.List();
var contentShapes = contentItems.Select(item => Services.ContentManager.BuildDisplay(item, "Summary")); var contentShapes = contentItems.Select(item => _orchardServices.ContentManager.BuildDisplay(item, "Summary"));
list.AddRange(contentShapes); list.AddRange(contentShapes);
return list; return list;
@ -143,7 +143,7 @@ namespace Orchard.Projections.Drivers {
var layoutComponents = contentItems.Select( var layoutComponents = contentItems.Select(
contentItem => { contentItem => {
var contentItemMetadata = Services.ContentManager.GetItemMetadata(contentItem); var contentItemMetadata = _orchardServices.ContentManager.GetItemMetadata(contentItem);
var propertyDescriptors = fieldDescriptors.Select( var propertyDescriptors = fieldDescriptors.Select(
d => { d => {
@ -156,9 +156,9 @@ namespace Orchard.Projections.Drivers {
}); });
// apply all settings to the field content, wrapping it in a FieldWrapper shape // apply all settings to the field content, wrapping it in a FieldWrapper shape
var properties = Services.New.Properties( var properties = _orchardServices.New.Properties(
Items: propertyDescriptors.Select( Items: propertyDescriptors.Select(
pd => Services.New.PropertyWrapper( pd => _orchardServices.New.PropertyWrapper(
Item: pd.Shape, Item: pd.Shape,
Property: pd.Property, Property: pd.Property,
ContentItem: contentItem, ContentItem: contentItem,
@ -199,14 +199,14 @@ namespace Orchard.Projections.Drivers {
return key; return key;
}).Select(x => new { Key = x.Key, Components = x }); }).Select(x => new { Key = x.Key, Components = x });
var list = Services.New.List(); var list = _orchardServices.New.List();
foreach (var group in groups) { foreach (var group in groups) {
var localResult = layoutDescriptor.Render(renderLayoutContext, group.Components); var localResult = layoutDescriptor.Render(renderLayoutContext, group.Components);
// add the Context to the shape // add the Context to the shape
localResult.Context(renderLayoutContext); localResult.Context(renderLayoutContext);
list.Add(Services.New.LayoutGroup(Key: new MvcHtmlString(group.Key), List: localResult)); list.Add(_orchardServices.New.LayoutGroup(Key: new MvcHtmlString(group.Key), List: localResult));
} }
return list; return list;
@ -223,81 +223,80 @@ namespace Orchard.Projections.Drivers {
} }
protected override DriverResult Editor(ProjectionPart part, dynamic shapeHelper) { protected override DriverResult Editor(ProjectionPart part, dynamic shapeHelper) {
return ContentShape("Parts_ProjectionPart_Edit", return ContentShape("Parts_ProjectionPart_Edit", () => {
() => { var model = new ProjectionPartEditViewModel();
var model = new ProjectionPartEditViewModel();
// for create read the setting values // for create read the setting values
var settings = part.TypePartDefinition.Settings.GetModel<ProjectionPartSettings>(); var settings = part.TypePartDefinition.Settings.GetModel<ProjectionPartSettings>();
if (part.Id == 0) { if (part.Id == 0) {
model = new ProjectionPartEditViewModel { model = new ProjectionPartEditViewModel {
DisplayPager = settings.DisplayPager, DisplayPager = settings.DisplayPager,
Items = settings.Items, Items = settings.Items,
Skip = settings.Skip, Skip = settings.Skip,
PagerSuffix = settings.PagerSuffix, PagerSuffix = settings.PagerSuffix,
MaxItems = settings.MaxItems, MaxItems = settings.MaxItems,
QueryLayoutRecordId = settings.QueryLayoutRecordId QueryLayoutRecordId = settings.QueryLayoutRecordId
}; };
} }
else { else {
model = new ProjectionPartEditViewModel { model = new ProjectionPartEditViewModel {
DisplayPager = part.Record.DisplayPager, DisplayPager = part.Record.DisplayPager,
Items = part.Record.Items, Items = part.Record.Items,
ItemsPerPage = part.Record.ItemsPerPage, ItemsPerPage = part.Record.ItemsPerPage,
Skip = part.Record.Skip, Skip = part.Record.Skip,
PagerSuffix = part.Record.PagerSuffix, PagerSuffix = part.Record.PagerSuffix,
MaxItems = part.Record.MaxItems, MaxItems = part.Record.MaxItems,
QueryLayoutRecordId = "-1" QueryLayoutRecordId = "-1"
}; };
// concatenated Query and Layout ids for the view // concatenated Query and Layout ids for the view
if (part.Record.QueryPartRecord != null) { if (part.Record.QueryPartRecord != null) {
model.QueryLayoutRecordId = part.Record.QueryPartRecord.Id + ";"; model.QueryLayoutRecordId = part.Record.QueryPartRecord.Id + ";";
} }
if (part.Record.LayoutRecord != null) { if (part.Record.LayoutRecord != null) {
model.QueryLayoutRecordId += part.Record.LayoutRecord.Id.ToString(); model.QueryLayoutRecordId += part.Record.LayoutRecord.Id.ToString();
} }
else { else {
model.QueryLayoutRecordId += "-1"; model.QueryLayoutRecordId += "-1";
} }
} }
model.PartId = part.Id; model.PartId = part.Id;
// lock fields // lock fields
model.LockEditingItems = settings.LockEditingItems; model.LockEditingItems = settings.LockEditingItems;
model.LockEditingSkip = settings.LockEditingSkip; model.LockEditingSkip = settings.LockEditingSkip;
model.LockEditingMaxItems = settings.LockEditingMaxItems; model.LockEditingMaxItems = settings.LockEditingMaxItems;
model.LockEditingPagerSuffix = settings.LockEditingPagerSuffix; model.LockEditingPagerSuffix = settings.LockEditingPagerSuffix;
model.LockEditingDisplayPager = settings.LockEditingDisplayPager; model.LockEditingDisplayPager = settings.LockEditingDisplayPager;
// populating the list of queries and layouts // populating the list of queries and layouts
var layouts = _projectionManager.DescribeLayouts().SelectMany(x => x.Descriptors).ToList(); var layouts = _projectionManager.DescribeLayouts().SelectMany(x => x.Descriptors).ToList();
model.QueryRecordEntries = Services.ContentManager.Query<QueryPart, QueryPartRecord>().Join<TitlePartRecord>().OrderBy(x => x.Title).List() model.QueryRecordEntries = _orchardServices.ContentManager.Query<QueryPart, QueryPartRecord>().Join<TitlePartRecord>().OrderBy(x => x.Title).List()
.Select(x => new QueryRecordEntry { .Select(x => new QueryRecordEntry {
Id = x.Id, Id = x.Id,
Name = x.Name, Name = x.Name,
LayoutRecordEntries = x.Layouts.Select(l => new LayoutRecordEntry { LayoutRecordEntries = x.Layouts.Select(l => new LayoutRecordEntry {
Id = l.Id, Id = l.Id,
Description = GetLayoutDescription(layouts, l) Description = GetLayoutDescription(layouts, l)
}) })
}); });
// if any values, use default list of the settings // if any values, use default list of the settings
if (!string.IsNullOrWhiteSpace(settings.FilterQueryRecordId)) { if (!string.IsNullOrWhiteSpace(settings.FilterQueryRecordId)) {
var filterQueryRecordId = settings.FilterQueryRecordId.Split('&'); var filterQueryRecordId = settings.FilterQueryRecordId.Split('&');
model.QueryRecordIdFilterEntries = filterQueryRecordId model.QueryRecordIdFilterEntries = filterQueryRecordId
.Select(x => new QueryRecordFilterEntry { .Select(x => new QueryRecordFilterEntry {
Id = x.Split(';')[0], Id = x.Split(';')[0],
LayoutId = x.Split(';')[1] LayoutId = x.Split(';')[1]
}); });
} }
else { else {
model.QueryRecordIdFilterEntries = new List<QueryRecordFilterEntry>(); model.QueryRecordIdFilterEntries = new List<QueryRecordFilterEntry>();
} }
return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix); return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix);
}); });
} }
private static string GetLayoutDescription(IEnumerable<LayoutDescriptor> layouts, LayoutRecord l) { private static string GetLayoutDescription(IEnumerable<LayoutDescriptor> layouts, LayoutRecord l) {
@ -313,7 +312,7 @@ namespace Orchard.Projections.Drivers {
updater.TryUpdateModel(model, Prefix, null, null); updater.TryUpdateModel(model, Prefix, null, null);
model.PartId = part.Id; model.PartId = part.Id;
// check the setting, if it is unlocked, assign the setting value // check the setting, if it is unlocked, assign the setting value
if (settings.LockEditingDisplayPager) { if (settings.LockEditingDisplayPager) {
part.Record.DisplayPager = settings.DisplayPager; part.Record.DisplayPager = settings.DisplayPager;
@ -356,6 +355,12 @@ namespace Orchard.Projections.Drivers {
updater.AddModelError("PagerSuffix", T("Suffix should not contain special characters.")); updater.AddModelError("PagerSuffix", T("Suffix should not contain special characters."));
} }
if (model.Items == 0
&& (part.Record.QueryPartRecord?.FilterGroups.Any(group => group.Filters.Count == 0) ?? false)) {
_orchardServices.Notifier.Warning(
T("The selected Query has at least one empty filter group, which causes all content items to be returned. It is recommended to limit the number of content items queried by setting the 'Items to display' field to a non-zero value."));
}
return Editor(part, shapeHelper); return Editor(part, shapeHelper);
} }
@ -376,12 +381,11 @@ namespace Orchard.Projections.Drivers {
protected override void ImportCompleted(ProjectionPart part, ImportContentContext context) { protected override void ImportCompleted(ProjectionPart part, ImportContentContext context) {
// Assign the query only when everything is imported. // Assign the query only when everything is imported.
var query = context.Attribute(part.PartDefinition.Name, "Query"); var query = context.Attribute(part.PartDefinition.Name, "Query");
if (query != null && context.GetItemFromSession(query).As<QueryPart>()!=null) { if (query != null && context.GetItemFromSession(query).As<QueryPart>() != null) {
part.Record.QueryPartRecord = context.GetItemFromSession(query).As<QueryPart>().Record; part.Record.QueryPartRecord = context.GetItemFromSession(query).As<QueryPart>().Record;
var layoutIndex = context.Attribute(part.PartDefinition.Name, "LayoutIndex"); var layoutIndex = context.Attribute(part.PartDefinition.Name, "LayoutIndex");
int layoutIndexValue;
if (layoutIndex != null if (layoutIndex != null
&& Int32.TryParse(layoutIndex, out layoutIndexValue) && Int32.TryParse(layoutIndex, out int layoutIndexValue)
&& layoutIndexValue >= 0 && layoutIndexValue >= 0
&& part.Record.QueryPartRecord.Layouts.Count > layoutIndexValue) { && part.Record.QueryPartRecord.Layouts.Count > layoutIndexValue) {
part.Record.LayoutRecord = part.Record.QueryPartRecord.Layouts[Int32.Parse(layoutIndex)]; part.Record.LayoutRecord = part.Record.QueryPartRecord.Layouts[Int32.Parse(layoutIndex)];
@ -398,9 +402,9 @@ namespace Orchard.Projections.Drivers {
context.Element(part.PartDefinition.Name).SetAttributeValue("DisplayPager", part.Record.DisplayPager); context.Element(part.PartDefinition.Name).SetAttributeValue("DisplayPager", part.Record.DisplayPager);
if (part.Record.QueryPartRecord != null) { if (part.Record.QueryPartRecord != null) {
var queryPart = Services.ContentManager.Query<QueryPart, QueryPartRecord>("Query").Where(x => x.Id == part.Record.QueryPartRecord.Id).List().FirstOrDefault(); var queryPart = _orchardServices.ContentManager.Query<QueryPart, QueryPartRecord>("Query").Where(x => x.Id == part.Record.QueryPartRecord.Id).List().FirstOrDefault();
if (queryPart != null) { if (queryPart != null) {
var queryIdentity = Services.ContentManager.GetItemMetadata(queryPart).Identity; var queryIdentity = _orchardServices.ContentManager.GetItemMetadata(queryPart).Identity;
context.Element(part.PartDefinition.Name).SetAttributeValue("Query", queryIdentity.ToString()); context.Element(part.PartDefinition.Name).SetAttributeValue("Query", queryIdentity.ToString());
context.Element(part.PartDefinition.Name).SetAttributeValue("LayoutIndex", part.Record.QueryPartRecord.Layouts.IndexOf(part.Record.LayoutRecord)); context.Element(part.PartDefinition.Name).SetAttributeValue("LayoutIndex", part.Record.QueryPartRecord.Layouts.IndexOf(part.Record.LayoutRecord));
} }

28
src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
View File

@ -19,14 +19,16 @@ namespace Orchard.Projections.Drivers {
_projectionManager = projectionManager; _projectionManager = projectionManager;
_formManager = formManager; _formManager = formManager;
} }
protected override string Prefix { protected override string Prefix {
get { get {
return "Query_Part"; return "Query_Part";
} }
} }
protected override DriverResult Editor(QueryPart part, dynamic shapeHelper) {
return Editor(part, null, shapeHelper); protected override DriverResult Editor(QueryPart part, dynamic shapeHelper) =>
} Editor(part, null, shapeHelper);
protected override DriverResult Editor(QueryPart part, IUpdateModel updater, dynamic shapeHelper) { protected override DriverResult Editor(QueryPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new QueryViewModel { VersionScope = part.VersionScope }; var model = new QueryViewModel { VersionScope = part.VersionScope };
if (updater != null) { if (updater != null) {
@ -34,10 +36,10 @@ namespace Orchard.Projections.Drivers {
part.VersionScope = model.VersionScope; part.VersionScope = model.VersionScope;
} }
} }
return ContentShape("Parts_QueryPart_Edit",
() => { return ContentShape("Parts_QueryPart_Edit", () => {
return shapeHelper.EditorTemplate(TemplateName: "Parts/QueryPart_Edit", Model: model, Prefix: Prefix); return shapeHelper.EditorTemplate(TemplateName: "Parts/QueryPart_Edit", Model: model, Prefix: Prefix);
}); });
} }
protected override void Exporting(QueryPart part, ExportContentContext context) { protected override void Exporting(QueryPart part, ExportContentContext context) {
@ -60,12 +62,12 @@ namespace Orchard.Projections.Drivers {
} }
return new XElement("Filter", return new XElement("Filter",
new XAttribute("Category", filter.Category ?? ""), new XAttribute("Category", filter.Category ?? ""),
new XAttribute("Description", filter.Description ?? ""), new XAttribute("Description", filter.Description ?? ""),
new XAttribute("Position", filter.Position), new XAttribute("Position", filter.Position),
new XAttribute("State", state ?? ""), new XAttribute("State", state ?? ""),
new XAttribute("Type", filter.Type ?? "") new XAttribute("Type", filter.Type ?? "")
); );
}) })
) )
) )

51
src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs
View File

@ -108,13 +108,9 @@ namespace Orchard.Projections.Services {
} }
public int GetCount(int queryId, ContentPart part) { public int GetCount(int queryId, ContentPart part) {
var queryRecord = _queryRepository.Get(queryId); var queryRecord = _queryRepository.Get(queryId) ?? throw new ArgumentException("queryId");
if (queryRecord == null) { // Prepare tokens.
throw new ArgumentException("queryId");
}
// prepares tokens
Dictionary<string, object> tokens = new Dictionary<string, object>(); Dictionary<string, object> tokens = new Dictionary<string, object>();
if (part != null) { if (part != null) {
tokens.Add("Content", part.ContentItem); tokens.Add("Content", part.ContentItem);
@ -122,6 +118,7 @@ namespace Orchard.Projections.Services {
var contentQueries = GetContentQueries(queryRecord, Enumerable.Empty<SortCriterionRecord>(), tokens); var contentQueries = GetContentQueries(queryRecord, Enumerable.Empty<SortCriterionRecord>(), tokens);
// Aggregate the result of each filter group.
return queryRecord.FilterGroups.Count > 1 ? return queryRecord.FilterGroups.Count > 1 ?
contentQueries.SelectMany(contentQuery => contentQuery.ListIds()).Distinct().Count() : contentQueries.SelectMany(contentQuery => contentQuery.ListIds()).Distinct().Count() :
contentQueries.Sum(contentQuery => contentQuery.Count()); contentQueries.Sum(contentQuery => contentQuery.Count());
@ -142,13 +139,13 @@ namespace Orchard.Projections.Services {
var contentItems = new List<ContentItem>(); var contentItems = new List<ContentItem>();
// prepares tokens // Prepare tokens.
Dictionary<string, object> tokens = new Dictionary<string, object>(); Dictionary<string, object> tokens = new Dictionary<string, object>();
if (part != null) { if (part != null) {
tokens.Add("Content", part.ContentItem); tokens.Add("Content", part.ContentItem);
} }
// aggregate the result for each group query // Aggregate the result of each filter group.
foreach (var contentQuery in GetContentQueries(queryRecord, queryRecord.SortCriteria.OrderBy(sc => sc.Position), tokens)) { foreach (var contentQuery in GetContentQueries(queryRecord, queryRecord.SortCriteria.OrderBy(sc => sc.Position), tokens)) {
contentItems.AddRange(contentQuery.Slice(skip, count)); contentItems.AddRange(contentQuery.Slice(skip, count));
} }
@ -157,7 +154,7 @@ namespace Orchard.Projections.Services {
return contentItems; return contentItems;
} }
// re-executing the sorting with the cumulated groups // Re-executing the sorting on the aggregated results.
var ids = contentItems.Select(c => c.Id).ToArray(); var ids = contentItems.Select(c => c.Id).ToArray();
if (ids.Length == 0) { if (ids.Length == 0) {
@ -166,7 +163,7 @@ namespace Orchard.Projections.Services {
var groupQuery = _contentManager.HqlQuery().Where(alias => alias.Named("ci"), x => x.InG("Id", ids)); var groupQuery = _contentManager.HqlQuery().Where(alias => alias.Named("ci"), x => x.InG("Id", ids));
// iterate over each sort criteria to apply the alterations to the query object // Iterate over each sort criteria to apply the alterations to the query object.
foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) { foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) {
var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens);
var sortCriterionContext = new SortCriterionContext { var sortCriterionContext = new SortCriterionContext {
@ -179,15 +176,17 @@ namespace Orchard.Projections.Services {
string category = sortCriterion.Category; string category = sortCriterion.Category;
string type = sortCriterion.Type; string type = sortCriterion.Type;
// look for the specific filter component // Find specific sort criterion.
var descriptor = availableSortCriteria.SelectMany(x => x.Descriptors).FirstOrDefault(x => x.Category == category && x.Type == type); var descriptor = availableSortCriteria
.SelectMany(x => x.Descriptors)
.FirstOrDefault(x => x.Category == category && x.Type == type);
// ignore unfound descriptors // Skip if not found.
if (descriptor == null) { if (descriptor == null) {
continue; continue;
} }
// apply alteration // Apply alteration.
descriptor.Sort(sortCriterionContext); descriptor.Sort(sortCriterionContext);
groupQuery = sortCriterionContext.Query; groupQuery = sortCriterionContext.Query;
@ -196,7 +195,10 @@ namespace Orchard.Projections.Services {
return groupQuery.Slice(0, count); return groupQuery.Slice(0, count);
} }
public IEnumerable<IHqlQuery> GetContentQueries(QueryPartRecord queryRecord, IEnumerable<SortCriterionRecord> sortCriteria, Dictionary<string, object> tokens) { public IEnumerable<IHqlQuery> GetContentQueries(
QueryPartRecord queryRecord,
IEnumerable<SortCriterionRecord> sortCriteria,
Dictionary<string, object> tokens) {
var availableFilters = DescribeFilters().ToList(); var availableFilters = DescribeFilters().ToList();
var availableSortCriteria = DescribeSortCriteria().ToList(); var availableSortCriteria = DescribeSortCriteria().ToList();
@ -206,11 +208,11 @@ namespace Orchard.Projections.Services {
var version = queryRecord.VersionScope.ToVersionOptions(); var version = queryRecord.VersionScope.ToVersionOptions();
// pre-executing all groups // Iterate over each filter group and evaluate the filters.
foreach (var group in queryRecord.FilterGroups) { foreach (var group in queryRecord.FilterGroups) {
var contentQuery = _contentManager.HqlQuery().ForVersion(version); var contentQuery = _contentManager.HqlQuery().ForVersion(version);
// iterate over each filter to apply the alterations to the query object // Iterate over each filter to apply the alterations to the query object.
foreach (var filter in group.Filters) { foreach (var filter in group.Filters) {
var tokenizedState = _tokenizer.Replace(filter.State, tokens); var tokenizedState = _tokenizer.Replace(filter.State, tokens);
var filterContext = new FilterContext { var filterContext = new FilterContext {
@ -223,23 +225,23 @@ namespace Orchard.Projections.Services {
string category = filter.Category; string category = filter.Category;
string type = filter.Type; string type = filter.Type;
// look for the specific filter component // Find specific filter.
var descriptor = availableFilters var descriptor = availableFilters
.SelectMany(x => x.Descriptors) .SelectMany(x => x.Descriptors)
.FirstOrDefault(x => x.Category == category && x.Type == type); .FirstOrDefault(x => x.Category == category && x.Type == type);
// ignore unfound descriptors // Skip if not found.
if (descriptor == null) { if (descriptor == null) {
continue; continue;
} }
// apply alteration // Apply alteration.
descriptor.Filter(filterContext); descriptor.Filter(filterContext);
contentQuery = filterContext.Query; contentQuery = filterContext.Query;
} }
// iterate over each sort criteria to apply the alterations to the query object // Iterate over each sort criteria to apply the alterations to the query object.
foreach (var sortCriterion in sortCriteria.OrderBy(s => s.Position)) { foreach (var sortCriterion in sortCriteria.OrderBy(s => s.Position)) {
var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens);
var sortCriterionContext = new SortCriterionContext { var sortCriterionContext = new SortCriterionContext {
@ -252,23 +254,22 @@ namespace Orchard.Projections.Services {
string category = sortCriterion.Category; string category = sortCriterion.Category;
string type = sortCriterion.Type; string type = sortCriterion.Type;
// look for the specific filter component // Find specific sort criterion.
var descriptor = availableSortCriteria var descriptor = availableSortCriteria
.SelectMany(x => x.Descriptors) .SelectMany(x => x.Descriptors)
.FirstOrDefault(x => x.Category == category && x.Type == type); .FirstOrDefault(x => x.Category == category && x.Type == type);
// ignore unfound descriptors // Skip if not found.
if (descriptor == null) { if (descriptor == null) {
continue; continue;
} }
// apply alteration // Apply alteration.
descriptor.Sort(sortCriterionContext); descriptor.Sort(sortCriterionContext);
contentQuery = sortCriterionContext.Query; contentQuery = sortCriterionContext.Query;
} }
yield return contentQuery; yield return contentQuery;
} }
} }

16
src/Orchard.Web/Modules/Orchard.Search/Web.config
View File

@ -68,6 +68,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

16
src/Orchard.Web/Modules/Orchard.Tags/Web.config
View File

@ -68,6 +68,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

16
src/Orchard.Web/Modules/Orchard.Widgets/Web.config
View File

@ -68,6 +68,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

12
src/Orchard.Web/Modules/Upgrade/Web.config
View File

@ -86,6 +86,18 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

20
src/Orchard.Web/Orchard.Web.csproj
View File

@ -95,8 +95,8 @@
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath> <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath> <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
@ -107,19 +107,19 @@
<HintPath>..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath> <HintPath>..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath> <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath> <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath> <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>

16
src/Orchard.Web/Themes/Web.config
View File

@ -91,6 +91,22 @@
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" /> <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<system.codedom> <system.codedom>

18
src/Orchard.Web/Web.config
View File

@ -266,13 +266,25 @@
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" /> <bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<!-- Registering Roslyn as a compiler for Dynamic Compilation. --> <!-- Registering Roslyn as a compiler for Dynamic Compilation. -->

10
src/Orchard.Web/packages.config
View File

@ -17,10 +17,10 @@
<package id="Npgsql" version="4.0.17" targetFramework="net48" /> <package id="Npgsql" version="4.0.17" targetFramework="net48" />
<package id="Orchard.NuGet.Core" version="1.1.0.0" targetFramework="net48" /> <package id="Orchard.NuGet.Core" version="1.1.0.0" targetFramework="net48" />
<package id="Owin" version="1.0" targetFramework="net48" /> <package id="Owin" version="1.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" /> <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.4" targetFramework="net48" /> <package id="System.Memory" version="4.6.0" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" /> <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" /> <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net48" /> <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" /> <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
</packages> </packages>