Skip to content

Develop to master #57

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

Merged
JimKerslake merged 3 commits into from
Mar 19, 2025
Merged

Develop to master #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f0cef
#52 Update cloudscribe-develop.yml
SimonAnnetts Mar 6, 2025
86cb4e0
#55 conditionally add UserExportPartial to index_kvp
SimonAnnetts Mar 13, 2025
8c31eaa
Merge pull request #56 from cloudscribe/feature/55
JimKerslake Mar 14, 2025
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
7 changes: 7 additions & 0 deletions .github/workflows/cloudscribe-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ name: cloudscribe-kvp-develop-nuget-build
on:
push:
branches: [ "develop" ]
workflow_dispatch:
# pull_request:
# branches: [ "develop" ]

Expand All @@ -30,3 +31,9 @@ jobs:
run: dotnet pack -c Release
- name: Publish NuGet package
run: dotnet nuget push **/*.nupkg --source ${{ secrets.NUGET_SOURCE_URL }}
- name: Remote Repository Dispatch
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.GHB_PAT }}
repository: GreatHouseBarn/cloudscribe-testing
event-type: cs.UserProperties.Kvp
6 changes: 6 additions & 0 deletions src/cloudscribe.Kvp.Views.BS5/Views/UserAdmin/Index_kvp.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@using cloudscribe.UserProperties.Models
@model cloudscribe.Core.Web.ViewModels.UserAdmin.UserListViewModel
@using Microsoft.AspNetCore.Mvc.ViewEngines
@inject ICompositeViewEngine Engine
@inject ICoreThemeHelper themeHelper
@inject IStringLocalizer<CloudscribeCore> sr
@inject IUserPropertyService _userPropertyService
Expand Down Expand Up @@ -43,6 +45,10 @@
</div>
</div>
<partial name="UserListPartial_kvp" model="Model" />
@if (Engine.FindView(ViewContext, "UserExportPartial", false).Success)
{ // only show export button if the view exists in cloudscribe.core.compiledviews.bootstrap5 >= 8.0.18
<partial name="UserExportPartial" model="Model" />
}
@section SideNav {
<partial name="AdminSideNav" />
}
Expand Down
2 changes: 1 addition & 1 deletion src/cloudscribe.Kvp.Views.BS5/cloudscribe.Kvp.Views.BS5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Version>8.0.0</Version>
<Version>8.0.1</Version>
<Description>Custom views for cloudscribe.Kvp</Description>
<PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
<PackageIcon>icon.png</PackageIcon>
Expand Down
6 changes: 3 additions & 3 deletions src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Configurable custom user properties for cloudscribe core using per tenant or global configuration based custom proprties with key/value storage</Description>
<Version>8.0.0</Version>
<Version>8.0.1</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageTags>cloudscribe;userprofile;customization</PackageTags>
Expand All @@ -24,8 +24,8 @@
<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Models" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Identity" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Identity" Version="8.0.1" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.0.1" />

<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/sourceDev.WebApp/sourceDev.WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />

<PackageReference Include="cloudscribe.Core.Web" Version="8.0.0" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.0.1" />
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap5" Version="8.0.0" />
<PackageReference Include="cloudscribe.Web.StaticFiles" Version="8.0.0" />

Expand Down
Loading