Skip to content
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

Jump to bottom

Merges latest changes from 9.4.x into development #3290

Merged
merged 28 commits into from
Nov 15, 2019
Merged

Merges latest changes from 9.4.x into development #3290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6d758e3
Do not store these portal settings when setting their property on the…
donker Sep 27, 2019
c634984
Merge branch 'release/9.4.x' into refactorps
donker Oct 2, 2019
0d0d4ac
Removed DnnHttpControllerActivator and added DependencyResolver imple…
SkyeHoefling Oct 23, 2019
f104d23
Added xml comments for the new DnnDependencyResolver
SkyeHoefling Oct 23, 2019
05ca850
Added DnnDependencyResolver Unit Tests
SkyeHoefling Oct 23, 2019
6d5b0b9
Replaced IServiceProvider mock with full IServiceProvider implementat…
SkyeHoefling Oct 23, 2019
9c9051c
Added more unit tests for the DnnDependencyResolver to cover GetServi…
SkyeHoefling Oct 23, 2019
588a005
Do not show "No Search results" message when no search is performed. …
Oct 25, 2019
6cec560
Revision of build process part 1 (#3137)
donker Oct 25, 2019
7e74fa6
Make white-space visible in log viewer (#3198)
bdukes Oct 27, 2019
4937d6c
DNN-34236: check the url with case insensitive.
zyhfish Oct 25, 2019
2f0bd6a
Merge pull request #3208 from zyhfish/bug/DNN-34236-v9.4.x
mitchelsellers Oct 28, 2019
68aea30
Merge pull request #3033 from donker/refactorps
mitchelsellers Oct 29, 2019
ecfef18
DNN-29417 Username is changed to email address in the user profile if…
mikebigun Mar 12, 2019
ce3feb7
Fix to installer and the dependencies of the HTML and DA modules
donker Oct 30, 2019
2fcc926
DNN-24945 - Always redirect to the source portal page after creating …
tingung Nov 1, 2019
ae55b6c
Fix Typo (#3234)
thabaum Nov 4, 2019
ee69192
Improve querystring parse (#3242)
donker Nov 5, 2019
8151da2
Improve input checking of sites (#3243)
donker Nov 5, 2019
213bb26
Fixes an upgrade issue that affects 9.4.1 => 9.4.2 upgrades (#3282)
valadas Nov 12, 2019
0dd5bad
Further reorganization of build process (#3236)
donker Nov 13, 2019
ea34bfa
Fixes #3168 Test Sending Email Issues (#3237)
thabaum Nov 13, 2019
44a90f4
DNN-29110 Site Assets > Select All is not working (#3251)
mikebigun Nov 13, 2019
1dc7504
Moves Remember Login above Login Button: referenced in issue #2471 #…
thabaum Nov 13, 2019
6a935af
DNN-34250 Search is not working even after re-Indexing Search for All…
mikebigun Nov 13, 2019
bcce46f
Merge branch 'release/9.4.x' into mergedev20191114
valadas Nov 14, 2019
da88d1c
Fixes duplication in DotNetNuke.Website.csproj
valadas Nov 14, 2019
d1b3d01
Removed reference to missing LeftMenu files
valadas Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
175 changes: 23 additions & 152 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
## Ignore VS2015/Roslyn artifacts
*.sln.ide/
.vs/
.vscode/

## Ignore Webstorm artifacts
*.idea/
Expand Down Expand Up @@ -63,7 +64,6 @@ Artifacts/
_ReSharper*

# Others

[Oo]bj
TestResults
*.Cache
Expand All @@ -73,20 +73,31 @@ 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 artifacts from deployed/installed site
[Dd]eploy[Pp]ackage/
DNN_*.zip
# 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
Expand All @@ -104,123 +115,6 @@ DNN [Pp]latform/Syndication/[Bb]in/*
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*


[Ww]ebsite/*/[Dd]efault.aspx

[Ww]ebsite/[Aa]dmin/[Pp]ersonabar

[Ww]ebsite/[Aa]pp_[Cc]ode

[Ww]ebsite/[Aa]pp_[Dd]ata

[Ww]ebsite/[Bb]in

[Ww]ebsite/[Cc]onfig

[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ff]ifty[Oo]ne[Cc]lient[Cc]apability[Pp]rovider
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Rr]ad[Ee]ditor[Pp]rovider
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Tt]axonomy
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Uu]rl[Mm]anagement
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Hh]tml[Ee]ditor[Mm]anager
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Rr]ecycle[Bb]in
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Nn]ewsletters
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ll]anguages
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ll]ists
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ll]ogViewer
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ss]itemap
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ss]ite[Ww]izard
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Tt]abs
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Cc]onsole
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Vv]endors
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Dd]ashboard
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Mm]odule[Cc]reator
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ss]ql
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Xx]ml[Mm]erge
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Aa]nalytics
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]dmin/[Ss]kin[Mm]anagement


[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]uthentication[Ss]ervices/[Ff]acebook
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]uthentication[Ss]ervices/[Gg]oogle
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]uthentication[Ss]ervices/[Ll]ive
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]uthentication[Ss]ervices/[Tt]witter
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]uthentication[Ss]ervices/DNN[Pp]ro_[Aa]ctive[Dd]irectory

[Ww]ebsite/[Dd]esktop[Mm]odules/[Cc]ore[Mm]essaging
[Ww]ebsite/[Dd]esktop[Mm]odules/DDRMenu
[Ww]ebsite/[Dd]esktop[Mm]odules/[Dd]evice[Pp]review[Mm]anagement
[Ww]ebsite/[Dd]esktop[Mm]odules/[Dd]igital[Aa]ssets
[Ww]ebsite/[Dd]esktop[Mm]odules/DNNCorp
[Ww]ebsite/[Dd]esktop[Mm]odules/[Dd][Nn][Nn]
[Ww]ebsite/[Dd]esktop[Mm]odules/HTML
[Ww]ebsite/[Dd]esktop[Mm]odules/MVC
[Ww]ebsite/[Dd]esktop[Mm]odules/[Jj]ournal
[Ww]ebsite/[Dd]esktop[Mm]odules/[Mm]ember[Dd]irectory
[Ww]ebsite/[Dd]esktop[Mm]odules/[Mm]obile[Mm]anagement
[Ww]ebsite/[Dd]esktop[Mm]odules/[Rr]azor[Mm]odules
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ss]ocial[Gg]roups
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ss]ubscriptions[Mm]gmt
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ii]dentity[Ss]witcher
[Ww]ebsite/[Dd]esktop[Mm]odules/[Bb]log
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ii][Ff]rame
[Ww]ebsite/[Dd]esktop[Mm]odules/[Aa]nnouncements
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ee]vents
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ff]eedback
[Ww]ebsite/[Dd]esktop[Mm]odules/[Ff][Aa][Qq]s
[Ww]ebsite/[Dd]esktop[Mm]odules/[Mm]edia
[Ww]ebsite/[Dd]esktop[Mm]odules/[Uu]ser[Dd]efined[Tt]able
[Ww]ebsite/[Dd]esktop[Mm]odules/dnnGlimpse
[Ww]ebsite/[Dd]esktop[Mm]odules/[Tt]est*
[Ww]ebsite/[Dd]esktop[Mm]odules/[Cc]onnectors*

[Ww]ebsite/[Ii]nstall/*/*.zip
[Ww]ebsite/[Ii]nstall/*/*.resources
[Ww]ebsite/[Ii]nstall/[Cc]leanup
[Ww]ebsite/[Ii]nstall/[Cc]onfig
[Ww]ebsite/[Ii]nstall/[Dd]ot[Nn]et[Nn]uke.install.config
[Ww]ebsite/[Ii]nstall/installstat.log.resources.txt
[Ww]ebsite/[Ii]nstall/upgradestat.log.resources.txt
[Ww]ebsite/[Ii]nstall/[Ii]nstall[Ww]izard*.*

[Ww]ebsite/[Ll]icenses/*.txt

[Ww]ebsite/[Mm]odules

[Ww]ebsite/[Pp]ortals/_default/[Ll]ogs
[Ww]ebsite/[Pp]ortals/_default/[Mm]erged[Tt]emplate
[Ww]ebsite/[Pp]ortals/_default/[Bb]lank [Ww]ebsite*.*
[Ww]ebsite/[Pp]ortals/_default/[Dd]efault [Ww]ebsite*.*
[Ww]ebsite/[Pp]ortals/_default/[Mm]obile [Ww]ebsite*.*
[Ww]ebsite/[Pp]ortals/_default/[Cc]ontent [Tt]emplates*
[Ww]ebsite/[Pp]ortals/_default/[Cc]ontainers/*/thumbnail*.jpg
[Ww]ebsite/[Pp]ortals/_default/[Cc]ontainers/[Cc]avalier/*.*
[Ww]ebsite/[Pp]ortals/_default/[Ss]kins/*/thumbnail*.jpg
[Ww]ebsite/[Pp]ortals/_default/[Ss]kins/[Cc]avalier
[Ww]ebsite/[Pp]ortals/_default/[Ss]kins/[Cc]avalier/*/*.*

[Ww]ebsite/[Pp]ortals/_default/[Uu]ser*
[Ww]ebsite/[Pp]ortals/[0-9]*/

[Ww]ebsite/[Pp]roviders/[Dd]ata[Pp]roviders/*/*.resources
[Ww]ebsite/[Pp]roviders/*/*/license.txt
[Ww]ebsite/[Pp]roviders/*/*/release[Nn]otes.txt
[Ww]ebsite/[Pp]roviders/[Ff]older[Pp]roviders
[Ww]ebsite/[Pp]roviders/[Cc]lient[Cc]apability[Pp]roviders

[Ww]ebsite/[Rr]esources/[Ll]ibraries

[Ww]ebsite/[Ss]ignatures

[Ww]ebsite/[Tt]emplates

[Ww]ebsite/51[Dd]egrees.mobi.config
[Ww]ebsite/[Dd]ot[Nn]et[Nn]uke.log4net.config
[Ww]ebsite/[Dd]ot[Nn]et[Nn]uke.config
[Ww]ebsite/[Ss]ite[Aa]nalytics.config
[Ww]ebsite/[Ss]ite[Uu]rls.config
[Ww]ebsite/web.config
[Ww]ebsite/app_offline.htm

# ignore all other language resx files
*.de-DE.resx
*.es-ES.resx
Expand All @@ -229,34 +123,11 @@ DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*
*.nl-NL.resx

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

*.zip.manifest

############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini
Website/Install/Temp/
Website/Providers/HtmlEditorProviders/
Website/Portals/_default/CK*.xml
Website/Portals/_default/Install/CK*.xml
Website/Portals/_default/Skins/Xcillion/
Website/Portals/_default/Containers/Xcillion/
DNN Platform/Dnn.AuthServices.Jwt/Package/
Website/Portals/_default/Install/Dnn.CKEditorDefaultSettings.xml
Website/Portals/_default/Install/Dnn.CKToolbarButtons.xml
Website/Portals/_default/Install/Dnn.CKToolbarSets.xml
Website/DesktopModules/Admin/SiteExportImport/App_LocalResources/ExportImport.resx
/TestResult.xml
/Website/DesktopModules/Admin/Dnn.EditBar
/Website/DesktopModules/Admin/Dnn.PersonaBar
!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
12 changes: 7 additions & 5 deletions ...xperience/Build/BuildScripts/Module.build → Build/BuildScripts/AEModule.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.props')" />
<Import Project="..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.targets')" />

<PropertyGroup>
<ResourceZipWorkingDirectory>$(MSBuildProjectDirectory)\Package\Resources\admin\personaBar</ResourceZipWorkingDirectory>
<WorkingDirectory>$(RootDirectory)</WorkingDirectory>
</PropertyGroup>

<Target Name="AfterBuild" DependsOnTargets="RunYarn;CopyBin;GetFiles;DebugProject;Package"></Target>
Expand All @@ -16,7 +18,7 @@
<PersonaBar-resources Include="admin/**/App_LocalResources/*.resx" />
<PersonaBar-controls Include="admin/**/UserControls/*.ascx" />
<PersonaBar-scripts Include="admin/**/scripts/*;admin/**/scripts/**/*" />
<Resources Include="@(PersonaBar-views);@(PersonaBar-images);@(PersonaBar-css);@(PersonaBar-scripts);@(PersonaBar-data);@(PersonaBar-resources);@(PersonaBar-controls)" Exclude="**/node_modules/**/*" />
<Resources Include="@(PersonaBar-views);@(PersonaBar-images);@(PersonaBar-css);@(PersonaBar-scripts);@(PersonaBar-data);@(PersonaBar-resources);@(PersonaBar-controls)" Exclude="**/node_modules/**/*" />
</ItemGroup>
</Target>
<Target Name="CopyBin">
Expand All @@ -41,9 +43,9 @@
</Target>

<Target Name="RunYarnWorkspace">
<Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />
<Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />

<Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="lerna run build --parallel" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="install" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="lerna run build --parallel" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion ...rience/Build/BuildScripts/Package.targets → Build/BuildScripts/AEPackage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<Output TaskParameter="Include" ItemName="OutputContent" />
</CreateItem>
<Zip Files="@(OutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(WebsiteInstallPath)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />
<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
</Target>
Expand Down
14 changes: 0 additions & 14 deletions Build/BuildScripts/AT.MSBuild.Tasks.Targets
View file
Open in desktop

This file was deleted.

Binary file removed Build/BuildScripts/AT.MSBuild.Tasks.dll
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions Build/BuildScripts/CopyPackagingFiles.build
View file
Open in desktop

This file was deleted.

Loading