Merge pull request #140 from Lombiq/issue/OCC-245

OCC-245: Update OC preview version
Lombiq · Jul 28, 2024 · 4eb5d24 · 4eb5d24
2 parents 90572e3 + a35510b
commit 4eb5d24
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 27 deletions.
diff --git a/Lombiq.VueJs.Samples/Controllers/QrCardController.cs b/Lombiq.VueJs.Samples/Controllers/QrCardController.cs
@@ -1,10 +1,7 @@
 using Lombiq.VueJs.Samples.ViewModels;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.ContentManagement;
-using OrchardCore.Mvc.Core.Utilities;
-using System;
 using System.Threading.Tasks;
 using static Lombiq.HelpfulLibraries.AspNetCore.Security.ContentSecurityPolicyDirectives;
 using static Lombiq.HelpfulLibraries.AspNetCore.Security.ContentSecurityPolicyDirectives.CommonValues;
@@ -14,25 +11,17 @@ namespace Lombiq.VueJs.Samples.Controllers;
 public class QrCardController : Controller
 {
     private readonly IContentManager _contentManager;
-    private readonly Lazy<LinkGenerator> _linkGenerator;
 
-    public QrCardController(IContentManager contentManager, Lazy<LinkGenerator> linkGenerator)
-    {
+    public QrCardController(IContentManager contentManager) =>
         _contentManager = contentManager;
-        _linkGenerator = linkGenerator;
-    }
 
     /// <remarks><para>Open this from under /Lombiq.VueJs.Samples/QrCard/Index.</para></remarks>
     [ContentSecurityPolicy(Blob, WorkerSrc, ScriptSrc)]
-    public ActionResult Index()
-    {
-        var apiUrl = _linkGenerator.Value.GetPathByAction(nameof(GetBusinessCard), typeof(QrCardController).ControllerName());
-
-        return View(new QrCardAppViewModel
+    public ActionResult Index() =>
+        View(new QrCardAppViewModel
         {
-            ApiUrl = apiUrl,
+            ApiUrl = Url.Action(nameof(GetBusinessCard)),
         });
-    }
 
     public async Task<ActionResult> GetBusinessCard(string cardId)
     {

diff --git a/Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj b/Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj
@@ -33,10 +33,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
     <PackageReference Include="ZXing.Net.Bindings.ImageSharp.V2" Version="0.16.15" />
   </ItemGroup>
 
@@ -50,7 +50,7 @@
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
     <PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Common" Version="10.0.1-alpha.2.occ-245" />
   </ItemGroup>
 
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />

diff --git a/Lombiq.VueJs.Tests.UI/Lombiq.VueJs.Tests.UI.csproj b/Lombiq.VueJs.Tests.UI/Lombiq.VueJs.Tests.UI.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-alpha.1.occ-245" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.VueJs/Lombiq.VueJs.csproj b/Lombiq.VueJs/Lombiq.VueJs.csproj
@@ -56,9 +56,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">
@@ -69,10 +69,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-alpha.2.occ-245" />
     <PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.SourceGenerators" Version="10.0.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <PackageReference Include="Lombiq.HelpfulLibraries.Attributes" Version="10.0.0" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.SourceGenerators" Version="10.0.1-alpha.2.occ-245" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.Attributes" Version="10.0.1-alpha.2.occ-245" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
   </ItemGroup>
 
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />

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>