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

update module template to .NET 8.0.7 #4423

Merged
merged 1 commit into from
Jul 17, 2024
Merged

update module template to .NET 8.0.7 #4423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Oqtane.Server/Modules/HtmlText/Manager/HtmlTextManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public async Task<List<SearchContent>> GetSearchContentsAsync(PageModule pageMod
Title = pageModule.Module.Title,
Description = string.Empty,
Body = htmltext.Content,
ContentModifiedBy = htmltext.ModifiedBy,
ContentModifiedOn = htmltext.ModifiedOn
ContentModifiedBy = htmltext.CreatedBy,
ContentModifiedOn = htmltext.CreatedOn
});
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...ver/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ else
}

@code {
// uncomment the following line to use Static render mode for this component
// public override string RenderMode => RenderModes.Static;
public override string RenderMode => RenderModes.Static;

public override List<Resource> Resources => new List<Resource>()
{
Expand Down
6 changes: 3 additions & 3 deletions ...ne.Server/wwwroot/Modules/Templates/External/Client/[Owner].Module.[Module].Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
Expand Down
33 changes: 18 additions & 15 deletions Oqtane.Server/wwwroot/Modules/Templates/External/Server/Manager/[Module]Manager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Oqtane.Enums;
using Oqtane.Repository;
using [Owner].Module.[Module].Repository;
using System.Threading.Tasks;

namespace [Owner].Module.[Module].Manager
{
Expand Down Expand Up @@ -60,23 +61,25 @@ public void ImportModule(Oqtane.Models.Module module, string content, string ver
}
}

public List<SearchContent> GetSearchContents(Oqtane.Models.Module module, DateTime startTime)
public Task<List<SearchContent>> GetSearchContentsAsync(PageModule pageModule, DateTime lastIndexedOn)
{
var searchContentList = new List<SearchContent>();
var searchContentList = new List<SearchContent>();

var [Module]s = _[Module]Repository.Get[Module]s(module.ModuleId);
foreach (var [Module] in [Module]s)
{
searchContentList.Add(new SearchContent
{
Title = module.Title,
Description = string.Empty,
Body = [Module].Name,
ModifiedTime = [Module].ModifiedOn
});
}
foreach (var [Module] in _[Module]Repository.Get[Module]s(pageModule.ModuleId))
{
if ([Module].ModifiedOn >= lastIndexedOn)
{
searchContentList.Add(new SearchContent
{
Title = pageModule.Module.Title,
Body = [Module].Name,
ContentModifiedBy = [Module].ModifiedBy,
ContentModifiedOn = [Module].ModifiedOn
});
}
}

return searchContentList;
return Task.FromResult(searchContentList);
}
}
}
}
8 changes: 4 additions & 4 deletions ...ne.Server/wwwroot/Modules/Templates/External/Server/[Owner].Module.[Module].Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.7" />
</ItemGroup>

<ItemGroup>
Expand Down