Skip to content

Commit

Permalink
Merge pull request #4607 from dnnsoftware/release/9.9.1
Browse files Browse the repository at this point in the history
Merging into master to release v9.9.1
  • Loading branch information
valadas authored Apr 13, 2021
2 parents 84f1fe5 + 7b01f02 commit 05d6a7e
Show file tree
Hide file tree
Showing 170 changed files with 6,948 additions and 5,747 deletions.
20 changes: 11 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ indent_size = 2
[*.{cs,vb}]
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# Prefer "var" everywhere
dotnet_style_qualification_for_field = true:suggestion
dotnet_style_qualification_for_property = true:suggestion
dotnet_style_qualification_for_method = true:suggestion
dotnet_style_qualification_for_event = true:suggestion

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
Expand Down Expand Up @@ -79,7 +80,7 @@ dotnet_naming_symbols.constants.required_modifiers = const

dotnet_naming_style.constant_style.capitalization = pascal_case

# Static fields are camelCase and start with s_
# Static fields are camelCase and start with no prefix
dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
Expand All @@ -88,17 +89,15 @@ dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static

dotnet_naming_style.static_field_style.capitalization = camel_case
dotnet_naming_style.static_field_style.required_prefix = s_

# Instance fields are camelCase and start with _
# Instance fields are camelCase and start with no prefix
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style

dotnet_naming_symbols.instance_fields.applicable_kinds = field

dotnet_naming_style.instance_field_style.capitalization = camel_case
dotnet_naming_style.instance_field_style.required_prefix = _

# Locals and parameters are camelCase
dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
Expand Down Expand Up @@ -185,3 +184,6 @@ csharp_space_between_parentheses = false
csharp_prefer_braces = true:silent
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true

# ReSharper properties
resharper_instance_members_qualify_members = field, property, event, method
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ Provide any additional context that may be helpful in understanding and/or resol
Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
-->
* [ ] 10.00.00 alpha build
* [ ] 09.09.00 release candidate
* [ ] 09.08.01 latest supported release
* [ ] 09.09.00 latest supported release

## Affected browser
<!--
Expand Down
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "monthly"

- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "monthly"
30 changes: 29 additions & 1 deletion .github/workflows/image-actions.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,42 @@
name: Compress images
on: pull_request
on:
pull_request: # PRs with image (but we can't push changes back to other forks)
paths:
- "**.jpg"
- "**.jpeg"
- "**.png"
- "**.webp"
push:
branches:
- development # merging PRs from other forks (will open a new PR)
workflow_dispatch: # on demand
schedule:
- cron: "0 0 * * 0" # every Sunday at midnight
jobs:
build:
if: | # Only run on main repo on and PRs that match the main repo.
github.repository == 'dnnsoftware/Dnn.Platform' &&
(github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name == github.repository)
name: calibreapp/image-actions
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Compress Images
id: compress_images
uses: calibreapp/image-actions@1.1.0
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
compressOnly: ${{ github.event_name != 'pull_request' }} # For non-Pull Requests, run in compressOnly mode and we'll PR after.

- name: Create Pull Request
if: | # If it's not a Pull Request then commit any changes as a new PR.
github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
uses: peter-evans/create-pull-request@v3
with:
title: Auto Compress Images
branch-suffix: timestamp
commit-message: Compress Images
body: ${{ steps.compress_images.outputs.markdown }}
272 changes: 136 additions & 136 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,139 +1,139 @@
#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates
*.local.sln
*.sln.GhostDoc.xml

## Ignore VS2015/Roslyn artifacts
*.sln.ide/
.vs/
.vscode/

## Ignore Webstorm artifacts
*.idea/

# Build results
[Tt]ools/*
!tools/packages.config
[Rr]elease
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.eml
*.vspscc
.builds
*.dotCover
*.ldf
Artifacts/
[Tt]emp
[Bb]uild/**/*.zip


# git merge artifacts
*.orig
*.gitmodules

## TODO: If you have NuGet Package Restore enabled, uncomment this
[Pp]ackages/

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Others
[Oo]bj
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# OS artifacts
Thumbs.db
Desktop.ini

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

# Node
node_modules/

############
## DNN
############

# Ignore local settings
Build/**/*.local.*
*.local.*

# Ignore temporary artifacts
/[Tt]emp/
/[Ww]ebsite/
DNN_*.zip
!DNN [Pp]latform/[Cc]omponents
!DNN [Pp]latform/[Cc]ontrols
DNN [Pp]latform/[Cc]omponents/[Cc]lient[Dd]ependency/[Ss]ource/[Bb]in
DNN [Pp]latform/[Cc]ontrols/[Cc]ountry[Ll]ist[Bb]ox/[Bb]in/*

DNN [Pp]latform/*/[Bb]in
DNN [Pp]latform/Tests/*/[Bb]in/*
DNN [Pp]latform/Modules/*/[Bb]in/*
DNN [Pp]latform/Skins/*/[Bb]in/*
DNN [Pp]latform/Admin Modules/*/[Bb]in/*
DNN [Pp]latform/MVC Modules/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/*/*/[Bb]in/*
DNN [Pp]latform/Syndication/[Bb]in/*
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*

DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*

# ignore all other language resx files
*.de-DE.resx
*.es-ES.resx
*.fr-FR.resx
*.it-IT.resx
*.nl-NL.resx

# but do track translations in the Install folder
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.de-DE.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.es-ES.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.fr-FR.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.it-IT.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx

# Add fips back
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll

yarn-error.log
#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates
*.local.sln
*.sln.GhostDoc.xml

## Ignore VS2015/Roslyn artifacts
*.sln.ide/
.vs/
.vscode/

## Ignore Webstorm artifacts
*.idea/

# Build results
[Tt]ools/*
!tools/packages.config
[Rr]elease
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.eml
*.vspscc
.builds
*.dotCover
*.ldf
Artifacts/
[Tt]emp
[Bb]uild/**/*.zip


# git merge artifacts
*.orig
*.gitmodules

## TODO: If you have NuGet Package Restore enabled, uncomment this
[Pp]ackages/

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Others
[Oo]bj
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# OS artifacts
Thumbs.db
Desktop.ini

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

# Node
node_modules/

############
## DNN
############

# Ignore local settings
Build/**/*.local.*
*.local.*

# Ignore temporary artifacts
/[Tt]emp/
/[Ww]ebsite/
DNN_*.zip
!DNN [Pp]latform/[Cc]omponents
!DNN [Pp]latform/[Cc]ontrols
DNN [Pp]latform/[Cc]omponents/[Cc]lient[Dd]ependency/[Ss]ource/[Bb]in
DNN [Pp]latform/[Cc]ontrols/[Cc]ountry[Ll]ist[Bb]ox/[Bb]in/*

DNN [Pp]latform/*/[Bb]in
DNN [Pp]latform/Tests/*/[Bb]in/*
DNN [Pp]latform/Modules/*/[Bb]in/*
DNN [Pp]latform/Skins/*/[Bb]in/*
DNN [Pp]latform/Admin Modules/*/[Bb]in/*
DNN [Pp]latform/MVC Modules/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/*/*/[Bb]in/*
DNN [Pp]latform/Syndication/[Bb]in/*
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*

DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*

# ignore all other language resx files
*.de-DE.resx
*.es-ES.resx
*.fr-FR.resx
*.it-IT.resx
*.nl-NL.resx

# but do track translations in the Install folder
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.de-DE.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.es-ES.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.fr-FR.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.it-IT.resx
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx

# Add fips back
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll

yarn-error.log

/Build/bin/
/.dotnet/
Expand Down
Loading

0 comments on commit 05d6a7e

Please sign in to comment.