Skip to content

Commit

Permalink
Merge pull request #264 from Lombiq/issue/OSOE-392
Browse files Browse the repository at this point in the history
OSOE-392: Upgrade to Orchard Core 1.5
  • Loading branch information
Piedone committed Dec 6, 2022
2 parents 83ce2e3 + 10a2e4a commit 6e56dfa
Show file tree
Hide file tree
Showing 27 changed files with 72 additions and 72 deletions.
48 changes: 24 additions & 24 deletions NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="2.1.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.ChartJs" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.DataTables" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="3.6.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="3.3.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="1.0.2-alpha.0.nest-370" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="1.0.2-alpha.0.nest-370" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.JsonEditor" Version="2.2.0" />
<PackageReference Include="Lombiq.OrchardCoreApiClient" Version="1.1.0" />
<PackageReference Include="Lombiq.Privacy" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.SetupExtensions" Version="2.1.0" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.UIKit" Version="2.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.AuditTrailExtensions" Version="3.0.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="2.0.0" />
<PackageReference Include="Lombiq.BaseTheme.Samples" Version="2.0.0" />
<PackageReference Include="Lombiq.ChartJs" Version="3.0.0" />
<PackageReference Include="Lombiq.ChartJs.Samples" Version="3.0.0" />
<PackageReference Include="Lombiq.DataTables" Version="4.0.0" />
<PackageReference Include="Lombiq.DataTables.Samples" Version="4.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="4.0.0" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="2.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="2.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="3.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="3.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="3.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="3.0.0" />
<PackageReference Include="Lombiq.JsonEditor" Version="3.0.0" />
<PackageReference Include="Lombiq.OrchardCoreApiClient" Version="2.0.0" />
<PackageReference Include="Lombiq.Privacy" Version="4.0.0" />
<PackageReference Include="Lombiq.Privacy.Samples" Version="4.0.0" />
<PackageReference Include="Lombiq.SetupExtensions" Version="3.0.0" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="5.0.0" />
<PackageReference Include="Lombiq.UIKit" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="1.2.2" Condition="'$(RazorRuntimeCompilation)' == 'true'" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.4.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.5.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
},
{
"Rule": "Exclude",
"Expression": "OrchardCore.Lucene"
"Expression": "OrchardCore.Search.Lucene"
},
{
"Rule": "Exclude",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="5.0.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

<ItemGroup>
<PackageReference Include="Lombiq.Npm.Targets" Version="1.2.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.Theme.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.5.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="1.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="2.4.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="3.3.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="3.3.2-alpha.1.osoe-412" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="1.0.2-alpha.2.osoe-456" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="2.3.3-alpha.14.nest-358" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="3.2.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="3.6.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.Tests.UI" Version="4.0.2-alpha.0.osoe-412" />
<PackageReference Include="Lombiq.BaseTheme.Tests.UI" Version="2.0.0" />
<PackageReference Include="Lombiq.ChartJs.Tests.UI" Version="3.0.0" />
<PackageReference Include="Lombiq.DataTables.Tests.UI" Version="4.0.0" />
<PackageReference Include="Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI" Version="4.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="2.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="3.0.0" />
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="3.0.0" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="4.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="4.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lombiq.HelpfulLibraries" Version="4.7.0" />
<PackageReference Include="Lombiq.Tests" Version="2.1.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="5.0.0" />
<PackageReference Include="Lombiq.Tests" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.4.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.5.0" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.5.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Lombiq.OSOCE.Web/NLog.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<targets>
<!-- write logs to file -->
<target xsi:type="File" name="allfile" fileName="${var:configDir}/App_Data/logs/orchard-log-${shortdate}.log"
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId.Id}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" />
layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}" />

<!--<target xsi:type="Null" name="blackhole" /> -->
</targets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
},
{
"Rule": "Exclude",
"Expression": "OrchardCore.Lucene"
"Expression": "OrchardCore.Search.Lucene"
},
{
"Rule": "Exclude",
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.AuditTrailExtensions
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.JsonEditor
8 changes: 4 additions & 4 deletions src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.4.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.4.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/Lombiq.SetupExtensions

0 comments on commit 6e56dfa

Please sign in to comment.