Third installment of build reorganization #3285
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@donker This one is coming up with lots of merge issues? |
|
I've rebased this on |
bdukes
reviewed
Nov 13, 2019
| @@ -34,3 +34,6 @@ | |||
| [assembly: AssemblyProduct("http://www.dnnsoftware.com")] | |||
| [assembly: AssemblyCopyright("DotNetNuke is copyright 2002-2018 by DNN Corporation. All Rights Reserved.")] | |||
| [assembly: AssemblyTrademark("DNN")] | |||
| [assembly: AssemblyVersion("9.4.2")] | |||
| [assembly: AssemblyFileVersion("9.4.2.5835")] | |||
| [assembly: AssemblyInformationalVersion("9.4.2-unstable.5835+Branch.reorg3.Sha.a7727fcf1e2a6d08b3b7fb1b110401296886fb96")] | |||
There was a problem hiding this comment.
What do you envision as the process for changing the version that's in source control? Is that a manual step of running a Cake task after each release and committing the result?
There was a problem hiding this comment.
This is the "victim" of our change. There doesn't seem to be a perfect solution for now. The thing is: if someone clones the repo it should work when you build a debug version so you can debug. Before this PR you'd need to run GitVersion. So now you don't need to do this any longer.
On the downside: we'll need to update this file for every release. I guess this could be an automatic process.
There was a problem hiding this comment.
Didn't we discuss this so that each project would individually set it's version using the root GitVersion info on build (debug or release) and revert it's own manifest and the end of build ? This would make it work for both release and debug, without duplication and without commiting the version number. If we do commit version numbers, then we will keep having merge conflicts every time we merge the release branch into the development branch... At least until we reorganize the branchs which cannot happen until Dnn10.
There was a problem hiding this comment.
No, that is not what we settled on. We settled on "floating" versions from now on to facilitate local development.
We've wrestled with this for a while now. If you rely on GitVersion to build in debug locally it is a non starter. The solutioninfo will only get updated when doing a packaging build because that calls GitVersion. For local bebug building the solutioninfo will not change.
There was a problem hiding this comment.
Oh, yeah... Sorry I have very bad memory, I remember this now...
|
I am getting a lot of errors with imports I think this relates to how to locate msbuild... Was there a change in this area? |
|
Nevermind, it was a local permissions issue. |
valadas
previously approved these changes
Nov 16, 2019
bdukes
approved these changes
Nov 18, 2019
valadas
approved these changes
Nov 18, 2019
valadas
pushed a commit
that referenced
this pull request
Dec 3, 2019
* Do not store these portal settings when setting their property on the portalsettings object * Removed DnnHttpControllerActivator and added DependencyResolver implementation using the IServiceProvider * Added xml comments for the new DnnDependencyResolver * Added DnnDependencyResolver Unit Tests * Replaced IServiceProvider mock with full IServiceProvider implementation to work with Web API tests * Added more unit tests for the DnnDependencyResolver to cover GetServices (multiple) and BeginScope * Do not show "No Search results" message when no search is performed. (#3203) * Revision of build process part 1 (#3137) * Move website folder * repairs * Update Cake * Move external task to its own file * Begin packaging scripts in cake * Further work on packaging * Ensure Telerik project also gets new version nr * Move Telerik PDF to its proper place * New logic for packages that are already in final form in the repo and just need to be zipped. * Bring fips Lucene lib back under git control * Newtonsoft package and repair to telerik package * Splitting off other tasks * Upgrade and deploy packages * Symbols package * Get rid of platform ver in manifest * Final fixes - working packages * Move compilation stuff * House cleaning * peg utils version * Fix to ckep script * suppress warnings * Variable initialization issue * Removing unused scripts * Revert change to Telerik package version * Move "other" to "thirdparty" * Get rid of hard coded Newtonsoft version * Max cpu to 4 for compiling * Repairs to MSBuild scripts to get AE to build properly * Correcting paths * Cleaning up * Trying to fix ignore file * Update Build/Cake/thirdparty.json Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Remove absolute path from .gitignore * Fix extension of DNC library package * Merging AE and DNN build scripts * Fixes to scripts * Clean up symbols project for AE since they are included in DNN project now * Add previously untracked Yahoo compressor dlls * Remove version information from SolutionInfo.cs * Fix errors introduced in rebase * Fix incorrect paths * Change build order of MSBuild to build extensions before personabar ui. * Make white-space visible in log viewer (#3198) * DNN-34236: check the url with case insensitive. * DNN-29417 Username is changed to email address in the user profile if the "Use Email Address as Username" is enabled. * Fix to installer and the dependencies of the HTML and DA modules * DNN-24945 - Always redirect to the source portal page after creating (#3223) group * Fix Typo (#3234) * Improve querystring parse (#3242) * Improve props popup * Improve input checking of sites (#3243) * Fixes an upgrade issue that affects 9.4.1 => 9.4.2 upgrades (#3282) * Fixes an issue with a duplication of assembly binding * Removed hardcode version in manifest * Further reorganization of build process (#3236) * Introduce settings and add custom version nr * Ability to create a local dev site * Move node workspaces to root * Reshuffling of variables in MSBuild * Repairs * Fix * Allow local override of global build variables * Only save manifests if the file is not there. This prevents overwriting in case of a failed build before. * Ensure projects build in debug to the website path specified by the platform build settings * Don't track vscode folder * Fixes #3168 Test Sending Email Issues (#3237) * Use Admin Email for Send if smtpHostMode false * Fix Test Email Settings TO and FROM Addresses If I did this right and it should make sense is I set the test email to be able to go to the user testing. After all they are who are trying to make it work. It can be any email used by anyone and usually to see this feature you are a host or portal administrator so security should not be as much of a concern here. The FROM address will use the HOST email settings if set to HOST mode in DNN for the portal, otherwise it should use the Portal Administrators Email account to send from. This however does not address the issue of using the email address supplied in settings and creating another setting which will be applied next to figure out the correct logic. * Update ServerSettingsSmtpAdminController.cs * Fix build issue to previous changes. PortalSettings.UserInfo.Email is this the current user email? I am still getting my things setup. I ran VS 2019 to build successfully and I am trying to read through the namespaces correctly so I can understand the changes. I noticed a number of files possibly needing updates due to being deprecated in 9.4.2 but after I changed the namespace issue those warnings went away. One last thought is how do you get intellisense working on DNN solution. Is that a dream to have or am I missing something in my setup? * Change to address to the current user's email testing the server. I believe a UI to set the TO address would be nice to help troubleshoot and address issues trying to send to a specific user. * Corrected To address for current user email * TO Current User Email * DNN-29110 Site Assets > Select All is not working (#3251) * DNN-29110 Site Assets > Select All is not working * Code review fix * Moves Remember Login above Login Button: referenced in issue #2471 #3255 (#3256) * Move Remember Login Above Login Button * Update Login.ascx * file copy paste issue... * DNN-34250 Search is not working even after re-Indexing Search for All DNN Portals (#3260) * DNN-32474 - Recursive delete option is added (#3249) * Move Country Above Region in UserProfile.cs * spacing issue resolved. * I keep saving but github is moving it on its own. * Fixed tab for spaces to resolve spacing issues * Add PortalSettings overloads back (#3295) Fixes #3289 * Updates issue templates as per 9.4.2 release * Move Email Above Username in User.ascx #3305 (#3306) * Move Email Above Username in User.ascx * Fixed tab index values in User.ascx * Fix NuGet warning NU5048 (#3304) The iconUrl property of the nuspec file is deprecated, it's recommended to add an icon property, which points to a file within the package, while also retaining the iconUrl property for older clients. See https://docs.microsoft.com/en-us/nuget/reference/nuspec#iconurl * Word-Break added to Journal P (#3307) * Set core object versions to core version (#3287) Ensure skin and radeditorprovider get the core version nr and add SPROC to set the version of all core packages/desktopmodules to the core version Fixes #3239 * Third installment of build reorganization (#3285) * Improve versioning * New approach: keep versions in source control and change upon CI build * Remove previous versioning logic * Cleaning up tasks * Fixes * Ensure UpdateDnnManifests targets just the right manifests * Harmonize naming of zips and nuget packages * Testing webpack building to dev website * Adjust webpack projects in AE to build to dev site * Fixes * Delete duplicate stuff * This is generated by Webpack and shouldn't be tracked * Include missing project from Lerna * Fixes for building SitesListView * Update to packages * Further cleaning * Remove RadEditorProvider * Fix ModuleSettings > Added to Pages grid, pager wasn't working * Allow only alphanumeric characters to be used when forming url from website name (#3316) * Ensure UpdateDnnManifests doesn't run for building dev site (#3314) * Reload page when the code tells you to (#3315) * Reload page when the code tells you to * Optimize code * Google Analytics TrackingID is stored in lowercase #3318 (#3322) * Update sums.resources * Fix casing mismatch errors in security analyzer file compare * Update Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Registered IPersonaBarContainer with DI (#3329) * Document approval process and group * Fix typo * Relaxed nuget.cake wildcard (#3331)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this reorganization the following: