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

Jump to bottom

OCC-245: Update OC preview version #140

Merged
merged 26 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
333fbc6
Update OC preview version.
sarahelsaig May 28, 2024
060fc1c
Update OC preview version.
sarahelsaig May 30, 2024
b611c06
Simplify/cleanup/fix QrCardController.Index.
sarahelsaig Jun 2, 2024
23501d0
Update OC preview version.
sarahelsaig Jun 5, 2024
5f3a6b0
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
12f7489
Update OC version.
sarahelsaig Jun 18, 2024
bed391f
Update OC version.
sarahelsaig Jun 19, 2024
3ada95b
Update OC preview version.
sarahelsaig Jun 21, 2024
f698853
Update OC preview version.
sarahelsaig Jul 11, 2024
a9c9999
Merge remote-tracking branch 'origin/dev' into issue/OCC-245
sarahelsaig Jul 11, 2024
5b936b1
Fix package consolidation.
sarahelsaig Jul 11, 2024
32deed7
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jul 13, 2024
39b1fc3
Update HL version.
sarahelsaig Jul 13, 2024
1de1605
Update UITT version.
sarahelsaig Jul 13, 2024
4a8a6ff
Update HL nuget version.
sarahelsaig Jul 16, 2024
f560a68
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
a105bb9
Update package version.
sarahelsaig Jul 16, 2024
837635b
Update OC preview versions.
sarahelsaig Jul 24, 2024
69ecead
Update HL preview version.
sarahelsaig Jul 26, 2024
7039bbf
Update UITT preview version.
sarahelsaig Jul 26, 2024
9d9eee2
Update HL preview.
sarahelsaig Jul 27, 2024
d2accf2
Update UITT version.
sarahelsaig Jul 27, 2024
ac4433b
Update UITT preview version.
sarahelsaig Jul 27, 2024
c9ee7e1
NuGet.config
sarahelsaig Jul 27, 2024
107a6ba
Update HL nuget version.
sarahelsaig Jul 27, 2024
a35510b
Update HL.
sarahelsaig Jul 27, 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
19 changes: 4 additions & 15 deletions Lombiq.VueJs.Samples/Controllers/QrCardController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
{
Expand Down
10 changes: 5 additions & 5 deletions Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.VueJs.Tests.UI/Lombiq.VueJs.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions Lombiq.VueJs/Lombiq.VueJs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand All @@ -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" />
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>