Merge pull request #91 from Lombiq/issue/OSOE-818

OSOE-818: Upgrade to Orchard Core 2.0
Lombiq · Sep 25, 2024 · e455d92 · e455d92
2 parents 44ec93a + 22e373c
commit e455d92
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/...ure.ApplicationInsights.Tests.UI/Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.csproj b/...ure.ApplicationInsights.Tests.UI/Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.csproj
@@ -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="11.0.0" />
+    <PackageReference Include="Lombiq.Privacy.Tests.UI" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.Hosting.Azure.ApplicationInsights/Lombiq.Hosting.Azure.ApplicationInsights.csproj b/Lombiq.Hosting.Azure.ApplicationInsights/Lombiq.Hosting.Azure.ApplicationInsights.csproj
@@ -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="11.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Lombiq.Hosting.Azure.ApplicationInsights/Services/LoggingTestBackgroundTask.cs b/Lombiq.Hosting.Azure.ApplicationInsights/Services/LoggingTestBackgroundTask.cs
@@ -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)
     {

diff --git a/Lombiq.Hosting.Azure.ApplicationInsights/Services/TrackingScriptInjectingFilter.cs b/Lombiq.Hosting.Azure.ApplicationInsights/Services/TrackingScriptInjectingFilter.cs
@@ -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;

diff --git a/Lombiq.Hosting.Azure.ApplicationInsights/Startup.cs b/Lombiq.Hosting.Azure.ApplicationInsights/Startup.cs
@@ -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;

diff --git a/NuGet.config b/NuGet.config
@@ -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>