lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-09 19:24:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing auto-merge mistakes

Browse Source
This commit is contained in:
Benedek Farkas
2023-05-25 20:01:45 +02:00
parent 1a81d95545
commit aa811bc41e
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Alias/Web.config
View File

@@ -56,6 +56,7 @@
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />

1
src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
View File

@@ -62,6 +62,7 @@
</Reference>
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>

2
src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
View File

@@ -201,8 +201,6 @@
<Compile Include="Models\QueryVersionScopeOptions.cs" />
<Compile Include="Settings\ProjectionPartEditorEvents.cs" />
<Compile Include="Settings\ProjectionPartSettings.cs" />
<Compile Include="Settings\ProjectionPartEditorEvents.cs" />
<Compile Include="Settings\ProjectionPartSettings.cs" />
<Compile Include="Shapes.cs" />
<Compile Include="Descriptors\Layout\LayoutComponentResult.cs" />
<Compile Include="Descriptors\Layout\LayoutContext.cs" />