Upgrade to OC 2.0

CrestApps · Sep 9, 2024 · f563585 · f563585
1 parent 4b91812
commit f563585
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -2,14 +2,17 @@
 <configuration>
     <packageSources>
         <clear />
-        <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
         <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+        <!--
+        <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
         <add key="NuGet2" value="https://api.nuget.org/v3/index.json" />
+        -->
     </packageSources>
 
-    <packageSourceMapping>
-        <!-- key value for <packageSource> should match key values from <packageSources> element -->
-        <!-- To point OrchardCore to previews, update the packageSource key to OrchardCorePreview. -->
+    <!-- key value for <packageSource> should match key values from <packageSources> element -->
+    <!-- To point OrchardCore to previews, update the packageSource key to OrchardCorePreview. -->
+    <!--
+        <packageSourceMapping>
 
         <packageSource key="NuGet2">
             <package pattern="OrchardCore.Translations.*" />
@@ -30,6 +33,6 @@
             <package pattern="*" />
         </packageSource>
 
-    </packageSourceMapping>
-
+        </packageSourceMapping>
+    -->
 </configuration>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <OrchardCoreVersion>2.0.0-preview-18325</OrchardCoreVersion>
+    <OrchardCoreVersion>2.0.0</OrchardCoreVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Modules/CrestApps.OrchardCore.Users/AvatarAdminMenu.cs b/src/Modules/CrestApps.OrchardCore.Users/AvatarAdminMenu.cs
@@ -1,39 +1,40 @@
 using CrestApps.OrchardCore.Users.Drivers;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
 namespace CrestApps.OrchardCore.Users;
 
-public class AvatarAdminMenu : INavigationProvider
+public sealed class AvatarAdminMenu : AdminNavigationProvider
 {
-    protected readonly IStringLocalizer S;
+    private static readonly RouteValueDictionary _routeValues = new()
+    {
+        { "area", "OrchardCore.Settings" },
+        { "groupId", UserAvatarOptionsDisplayDriver.GroupId },
+    };
+
+    internal readonly IStringLocalizer S;
 
     public AvatarAdminMenu(IStringLocalizer<UserDisplayNameAdminMenu> stringLocalizer)
     {
         S = stringLocalizer;
     }
 
-    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
-        if (!NavigationHelper.IsAdminMenu(name))
-        {
-            return Task.CompletedTask;
-        }
-
         builder
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["Settings"], settings => settings
                     .Add(S["User Avatars"], S["User Avatars"].PrefixPosition(), userAvatars => userAvatars
                         .AddClass("user-avatars")
                         .Id("userAvatars")
-                        .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = UserAvatarOptionsDisplayDriver.GroupId })
+                        .Action("Index", "Admin", _routeValues)
                         .Permission(UserPermissions.ManageAvatarSettings)
                         .LocalNav()
                     )
                 )
             );
 
-
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/Modules/CrestApps.OrchardCore.Users/UserDisplayNameAdminMenu.cs b/src/Modules/CrestApps.OrchardCore.Users/UserDisplayNameAdminMenu.cs
@@ -1,39 +1,41 @@
 using CrestApps.OrchardCore.Users.Drivers;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 using OrchardCore.Navigation;
 
 namespace CrestApps.OrchardCore.Users;
 
-public sealed class UserDisplayNameAdminMenu : INavigationProvider
+public sealed class UserDisplayNameAdminMenu : AdminNavigationProvider
 {
+    private static readonly RouteValueDictionary _routeValues = new()
+    {
+        { "area", "OrchardCore.Settings" },
+        { "groupId", DisplayNameSettingsDisplayDriver.GroupId },
+    };
+
+
     internal readonly IStringLocalizer S;
 
     public UserDisplayNameAdminMenu(IStringLocalizer<UserDisplayNameAdminMenu> stringLocalizer)
     {
         S = stringLocalizer;
     }
 
-    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    protected override ValueTask BuildAsync(NavigationBuilder builder)
     {
-        if (!NavigationHelper.IsAdminMenu(name))
-        {
-            return Task.CompletedTask;
-        }
-
         builder
             .Add(S["Configuration"], configuration => configuration
                 .Add(S["Settings"], settings => settings
                     .Add(S["User Display Name"], S["User Display Name"].PrefixPosition(), userDisplayName => userDisplayName
                         .AddClass("user-display-name")
                         .Id("userDisplayName")
-                        .Action("Index", "Admin", new { area = "OrchardCore.Settings", groupId = DisplayNameSettingsDisplayDriver.GroupId })
+                        .Action("Index", "Admin", _routeValues)
                         .Permission(UserPermissions.ManageDisplaySettings)
                         .LocalNav()
                     )
                 )
             );
 
-
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 }