Skip to content

Commit 05d6a7e

Browse files
valadasvaladas
authored
Merge pull request #4607 from dnnsoftware/release/9.9.1
Merging into master to release v9.9.1
2 parents 84f1fe5 + 7b01f02 commit 05d6a7e

170 files changed

Lines changed: 6948 additions & 5747 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ indent_size = 2
4141
[*.{cs,vb}]
4242
# Sort using and Import directives with System.* appearing first
4343
dotnet_sort_system_directives_first = true
44-
# Avoid "this." and "Me." if not necessary
45-
dotnet_style_qualification_for_field = false:suggestion
46-
dotnet_style_qualification_for_property = false:suggestion
47-
dotnet_style_qualification_for_method = false:suggestion
48-
dotnet_style_qualification_for_event = false:suggestion
44+
45+
# Prefer "var" everywhere
46+
dotnet_style_qualification_for_field = true:suggestion
47+
dotnet_style_qualification_for_property = true:suggestion
48+
dotnet_style_qualification_for_method = true:suggestion
49+
dotnet_style_qualification_for_event = true:suggestion
4950

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

8081
dotnet_naming_style.constant_style.capitalization = pascal_case
8182

82-
# Static fields are camelCase and start with s_
83+
# Static fields are camelCase and start with no prefix
8384
dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
8485
dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
8586
dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
@@ -88,17 +89,15 @@ dotnet_naming_symbols.static_fields.applicable_kinds = field
8889
dotnet_naming_symbols.static_fields.required_modifiers = static
8990

9091
dotnet_naming_style.static_field_style.capitalization = camel_case
91-
dotnet_naming_style.static_field_style.required_prefix = s_
9292

93-
# Instance fields are camelCase and start with _
93+
# Instance fields are camelCase and start with no prefix
9494
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
9595
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
9696
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
9797

9898
dotnet_naming_symbols.instance_fields.applicable_kinds = field
9999

100100
dotnet_naming_style.instance_field_style.capitalization = camel_case
101-
dotnet_naming_style.instance_field_style.required_prefix = _
102101

103102
# Locals and parameters are camelCase
104103
dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
@@ -185,3 +184,6 @@ csharp_space_between_parentheses = false
185184
csharp_prefer_braces = true:silent
186185
csharp_preserve_single_line_blocks = true
187186
csharp_preserve_single_line_statements = true
187+
188+
# ReSharper properties
189+
resharper_instance_members_qualify_members = field, property, event, method

‎.github/ISSUE_TEMPLATE/bug-report.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ Provide any additional context that may be helpful in understanding and/or resol
4141
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
4242
-->
4343
* [ ] 10.00.00 alpha build
44-
* [ ] 09.09.00 release candidate
45-
* [ ] 09.08.01 latest supported release
44+
* [ ] 09.09.00 latest supported release
4645

4746
## Affected browser
4847
<!--

‎.github/dependabot.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
8+
- package-ecosystem: "npm"
9+
directory: "/"
10+
schedule:
11+
interval: "monthly"
12+
13+
- package-ecosystem: "nuget"
14+
directory: "/"
15+
schedule:
16+
interval: "monthly"

‎.github/workflows/image-actions.yml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,42 @@
11
name: Compress images
2-
on: pull_request
2+
on:
3+
pull_request: # PRs with image (but we can't push changes back to other forks)
4+
paths:
5+
- "**.jpg"
6+
- "**.jpeg"
7+
- "**.png"
8+
- "**.webp"
9+
push:
10+
branches:
11+
- development # merging PRs from other forks (will open a new PR)
12+
workflow_dispatch: # on demand
13+
schedule:
14+
- cron: "0 0 * * 0" # every Sunday at midnight
315
jobs:
416
build:
17+
if: | # Only run on main repo on and PRs that match the main repo.
18+
github.repository == 'dnnsoftware/Dnn.Platform' &&
19+
(github.event_name != 'pull_request' ||
20+
github.event.pull_request.head.repo.full_name == github.repository)
521
name: calibreapp/image-actions
622
runs-on: ubuntu-latest
723
steps:
824
- name: Checkout Repo
925
uses: actions/checkout@v2
1026

1127
- name: Compress Images
28+
id: compress_images
1229
uses: calibreapp/image-actions@1.1.0
1330
with:
1431
githubToken: ${{ secrets.GITHUB_TOKEN }}
32+
compressOnly: ${{ github.event_name != 'pull_request' }} # For non-Pull Requests, run in compressOnly mode and we'll PR after.
33+
34+
- name: Create Pull Request
35+
if: | # If it's not a Pull Request then commit any changes as a new PR.
36+
github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
37+
uses: peter-evans/create-pull-request@v3
38+
with:
39+
title: Auto Compress Images
40+
branch-suffix: timestamp
41+
commit-message: Compress Images
42+
body: ${{ steps.compress_images.outputs.markdown }}

‎.gitignore‎

Lines changed: 136 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,139 @@
1-
#################
2-
## Visual Studio
3-
#################
4-
5-
## Ignore Visual Studio temporary files, build results, and
6-
## files generated by popular Visual Studio add-ons.
7-
8-
# User-specific files
9-
*.suo
10-
*.user
11-
*.sln.docstates
12-
*.local.sln
13-
*.sln.GhostDoc.xml
14-
15-
## Ignore VS2015/Roslyn artifacts
16-
*.sln.ide/
17-
.vs/
18-
.vscode/
19-
20-
## Ignore Webstorm artifacts
21-
*.idea/
22-
23-
# Build results
24-
[Tt]ools/*
25-
!tools/packages.config
26-
[Rr]elease
27-
*_i.c
28-
*_p.c
29-
*.ilk
30-
*.meta
31-
*.obj
32-
*.pch
33-
*.pgc
34-
*.pgd
35-
*.rsp
36-
*.sbr
37-
*.tlb
38-
*.tli
39-
*.tlh
40-
*.tmp
41-
*.eml
42-
*.vspscc
43-
.builds
44-
*.dotCover
45-
*.ldf
46-
Artifacts/
47-
[Tt]emp
48-
[Bb]uild/**/*.zip
49-
50-
51-
# git merge artifacts
52-
*.orig
53-
*.gitmodules
54-
55-
## TODO: If you have NuGet Package Restore enabled, uncomment this
56-
[Pp]ackages/
57-
58-
# Visual Studio profiler
59-
*.psess
60-
*.vsp
61-
62-
# ReSharper is a .NET coding add-in
63-
_ReSharper*
64-
65-
# Others
66-
[Oo]bj
67-
TestResults
68-
*.Cache
69-
ClientBin
70-
stylecop.*
71-
~$*
72-
*.dbmdl
73-
Generated_Code #added for RIA/Silverlight projects
74-
75-
# OS artifacts
76-
Thumbs.db
77-
Desktop.ini
78-
79-
# Backup & report files from converting an old project file to a newer
80-
# Visual Studio version. Backup files are not needed, because we have git ;-)
81-
_UpgradeReport_Files/
82-
Backup*/
83-
UpgradeLog*.XML
84-
85-
# Node
86-
node_modules/
87-
88-
############
89-
## DNN
90-
############
91-
92-
# Ignore local settings
93-
Build/**/*.local.*
94-
*.local.*
95-
96-
# Ignore temporary artifacts
97-
/[Tt]emp/
98-
/[Ww]ebsite/
99-
DNN_*.zip
100-
!DNN [Pp]latform/[Cc]omponents
101-
!DNN [Pp]latform/[Cc]ontrols
102-
DNN [Pp]latform/[Cc]omponents/[Cc]lient[Dd]ependency/[Ss]ource/[Bb]in
103-
DNN [Pp]latform/[Cc]ontrols/[Cc]ountry[Ll]ist[Bb]ox/[Bb]in/*
104-
105-
DNN [Pp]latform/*/[Bb]in
106-
DNN [Pp]latform/Tests/*/[Bb]in/*
107-
DNN [Pp]latform/Modules/*/[Bb]in/*
108-
DNN [Pp]latform/Skins/*/[Bb]in/*
109-
DNN [Pp]latform/Admin Modules/*/[Bb]in/*
110-
DNN [Pp]latform/MVC Modules/*/[Bb]in/*
111-
DNN [Pp]latform/[Pp]roviders/*/*/[Bb]in/*
112-
DNN [Pp]latform/[Pp]roviders/*/*/*/[Bb]in/*
113-
DNN [Pp]latform/Syndication/[Bb]in/*
114-
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
115-
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*
116-
117-
DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*
118-
119-
# ignore all other language resx files
120-
*.de-DE.resx
121-
*.es-ES.resx
122-
*.fr-FR.resx
123-
*.it-IT.resx
124-
*.nl-NL.resx
125-
126-
# but do track translations in the Install folder
127-
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.de-DE.resx
128-
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.es-ES.resx
129-
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.fr-FR.resx
130-
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.it-IT.resx
131-
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx
132-
133-
# Add fips back
134-
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll
135-
136-
yarn-error.log
1+
#################
2+
## Visual Studio
3+
#################
4+
5+
## Ignore Visual Studio temporary files, build results, and
6+
## files generated by popular Visual Studio add-ons.
7+
8+
# User-specific files
9+
*.suo
10+
*.user
11+
*.sln.docstates
12+
*.local.sln
13+
*.sln.GhostDoc.xml
14+
15+
## Ignore VS2015/Roslyn artifacts
16+
*.sln.ide/
17+
.vs/
18+
.vscode/
19+
20+
## Ignore Webstorm artifacts
21+
*.idea/
22+
23+
# Build results
24+
[Tt]ools/*
25+
!tools/packages.config
26+
[Rr]elease
27+
*_i.c
28+
*_p.c
29+
*.ilk
30+
*.meta
31+
*.obj
32+
*.pch
33+
*.pgc
34+
*.pgd
35+
*.rsp
36+
*.sbr
37+
*.tlb
38+
*.tli
39+
*.tlh
40+
*.tmp
41+
*.eml
42+
*.vspscc
43+
.builds
44+
*.dotCover
45+
*.ldf
46+
Artifacts/
47+
[Tt]emp
48+
[Bb]uild/**/*.zip
49+
50+
51+
# git merge artifacts
52+
*.orig
53+
*.gitmodules
54+
55+
## TODO: If you have NuGet Package Restore enabled, uncomment this
56+
[Pp]ackages/
57+
58+
# Visual Studio profiler
59+
*.psess
60+
*.vsp
61+
62+
# ReSharper is a .NET coding add-in
63+
_ReSharper*
64+
65+
# Others
66+
[Oo]bj
67+
TestResults
68+
*.Cache
69+
ClientBin
70+
stylecop.*
71+
~$*
72+
*.dbmdl
73+
Generated_Code #added for RIA/Silverlight projects
74+
75+
# OS artifacts
76+
Thumbs.db
77+
Desktop.ini
78+
79+
# Backup & report files from converting an old project file to a newer
80+
# Visual Studio version. Backup files are not needed, because we have git ;-)
81+
_UpgradeReport_Files/
82+
Backup*/
83+
UpgradeLog*.XML
84+
85+
# Node
86+
node_modules/
87+
88+
############
89+
## DNN
90+
############
91+
92+
# Ignore local settings
93+
Build/**/*.local.*
94+
*.local.*
95+
96+
# Ignore temporary artifacts
97+
/[Tt]emp/
98+
/[Ww]ebsite/
99+
DNN_*.zip
100+
!DNN [Pp]latform/[Cc]omponents
101+
!DNN [Pp]latform/[Cc]ontrols
102+
DNN [Pp]latform/[Cc]omponents/[Cc]lient[Dd]ependency/[Ss]ource/[Bb]in
103+
DNN [Pp]latform/[Cc]ontrols/[Cc]ountry[Ll]ist[Bb]ox/[Bb]in/*
104+
105+
DNN [Pp]latform/*/[Bb]in
106+
DNN [Pp]latform/Tests/*/[Bb]in/*
107+
DNN [Pp]latform/Modules/*/[Bb]in/*
108+
DNN [Pp]latform/Skins/*/[Bb]in/*
109+
DNN [Pp]latform/Admin Modules/*/[Bb]in/*
110+
DNN [Pp]latform/MVC Modules/*/[Bb]in/*
111+
DNN [Pp]latform/[Pp]roviders/*/*/[Bb]in/*
112+
DNN [Pp]latform/[Pp]roviders/*/*/*/[Bb]in/*
113+
DNN [Pp]latform/Syndication/[Bb]in/*
114+
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
115+
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*
116+
117+
DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*
118+
119+
# ignore all other language resx files
120+
*.de-DE.resx
121+
*.es-ES.resx
122+
*.fr-FR.resx
123+
*.it-IT.resx
124+
*.nl-NL.resx
125+
126+
# but do track translations in the Install folder
127+
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.de-DE.resx
128+
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.es-ES.resx
129+
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.fr-FR.resx
130+
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.it-IT.resx
131+
!DNN Platform/[Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx
132+
133+
# Add fips back
134+
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll
135+
136+
yarn-error.log
137137

138138
/Build/bin/
139139
/.dotnet/

0 commit comments

Comments
 (0)