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 #68

Merged
merged 28 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version #68

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
51ca667
Update OC preview version.
sarahelsaig May 28, 2024
a0e7f91
Update OC preview version.
sarahelsaig May 30, 2024
605c107
Fix new "Obsolete" warnings.
sarahelsaig May 30, 2024
a01290c
Unusing.
sarahelsaig May 30, 2024
e401d2c
Update OC preview version.
sarahelsaig Jun 5, 2024
3bc7399
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
d289fd9
Fix warnings.
sarahelsaig Jun 17, 2024
f7cc9bb
Update OC version.
sarahelsaig Jun 18, 2024
c00df41
Update OC version.
sarahelsaig Jun 19, 2024
53ebd47
Update OC preview version.
sarahelsaig Jun 21, 2024
39d2027
Update OC preview version.
sarahelsaig Jul 11, 2024
0bd8558
Merge remote-tracking branch 'origin/dev' into issue/OCC-245
sarahelsaig Jul 11, 2024
0b4fe01
Fix package consolidation.
sarahelsaig Jul 11, 2024
133527e
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jul 13, 2024
4b50dd0
Update HL version.
sarahelsaig Jul 13, 2024
160cd3e
Update UITT version.
sarahelsaig Jul 13, 2024
14ef59c
Update HL nuget version.
sarahelsaig Jul 16, 2024
47ef9db
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
17c9f61
Update package version.
sarahelsaig Jul 16, 2024
1b1ea9b
Update OC preview versions.
sarahelsaig Jul 24, 2024
f569020
Update HL preview version.
sarahelsaig Jul 26, 2024
b6f89db
Update UITT preview version.
sarahelsaig Jul 26, 2024
2a6c750
Update HL preview.
sarahelsaig Jul 27, 2024
eeb5e75
Update UITT version.
sarahelsaig Jul 27, 2024
ab46984
Update UITT preview version.
sarahelsaig Jul 27, 2024
26d6264
NuGet.config
sarahelsaig Jul 27, 2024
d3768b9
Update HL nuget version.
sarahelsaig Jul 27, 2024
eff4332
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
4 changes: 2 additions & 2 deletions Lombiq.ContentEditors.Samples/Controllers/FrontEndDemoContentItemAsyncEditorController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Lombiq.ContentEditors.ViewModels;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using OrchardCore.Contents;
using OrchardCore.Modules;
using System.Threading.Tasks;
using static OrchardCore.Contents.CommonPermissions;

namespace Lombiq.ContentEditors.Samples.Controllers;

Expand All @@ -25,7 +25,7 @@ public async Task<IActionResult> Index(string contentItemId)
{
if (!ModelState.IsValid) return BadRequest(ModelState);

if (!await _authorizationService.AuthorizeAsync(User, Permissions.EditContent)) return this.ChallengeOrForbid();
if (!await _authorizationService.AuthorizeAsync(User, EditContent)) return this.ChallengeOrForbid();

// You can use the existing ContentItemAsyncEditorViewModel to pass the required data.
return View(
Expand Down
4 changes: 2 additions & 2 deletions Lombiq.ContentEditors.Samples/Lombiq.ContentEditors.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Contents" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Contents" Version="2.0.0-preview-18282" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.ContentEditors.Tests.UI/Lombiq.ContentEditors.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.3.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions Lombiq.ContentEditors/Lombiq.ContentEditors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentFields" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18282" />
</ItemGroup>

<ItemGroup>
Expand All @@ -47,7 +47,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="10.0.1-preview.4.occ-245" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="2.1.0" />
</ItemGroup>

Expand Down