Skip to content

Commit

Permalink
Merged from QuickApp-Standard
Browse files Browse the repository at this point in the history
- ng16 upgrade
- replaced ngx-bootstrap with ng-bootstrap
- code formatting
- nuget packages update
  • Loading branch information
emonney committed Jun 9, 2023
1 parent 6ce5a54 commit f8f427e
Show file tree
Hide file tree
Showing 72 changed files with 4,625 additions and 3,406 deletions.
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -264,5 +264,4 @@ paket-files/
__pycache__/
*.pyc
# Others
*.licenseheader
Thumbs.db
4 changes: 2 additions & 2 deletions DAL/Core/ApplicationPermissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ static ApplicationPermissions()

public static ApplicationPermission GetPermissionByName(string permissionName)
{
return AllPermissions.Where(p => p.Name == permissionName).SingleOrDefault();
return AllPermissions.SingleOrDefault(p => p.Name == permissionName);
}

public static ApplicationPermission GetPermissionByValue(string permissionValue)
{
return AllPermissions.Where(p => p.Value == permissionValue).SingleOrDefault();
return AllPermissions.SingleOrDefault(p => p.Value == permissionValue);
}

public static string[] GetAllPermissionValues()
Expand Down
9 changes: 6 additions & 3 deletions DAL/DAL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>7.0.1</Version>
<Version>7.2.0</Version>
<Description>Data Access Layer for the Quick Application template</Description>
<Copyright>Copyright © 2023 www.ebenmonney.com</Copyright>
<PackageProjectUrl>https://www.ebenmonney.com/quickapp</PackageProjectUrl>
<Company>EBENMONNEY</Company>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion QuickApp/ClientApp/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# QuickApp

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.2.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.0.4.

## Development server

Expand Down
Loading

0 comments on commit f8f427e

Please sign in to comment.