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.

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

Revision of build process part 1 #3137

Merged
merged 43 commits into from
Oct 25, 2019
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d108a01
Move website folder
donker Oct 6, 2019
cb3b925
repairs
donker Oct 6, 2019
9c61032
Update Cake
donker Oct 7, 2019
c8c0a87
Move external task to its own file
donker Oct 7, 2019
1be42e4
Begin packaging scripts in cake
donker Oct 7, 2019
670df61
Further work on packaging
donker Oct 7, 2019
bd67f5b
Ensure Telerik project also gets new version nr
donker Oct 7, 2019
bbabcaa
Move Telerik PDF to its proper place
donker Oct 7, 2019
8281d8f
New logic for packages that are already in final form in the repo and…
donker Oct 7, 2019
d529a21
Bring fips Lucene lib back under git control
donker Oct 7, 2019
6a6f07d
Newtonsoft package and repair to telerik package
donker Oct 7, 2019
f6361bb
Splitting off other tasks
donker Oct 7, 2019
9202363
Upgrade and deploy packages
donker Oct 7, 2019
2396ffc
Symbols package
donker Oct 7, 2019
65eca58
Get rid of platform ver in manifest
donker Oct 7, 2019
4d190b7
Final fixes - working packages
donker Oct 7, 2019
35fd0dd
Move compilation stuff
donker Oct 8, 2019
9068c22
House cleaning
donker Oct 8, 2019
bf91c59
peg utils version
donker Oct 8, 2019
b555b84
Fix to ckep script
donker Oct 8, 2019
080a24b
suppress warnings
donker Oct 8, 2019
5902abc
Variable initialization issue
donker Oct 8, 2019
65cc457
Removing unused scripts
donker Oct 8, 2019
688fbbd
Revert change to Telerik package version
donker Oct 8, 2019
55db464
Move "other" to "thirdparty"
donker Oct 8, 2019
2a88537
Get rid of hard coded Newtonsoft version
donker Oct 8, 2019
2020275
Max cpu to 4 for compiling
donker Oct 8, 2019
a7545e1
Repairs to MSBuild scripts to get AE to build properly
donker Oct 9, 2019
ce48bc5
Correcting paths
donker Oct 10, 2019
90dd1e3
Cleaning up
donker Oct 10, 2019
6e964ec
Trying to fix ignore file
donker Oct 10, 2019
3fbfbf2
Update Build/Cake/thirdparty.json
donker Oct 10, 2019
04d8820
Remove absolute path from .gitignore
bdukes Oct 10, 2019
8d54a81
Fix extension of DNC library package
donker Oct 14, 2019
c94ac76
Merging AE and DNN build scripts
donker Oct 20, 2019
795971f
Fixes to scripts
donker Oct 20, 2019
015fb3d
Clean up symbols project for AE since they are included in DNN projec…
donker Oct 21, 2019
af7a88c
Add previously untracked Yahoo compressor dlls
donker Oct 22, 2019
db8d43b
Remove version information from SolutionInfo.cs
bdukes Oct 24, 2019
f71b3f7
Fix errors introduced in rebase
bdukes Oct 24, 2019
087ee36
Fix incorrect paths
bdukes Oct 24, 2019
0329f34
Change build order of MSBuild to build extensions before personabar ui.
donker Oct 24, 2019
b3bb82a
Merge remote-tracking branch 'dnnsoftware/release/9.4.x' into reorg1
bdukes Oct 25, 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
  •  
  •  
  •  
167 changes: 15 additions & 152 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Artifacts/
_ReSharper*

# Others

[Oo]bj
TestResults
*.Cache
Expand All @@ -73,6 +72,10 @@ 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/
Expand All @@ -83,10 +86,10 @@ UpgradeLog*.XML
## DNN
############

# Ignore artifacts from deployed/installed site
[Dd]eploy[Pp]ackage/
# 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 +107,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 +115,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
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>$(MSBuildProjectDirectory)\..\..\Dnn.AdminExperience</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>
14 changes: 0 additions & 14 deletions Build/BuildScripts/AT.MSBuild.Tasks.Targets

This file was deleted.

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

This file was deleted.

Loading