Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

OSOE-818: Upgrade to Orchard Core 2.0 #91

Merged
merged 68 commits into from
Sep 25, 2024
Merged

OSOE-818: Upgrade to Orchard Core 2.0 #91

Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
494e420
Update NuGet versions to pre-release.
sarahelsaig Feb 22, 2024
301eee5
Merge remote-tracking branch 'origin/dev' into issue/OSOE-795
sarahelsaig Feb 22, 2024
a76f62a
Update OC to latest (because of bug fix for WorkflowTypeStep)
sarahelsaig Mar 3, 2024
486b3af
Update OC preview version.
sarahelsaig Mar 7, 2024
0c56a6e
Update OC package
sarahelsaig Mar 13, 2024
99ca071
Merge remote-tracking branch 'origin/dev' into issue/OSOE-795
sarahelsaig Apr 22, 2024
bf50c01
Update OC preview version.
sarahelsaig Apr 23, 2024
45b84cb
Update OC package version.
sarahelsaig Apr 27, 2024
cd41647
Update OC versions
sarahelsaig May 4, 2024
21a2fc7
Update OC to the latest preview.
sarahelsaig May 7, 2024
6e8c6a8
Merge pull request #81 from Lombiq/issue/OSOE-795
dministro May 15, 2024
1f976de
Merge remote-tracking branch 'origin/dev' into task/system-text-json-…
sarahelsaig May 28, 2024
643927b
Update OC preview version.
sarahelsaig May 28, 2024
91d8b5d
Update OC preview version.
sarahelsaig May 30, 2024
9b9fe39
Update OC preview version.
sarahelsaig Jun 5, 2024
75b5fbc
Merge remote-tracking branch 'origin/dev' into task/system-text-json-…
sarahelsaig Jun 14, 2024
e7b1456
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
30bfe5b
Update OC version.
sarahelsaig Jun 18, 2024
092809b
Update OC version.
sarahelsaig Jun 19, 2024
5ff8830
Update OC preview version.
sarahelsaig Jun 20, 2024
58ae9ae
Update OC preview version.
sarahelsaig Jun 21, 2024
0fed3d4
Merge remote-tracking branch 'origin/issue/OCC-245' into issue/OCC-245
sarahelsaig Jun 21, 2024
979a1c4
Update HL and UITT NuGet versions.
sarahelsaig Jun 24, 2024
648ceaa
Update OC NuGet versions.
sarahelsaig Jun 24, 2024
de2538e
Update to latest OC preview version.
sarahelsaig Jul 2, 2024
472d3b3
Update OC preview version.
sarahelsaig Jul 11, 2024
07211e5
Update HL version.
sarahelsaig Jul 13, 2024
8b8d12b
Update UITT version.
sarahelsaig Jul 13, 2024
dfd1c68
Update HL nuget version.
sarahelsaig Jul 16, 2024
c9b8f82
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
8c3ca24
Update package version.
sarahelsaig Jul 16, 2024
494821a
Update OC preview versions.
sarahelsaig Jul 24, 2024
bfe19f5
Update HL preview version.
sarahelsaig Jul 26, 2024
92aa3b2
Update UITT preview version.
sarahelsaig Jul 26, 2024
82af76d
Update HL preview.
sarahelsaig Jul 27, 2024
f982ef7
Update UITT version.
sarahelsaig Jul 27, 2024
2707f7c
Update UITT preview version.
sarahelsaig Jul 27, 2024
04271c3
NuGet.config
sarahelsaig Jul 27, 2024
2db2085
Update Privacy version.
sarahelsaig Jul 27, 2024
9af33f6
Update HL nuget version.
sarahelsaig Jul 27, 2024
780209c
Update HL.
sarahelsaig Jul 27, 2024
3d87ee6
Merge pull request #86 from Lombiq/issue/OCC-245
Piedone Jul 28, 2024
5c0fb95
Update OC preview version.
sarahelsaig Jul 29, 2024
a3402f0
Update OC preview version again (sigh).
sarahelsaig Jul 30, 2024
9fb31dc
Update OC preview version.
sarahelsaig Aug 6, 2024
b7e1e75
Merge remote-tracking branch 'origin/dev' into task/system-text-json-…
sarahelsaig Aug 7, 2024
46de53f
Update HL alpha version.
sarahelsaig Aug 7, 2024
89f7e5b
Update UITT alpha version.
sarahelsaig Aug 7, 2024
e4c34bd
Update Privacy.
sarahelsaig Aug 7, 2024
f41a437
Update OC preview version.
sarahelsaig Aug 7, 2024
f704185
Update OC preview.
sarahelsaig Aug 8, 2024
8272a27
Update HL alpha version.
sarahelsaig Aug 9, 2024
ab69fa1
Update UITT alpha version.
sarahelsaig Aug 9, 2024
2422345
Update OC previews.
sarahelsaig Aug 13, 2024
f0696c0
Update OC preview version.
sarahelsaig Aug 17, 2024
677f558
Update OC preview version.
sarahelsaig Aug 20, 2024
a0c2345
Update Privacy alpha.
sarahelsaig Aug 20, 2024
6be9bad
Update OC preview version.
sarahelsaig Aug 21, 2024
10e5374
Update OC preview version.
sarahelsaig Aug 23, 2024
ed7fc32
Use OC release version.
sarahelsaig Sep 22, 2024
56c8fb9
Update HL preview.
sarahelsaig Sep 23, 2024
666a473
Update HL.
sarahelsaig Sep 23, 2024
56ad510
Update Privacy.
sarahelsaig Sep 23, 2024
c8d8220
Make migrations and background tasks sealed.
sarahelsaig Sep 24, 2024
0608ca7
Seal INavigationProvider, IAsyncResultFilter, IPermissionProvider, St…
sarahelsaig Sep 24, 2024
5a4da83
Update HL NuGet version.
sarahelsaig Sep 25, 2024
98f6e90
Update UITT version.
sarahelsaig Sep 25, 2024
22e373c
Update Privacy version.
sarahelsaig Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ure.ApplicationInsights.Tests.UI/Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="8.0.1" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.5.osoe-818" />
<PackageReference Include="Lombiq.Privacy.Tests.UI" Version="8.0.2-alpha.3.osoe-818" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions Lombiq.Hosting.Azure.ApplicationInsights/Lombiq.Hosting.Azure.ApplicationInsights.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="OrchardCore.Media.Azure" Version="1.8.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.8.0" />
<PackageReference Include="OrchardCore.Media.Azure" Version="2.0.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.8.osoe-818" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Azure.ApplicationInsights/Services/LoggingTestBackgroundTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Lombiq.Hosting.Azure.ApplicationInsights.Services;
[BackgroundTask(
Schedule = "* * * * *",
Description = "Logs messages of various levels to test Application Insights log collection (and logging in general).")]
public class LoggingTestBackgroundTask : IBackgroundTask
public sealed class LoggingTestBackgroundTask : IBackgroundTask
{
public Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken)
{
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Azure.ApplicationInsights/Services/TrackingScriptInjectingFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Lombiq.Hosting.Azure.ApplicationInsights.Services;

public class TrackingScriptInjectingFilter : IAsyncResultFilter
public sealed class TrackingScriptInjectingFilter : IAsyncResultFilter
{
private readonly IResourceManager _resourceManager;
private readonly IOptions<ApplicationInsightsOptions> _applicationInsightsOptions;
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Hosting.Azure.ApplicationInsights/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace Lombiq.Hosting.Azure.ApplicationInsights;

public class Startup : StartupBase
public sealed class Startup : StartupBase
{
private readonly ApplicationInsightsOptions _applicationInsightsOptions;
private readonly ApplicationInsightsServiceOptions _applicationInsightsServiceOptions;
Expand Down
10 changes: 10 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!-- Ignore global configuration -->
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
<add key="Lombiq" value="https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json" />
</packageSources>
</configuration>