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

OCC-245: Update OC preview version #117

Merged
merged 32 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version #117

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d5ceb3f
Update OC preview version.
sarahelsaig May 28, 2024
510baa8
Update OC preview version.
sarahelsaig May 30, 2024
f0ea5b0
Fix new "Obsolete" warnings.
sarahelsaig May 30, 2024
26d266a
Simplify initialization.
sarahelsaig May 31, 2024
10e176a
Update OC preview version.
sarahelsaig Jun 5, 2024
b89aec6
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
a9e7566
Update OC version.
sarahelsaig Jun 18, 2024
e6691cb
Update OC version.
sarahelsaig Jun 19, 2024
8707888
Update OC preview version.
sarahelsaig Jun 20, 2024
4ec582c
Update OC preview version.
sarahelsaig Jun 21, 2024
1e74624
Merge remote-tracking branch 'origin/issue/OCC-245' into issue/OCC-245
sarahelsaig Jun 21, 2024
d0f4940
Update HL and UITT NuGet versions.
sarahelsaig Jun 24, 2024
672adf3
Update OC NuGet versions.
sarahelsaig Jun 24, 2024
60fd563
Update to latest OC preview version.
sarahelsaig Jul 2, 2024
198bc42
Update OC preview version.
sarahelsaig Jul 11, 2024
bd3e81f
Fix package consolidation.
sarahelsaig Jul 11, 2024
3f43732
Update HL version.
sarahelsaig Jul 13, 2024
45533cb
Update UITT version.
sarahelsaig Jul 13, 2024
03c75d5
Update HL nuget version.
sarahelsaig Jul 16, 2024
081fcae
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
dfd5f59
Update package version.
sarahelsaig Jul 16, 2024
4e3d10f
Update OC preview versions.
sarahelsaig Jul 24, 2024
3e8e76f
Update ResourceManagerDecorator from Upstream.
sarahelsaig Jul 26, 2024
83ec11e
Update HL preview version.
sarahelsaig Jul 26, 2024
accc03d
Update UITT preview version.
sarahelsaig Jul 26, 2024
065fc54
Update HL preview.
sarahelsaig Jul 27, 2024
293756f
Update UITT version.
sarahelsaig Jul 27, 2024
079f4cf
Update UITT preview version.
sarahelsaig Jul 27, 2024
805baf6
Update HE version.
sarahelsaig Jul 27, 2024
b0c98f2
NuGet.config
sarahelsaig Jul 27, 2024
1222574
Update HL nuget version.
sarahelsaig Jul 27, 2024
970e5ff
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.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme.Samples/Views/Widget-LayoutInjection.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

@* You can even include shapes conditionally. In this case we want a link to the admin dashboard but only for users who
are able to access it. Using this approach can be much easier than implementing a custom layer condition. *@
@if (await AuthorizationService.AuthorizeAsync(User, Permissions.AccessAdminPanel))
@if (await AuthorizationService.AuthorizeAsync(User, AdminPermissions.AccessAdminPanel))
{
<zone name="@ZoneNames.Footer" position="1">
<div class="zoneInsertionExample_footer">
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme.Tests.UI/Lombiq.BaseTheme.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-preview.5.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Theme.Targets" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Menu" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18200" />
<PackageReference Include="OrchardCore.ContentManagement" 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.Theme.Targets" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Menu" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.Media" Version="2.0.0-preview-18282" />
<PackageReference Include="OrchardCore.ContentManagement" 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" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand All @@ -59,11 +59,11 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries" Version="10.0.0" />
<PackageReference Include="Lombiq.HelpfulLibraries" Version="10.0.1-preview.5.occ-245" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="8.0.1" />
<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-preview.5.occ-245" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<PackageReference Include="Lombiq.HelpfulLibraries.Attributes" Version="10.0.1-preview.5.occ-245" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />

<Content Include="Assets/Styles/**/*.*">
<IncludeInPackage>true</IncludeInPackage>
Expand Down
10 changes: 4 additions & 6 deletions Lombiq.BaseTheme/Services/MainMenuWidgetFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@ protected override async Task<MenuWidgetViewModel> GetViewModelAsync()
_cssClassHolder.AddClassToZone(ZoneNames.Navigation, "navbar-expand-md");
_cssClassHolder.AddClassToZone(ZoneNames.Navigation, "navbar");

return new()
{
MenuItems = await _navigationManager.BuildMenuAsync(
return new(
noWrapper: true, // The navigation zone is already the wrapper.
menuItems: await _navigationManager.BuildMenuAsync(
MainMenuNavigationProviderBase.MainNavigationName,
_actionContextAccessor.ActionContext),
NoWrapper = true, // The navigation zone is already the wrapper.
};
_actionContextAccessor.ActionContext));
}
}
9 changes: 2 additions & 7 deletions Lombiq.BaseTheme/Services/ResourceManagerDecorator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;

namespace Lombiq.BaseTheme.Services;

Expand Down Expand Up @@ -93,9 +92,7 @@ public void RenderStylesheet(TextWriter writer)

var first = true;

var styleSheets = GetRequiredResources("stylesheet").ToList();

foreach (var context in styleSheets)
foreach (var context in GetRequiredResources("stylesheet"))
{
if (context.Settings.Location == ResourceLocation.Inline)
{
Expand All @@ -119,10 +116,8 @@ public void RenderStylesheet(TextWriter writer)
context.WriteTo(writer, _options.ContentBasePath);
}

var registeredStyles = GetRegisteredStyles().ToArray();
for (var i = 0; i < registeredStyles.Length; i++)
foreach (var context in GetRegisteredStyles())
{
var context = registeredStyles[i];
if (!first)
{
writer.Write(Environment.NewLine);
Expand Down