Skip to content

Commit

Permalink
Merges latest changes from release/9.4.x into development (#3178)
Browse files Browse the repository at this point in the history
* Remove disposal of MemoryStream for email attachments sent using SendtokenizedBuilkEmail

* Corrected references to older site URL (#3056)

* Corrected references to older site URL

* corrected typo from replacement of registered character

* Made the BuildAll task default + docs

* Fixed a typo

* Update .github/BUILD.md

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Update .github/BUILD.md

Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com>

* Remove reference to empty fs npm package (#3094)

fs is a core package, and the version on the npm registry is just an
empty package; this was almost certainly added accidentally

Fixes #3091

* Added defensive coding to prevent memory leaks

* Updates .Net 4.7.2 warning for NL and DE languages (#3032)

* Updated de-DE text

As per Sebastian Leupold translation

* Updated nl-NL warning about .Net 4.7.2

As per Timo Breumelhof translation

* DNN-29557 - Infinite while loop fix (#3123)

* Update Pages.resx

SEO tip for creating a title

(cherry picked from commit 04d1ee6)

* DNN-31121 - Fix the non alphanumeric character regex (#3059)

* DNN-7818: add send verification mail link in unverified message.

* Add 'fileName' to condition when checking request for logo file.

* Permissions for default folders (#3024)

(cherry picked from commit e77a281)

* DNN-32978 Copying pro html module don't modify the permission

* Fixes errors with previous build scripts following PB merge

* Updates issue templates and build docs (#3165)

* Updates documentation as per recent changes

* Added version information

* Removed unneeded BuildAll parameter

* Added back how to clean

* Was already clearer

* Documentation action cleanup (#3171)

* Add validation method with IsNullOrWhiteSpace check.  Use method to validate RoleGroup Name. closes #2927 (#3170)

* OAuthClientBase now returns the correct RequestingCode instead of aborting the thread (#3152)
  • Loading branch information
valadas authored and mitchelsellers committed Oct 20, 2019
1 parent 64efe71 commit 6e346c8
Show file tree
Hide file tree
Showing 2,348 changed files with 2,815 additions and 2,480 deletions.
20 changes: 13 additions & 7 deletions .github/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,35 @@
You do not always need to build the entire solution, you can download and install from the releases and only build the part you are working on, please read [How to Contribue](CONTRIBUTING.md) first.

If you do need to build the entire solution and the distribution packages, you need to be aware that the entire distribution is split in multiple github repositories.
* This repository - contains all the core APIs
* This repository - contains all the core APIs and the Admin Experience (Persona Bar)
* [CKEditorProvider](https://github.com/DNN-Connect/CKEditorProvider) - The default HTML Editor Provider
* [CDF](https://github.com/dnnsoftware/ClientDependency) - The Dnn Client Dependency Framework
* [Admin Experience](https://github.com/dnnsoftware/Dnn.AdminExperience) The default administration interface (Persona Bar)

Also, we currently maintain two branches, the development branch is the next major release and we also maintain a release/x.x.x branch that allows doing bug fixes on the current major version.

To prevent issues with long paths in some build scripts, fork this repository in a short named folder on the root of any drive such as `c:\dnnsrc\` if you fork to a long path such as `c:\users\username\documents\dnn\source\` you may encounter long path issues.

If you need to build the next major release you simply need to open PowerShell and run the following command:
In order to build the whole solution and produce the install and upgrade packages, you simply need to open PowerShell and run the following command:
```
.\build.ps1 -Target BuildAll
.\build.ps1
```

But if you need to build from one of the release branches, then you also need to reference each branch you want to pull from those repositories as such (example for the 9.4.0 release, replace the branch names as needed):
The version you are building is the current version on the branch you are. However there are 2 external repositories that get bundled into Dnn build:
[Dnn.Connect CKEditor provider](https://github.com/DNN-Connect/CKEditorProvider) is the default HTML editor provider and its default branch is development.
[Dnn.ClientDependency](https://github.com/dnnsoftware/ClientDependency), the default branch is dnn
Under normal situations they are the branches used for the next release, however if you have a need to specify a different branch to pull during the build you can specify them as such:
```
.\build.ps1 -Target BuildAll -ScriptArgs '--CkBranch="development"','--CdfBranch="dnn"','--CpBranch="release/3.0.x"'
.\build.ps1 -ScriptArgs '--CkBranch="branch-name"','--CdfBranch="branch-name"'
```

If you encounter any build issues, please re-run the build with more verbosity as such:
```
.\build.ps1 -Target BuildAll -Verbosity diagnostic
.\build.ps1 -Verbosity diagnostic
```
This will log much more information about the problem and allow you to open an issue with those more detailed logs.

Also, the build scripts should leave you with 0 tracked modified files in git.
If a build fails midway and you have tracked artifacts, you can simply run:
`git reset --hard` and/or `git clean -dxf` in order to come back to a clean state.

If you encounter PowerShell security issues, please read [Cake - PowerShell Security](https://cakebuild.net/docs/tutorials/powershell-security)
14 changes: 7 additions & 7 deletions Build/Deploy/TBEX.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<AddLink InDashboard="True">
<Title>Installing DotNetNuke for the First Time</Title>
<Description>If this is your first time to install DotNetNuke you may wish to review this short installation video. It will guide you through the initial setup and configuration of your new DotNetNuke site.</Description>
<Uri>http://www.dotnetnuke.com/Resources/Video-Library/Viewer/VideoId/408/Installing-DotNetNuke-With-WebMatrix.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Resources/Video-Library/Viewer/VideoId/408/Installing-DotNetNuke-With-WebMatrix.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/first.png</ImageUri>
</AddLink>
<AddLink InDashboard="True">
<Title>Using DotNetNuke</Title>
<Description>Now that you've successfully created your DotNetNuke site, what next? Browse training videos and learn how to use all of the features of DotNetNuke.</Description>
<Uri>http://www.dotnetnuke.com/Resources/Training/Tutorials.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Resources/Training/Tutorials.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/using.png</ImageUri>
</AddLink>
<AddLink InDashboard="True" InLearn="True">
<Title>Extending DotNetNuke</Title>
<Description>You don't have to write any code to use or extend DotNetNuke. But if you want to create your own extensions we'll show you how.</Description>
<Uri>http://www.dotnetnuke.com/Community/Extensions-Forge/Development.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Community/Extensions-Forge/Development.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/extend.png</ImageUri>
</AddLink>
<AddLink InDashboard="True">
<Title>DotNetNuke Forge - Open Source Community Projects</Title>
<Description>Find a free, open source extension to use in your site or learn from for your own development. The forge includes extensions of all kinds; modules, widgets, skins, libraries, etc.</Description>
<Uri>http://www.dotnetnuke.com/Community/Extensions-Forge.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Community/Extensions-Forge.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/forge.png</ImageUri>
</AddLink>
<AddLink InDashboard="True">
Expand All @@ -34,7 +34,7 @@
<AddLink InDashboard="True">
<Title>DotNetNuke Professional Products</Title>
<Description>DotNetNuke Corporation also offers Professional and Enterprise edition products with extended features for your most important business asset.</Description>
<Uri>http://www.dotnetnuke.com/Products/Compare-Editions.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Products/Compare-Editions.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/pro.png</ImageUri>
</AddLink>
</Links>
Expand All @@ -48,13 +48,13 @@

<AddRibbonButton>
<Label>Get Answers</Label>
<Uri>http://www.dotnetnuke.com/Community/Community-Exchange.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Community/Community-Exchange.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/qa.png</ImageUri>
</AddRibbonButton>

<AddRibbonButton>
<Label>Our Community</Label>
<Uri>http://www.dotnetnuke.com/Community/Community-Overview.aspx?from=webmatrix</Uri>
<Uri>https://www.dnnsoftware.com/Community/Community-Overview.aspx?from=webmatrix</Uri>
<ImageUri>http://cdn.dotnetnuke.com/images/webmatrix/triad.png</ImageUri>
</AddRibbonButton>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region Copyright

//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region Copyright

//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2012
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region Copyright

//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2012
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/Components/Constants.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#region Copyright
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
// All Rights Reserved
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#region Copyright
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2015
// by DotNetNuke Corporation
// All Rights Reserved
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#region Copyright
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
// All Rights Reserved
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#region Copyright
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
// All Rights Reserved
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Controls/CountryListBox/CountryListBox.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Controls/CountryListBox/CountryLookup.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2013
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2013
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2013
// by DotNetNuke Corporation
//
Expand Down Expand Up @@ -30,7 +30,7 @@
[assembly: AssemblyTitle("DotNetNuke")]
[assembly: AssemblyDescription("Open Source Web Application Framework")]
[assembly: AssemblyCompany("DotNetNuke Corporation")]
[assembly: AssemblyProduct("http://www.dotnetnuke.com")]
[assembly: AssemblyProduct("https://www.dnnsoftware.com")]
[assembly: AssemblyCopyright("DotNetNuke is copyright 2002-2013 by DotNetNuke Corporation. All Rights Reserved.")]
[assembly: AssemblyTrademark("DotNetNuke")]
[assembly: CLSCompliant(true)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Data/DataService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Data/IDataService.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region Copyright

//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/DotNetNuke.Instrumentation/DnnLog.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region Copyright

//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/DotNetNuke.Instrumentation/DnnLogger.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#region Copyright
//
// DotNetNuke® - http://www.dotnetnuke.com
// DotNetNuke® - https://www.dnnsoftware.com
// Copyright (c) 2002-2018
// by DotNetNuke Corporation
//
Expand Down
Loading

0 comments on commit 6e346c8

Please sign in to comment.