diff --git a/.gitignore b/.gitignore index 3dda91a29e9..7c37a0cbc04 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ ## Ignore VS2015/Roslyn artifacts *.sln.ide/ .vs/ +.vscode/ ## Ignore Webstorm artifacts *.idea/ @@ -82,10 +83,17 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML +# Node +node_modules/ + ############ ## DNN ############ +# Ignore local settings +Build/**/*.local.* +*.local.* + # Ignore temporary artifacts /[Tt]emp/ /[Ww]ebsite/ diff --git a/Build/BuildScripts/AEModule.build b/Build/BuildScripts/AEModule.build index 619773641e8..bfc62a936ab 100644 --- a/Build/BuildScripts/AEModule.build +++ b/Build/BuildScripts/AEModule.build @@ -5,7 +5,7 @@ $(MSBuildProjectDirectory)\Package\Resources\admin\personaBar - $(MSBuildProjectDirectory)\..\..\Dnn.AdminExperience + $(RootDirectory) diff --git a/Build/BuildScripts/AEPackage.targets b/Build/BuildScripts/AEPackage.targets index 78e73c49ab7..b3f1e044d1e 100644 --- a/Build/BuildScripts/AEPackage.targets +++ b/Build/BuildScripts/AEPackage.targets @@ -41,7 +41,7 @@ - + diff --git a/Build/BuildScripts/Module.build b/Build/BuildScripts/Module.build index 5271b8cab3a..e489b7ef034 100644 --- a/Build/BuildScripts/Module.build +++ b/Build/BuildScripts/Module.build @@ -1,6 +1,4 @@  - - diff --git a/Build/BuildScripts/Package.targets b/Build/BuildScripts/Package.targets index ad0efeddb76..654ae079634 100644 --- a/Build/BuildScripts/Package.targets +++ b/Build/BuildScripts/Package.targets @@ -34,7 +34,7 @@ - + diff --git a/Build/Cake/database.cake b/Build/Cake/database.cake new file mode 100644 index 00000000000..b888eb83d06 --- /dev/null +++ b/Build/Cake/database.cake @@ -0,0 +1,50 @@ +Task("ResetDatabase") + .Does(() => + { + var script = ReplaceScriptVariables(LoadScript("db-connections-drop")); + ExecuteScript(script); + script = ReplaceScriptVariables(LoadScript("create-db")); + ExecuteScript(script); + if (Settings.DnnSqlUsername != "") { + script = ReplaceScriptVariables(LoadScript("add-db-user")); + ExecuteScript(script); + } + }); + +public const string ScriptsPath = @".\Build\Cake\sql\"; + +public string LoadScript(string scriptName) { + var script = scriptName + ".local.sql"; + if (!System.IO.File.Exists(ScriptsPath + script)) { + script = scriptName + ".sql"; + } + return Utilities.ReadFile(ScriptsPath + script); +} + +public string ReplaceScriptVariables(string script) { + return script + .Replace("{DBName}", Settings.DnnDatabaseName) + .Replace("{DBPath}", Settings.DatabasePath) + .Replace("{DBLogin}", Settings.DnnSqlUsername); +} + +public bool ExecuteScript(string ScriptStatement) +{ + try + { + using (var connection = new System.Data.SqlClient.SqlConnection(Settings.SaConnectionString)) + { + connection.Open(); + foreach (var cmd in ScriptStatement.Split(new string[] {"\r\nGO\r\n"}, StringSplitOptions.RemoveEmptyEntries)) { + var command = new System.Data.SqlClient.SqlCommand(cmd, connection); + command.ExecuteNonQuery(); + } + connection.Close(); + } + } + catch (Exception err){ + Error(err); + return false; + } + return true; +} \ No newline at end of file diff --git a/Build/Cake/devsite.cake b/Build/Cake/devsite.cake new file mode 100644 index 00000000000..53b4b389863 --- /dev/null +++ b/Build/Cake/devsite.cake @@ -0,0 +1,36 @@ +Task("ResetDevSite") + .IsDependentOn("ResetDatabase") + .IsDependentOn("BackupManifests") + .IsDependentOn("PreparePackaging") + .IsDependentOn("OtherPackages") + .IsDependentOn("ExternalExtensions") + .IsDependentOn("CopyToDevSite") + .IsDependentOn("CopyWebConfigToDevSite") + .IsDependentOn("RestoreManifests") + .Does(() => + { + }); + +Task("CopyToDevSite") + .Does(() => { + CleanDirectory(Settings.WebsitePath); + var files = GetFilesByPatterns(websiteFolder, new string[] {"**/*"}, packagingPatterns.installExclude); + files.Add(GetFilesByPatterns(websiteFolder, packagingPatterns.installInclude)); + Information("Copying {0} files to {1}", files.Count, Settings.WebsitePath); + CopyFiles(files, Settings.WebsitePath, true); + }); + +Task("CopyWebConfigToDevSite") + .Does(() => { + var conf = Utilities.ReadFile("./Website/web.config"); + var transFile = "./Build/Cake/webconfig-transform.local.xsl"; + if (!FileExists(transFile)) transFile = "./Build/Cake/webconfig-transform.xsl"; + var trans = Utilities.ReadFile(transFile); + trans = trans + .Replace("{ConnectionString}", Settings.DnnConnectionString) + .Replace("{DbOwner}", Settings.DbOwner) + .Replace("{ObjectQualifier}", Settings.ObjectQualifier); + var res = XmlTransform(trans, conf); + var webConfig = File(System.IO.Path.Combine(Settings.WebsitePath, "web.config")); + FileWriteText(webConfig, res); + }); \ No newline at end of file diff --git a/Build/Cake/settings.cake b/Build/Cake/settings.cake new file mode 100644 index 00000000000..141de5426fb --- /dev/null +++ b/Build/Cake/settings.cake @@ -0,0 +1,34 @@ +public class LocalSettings { + public string WebsitePath {get; set;} = ""; + public string WebsiteUrl {get; set;} = ""; + public string SaConnectionString {get; set;} = "server=(local);Trusted_Connection=True;"; + public string DnnConnectionString {get; set;} = ""; + public string DbOwner {get; set;} = "dbo"; + public string ObjectQualifier {get; set;} = ""; + public string DnnDatabaseName {get; set;} = "Dnn_Platform"; + public string DnnSqlUsername {get; set;} = ""; + public string DatabasePath {get; set;} = ""; + public string Version {get; set;} = "auto"; +} + +LocalSettings Settings; + +public void LoadSettings() { + var settingsFile = "settings.local.json"; + if (System.IO.File.Exists(settingsFile)) { + Settings = Newtonsoft.Json.JsonConvert.DeserializeObject(Utilities.ReadFile(settingsFile)); + } else { + Settings = new LocalSettings(); + } + using (var sw = new System.IO.StreamWriter(settingsFile)) { + sw.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(Settings, Newtonsoft.Json.Formatting.Indented)); + } +} + +LoadSettings(); + +Task("CreateSettings") + .Does(() => + { + // Doesn't need to do anything as it's done automatically + }); diff --git a/Build/Cake/sql/add-db-user.sql b/Build/Cake/sql/add-db-user.sql new file mode 100644 index 00000000000..fbf97f341cb --- /dev/null +++ b/Build/Cake/sql/add-db-user.sql @@ -0,0 +1,8 @@ +USE [{DBName}] +GO +IF NOT EXISTS (SELECT * FROM sys.database_principals p INNER JOIN sys.server_principals sp ON sp.sid=p.sid WHERE sp.[name]='{DBLogin}' AND sp.[type]='S') +BEGIN + CREATE USER [DNN Connection] FOR LOGIN [{DBLogin}]; + EXEC sp_addrolemember N'db_owner', N'DNN Connection'; +END +GO diff --git a/Build/Cake/sql/create-db.sql b/Build/Cake/sql/create-db.sql new file mode 100644 index 00000000000..c10abe707fc --- /dev/null +++ b/Build/Cake/sql/create-db.sql @@ -0,0 +1,11 @@ +IF db_id('{DBName}') IS NOT NULL DROP DATABASE {DBName}; +GO + +CREATE DATABASE [{DBName}] ON PRIMARY +( NAME = N'{DBName}', FILENAME = N'{DBPath}\{DBName}.mdf') + LOG ON +( NAME = N'{DBName}_log', FILENAME = N'{DBPath}\{DBName}_log.ldf') +GO + +EXEC dbo.sp_dbcmptlevel @dbname=N'{DBName}', @new_cmptlevel=100 +GO diff --git a/Build/Cake/sql/db-connections-drop.sql b/Build/Cake/sql/db-connections-drop.sql new file mode 100644 index 00000000000..d1313ce63a0 --- /dev/null +++ b/Build/Cake/sql/db-connections-drop.sql @@ -0,0 +1,15 @@ +USE master + +DECLARE @DatabaseName nvarchar(50) +SET @DatabaseName = N'{DBName}' + +DECLARE @SQL varchar(max) +SET @SQL = '' + +SELECT @SQL = @SQL + 'Kill ' + Convert(varchar, SPId) + ';' +FROM MASTER..SysProcesses +WHERE DBId = DB_ID(@DatabaseName) AND SPId <> @@SPId + +EXEC(@SQL) +GO + diff --git a/Build/Cake/version.cake b/Build/Cake/version.cake index 33451a6bb2e..cf810d4b49b 100644 --- a/Build/Cake/version.cake +++ b/Build/Cake/version.cake @@ -1,4 +1,3 @@ - GitVersion version; var buildId = EnvironmentVariable("BUILD_BUILDID") ?? "0"; @@ -10,10 +9,27 @@ Task("BuildServerSetVersion") Task("GitVersion") .Does(() => { - version = GitVersion(new GitVersionSettings { - UpdateAssemblyInfo = true, - UpdateAssemblyInfoFilePath = @"SolutionInfo.cs" - }); + Information("Local Settings Version is : " + Settings.Version); + if (Settings.Version == "auto") { + version = GitVersion(new GitVersionSettings { + UpdateAssemblyInfo = true, + UpdateAssemblyInfoFilePath = @"SolutionInfo.cs" + }); + Information(Newtonsoft.Json.JsonConvert.SerializeObject(version)); + } else { + version = new GitVersion(); + var v = new System.Version(Settings.Version); + version.AssemblySemFileVer = Settings.Version.ToString(); + version.Major = v.Major; + version.Minor = v.Minor; + version.Patch = v.Build; + version.Patch = v.Revision; + version.FullSemVer = v.ToString(); + version.InformationalVersion = v.ToString() + "-custom"; + FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyVersion(\"{0}\")]\r\n", v.ToString(3))); + FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyFileVersion(\"{0}\")]\r\n", version.FullSemVer)); + FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyInformationalVersion(\"{0}\")]\r\n", version.InformationalVersion)); + } Information("AssemblySemFileVer : " + version.AssemblySemFileVer); Information("Manifests Version String : " + $"{version.Major.ToString("00")}.{version.Minor.ToString("00")}.{version.Patch.ToString("00")}"); Information("The full sevVer is : " + version.FullSemVer); diff --git a/Build/Cake/webconfig-transform.xsl b/Build/Cake/webconfig-transform.xsl new file mode 100644 index 00000000000..53b4d21f0a4 --- /dev/null +++ b/Build/Cake/webconfig-transform.xsl @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build b/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build index 539647baba1..82bd7e98884 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_Console DNNCE_Console $(WebsitePath)\DesktopModules\Admin\Console + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build index a513180c3dc..cfd56e7fc5c 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build +++ b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_ModuleCreator DNNCE_ModuleCreator $(WebsitePath)\DesktopModules\Admin\ModuleCreator + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Connectors/Azure/Module.build b/DNN Platform/Connectors/Azure/Module.build index e1eaa19bcad..2eaddeea5ad 100644 --- a/DNN Platform/Connectors/Azure/Module.build +++ b/DNN Platform/Connectors/Azure/Module.build @@ -1,10 +1,15 @@ - + + + $(MSBuildProjectDirectory)\..\..\.. + zip AzureConnector DNNCE_AzureConnector $(WebsitePath)\DesktopModules\Connectors\Azure + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Connectors/GoogleAnalytics/Module.build b/DNN Platform/Connectors/GoogleAnalytics/Module.build index 3e9a69d030a..6fe6a71eb50 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/Module.build +++ b/DNN Platform/Connectors/GoogleAnalytics/Module.build @@ -1,10 +1,15 @@ - + + + $(MSBuildProjectDirectory)\..\..\.. + zip GoogleAnalyticsConnector GoogleAnalyticsConnector $(WebsitePath)\DesktopModules\Connectors\GoogleAnalytics + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Library.build b/DNN Platform/Dnn.AuthServices.Jwt/Library.build index b5d34f010c5..e6bc4c9dcb0 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Library.build +++ b/DNN Platform/Dnn.AuthServices.Jwt/Library.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\.. + + resources Dnn.Jwt DnnJwtAuth - $(MSBuildProjectDirectory)\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\Website - $(WebsitePath)\Install\Provider $(WebsitePath)\DesktopModules\AuthenticationServices\JWTAuth + $(WebsiteInstallPath)\Provider diff --git a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj index 1af5f9edaba..07ba3df175e 100644 --- a/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj +++ b/DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj @@ -1,5 +1,10 @@  + + $(MSBuildProjectDirectory)\..\.. + + + netstandard2.0 false @@ -12,7 +17,7 @@ - + diff --git a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj index 5c504cacdf7..7e5695c2d9d 100644 --- a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj +++ b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj @@ -1,5 +1,10 @@  + + $(MSBuildProjectDirectory)\..\.. + + + netstandard2.0 false @@ -14,4 +19,9 @@ SolutionInfo.cs + + + + + diff --git a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj index e67933ee79b..cb6d23bfdb4 100644 --- a/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj +++ b/DNN Platform/DotNetNuke.Instrumentation/DotNetNuke.Instrumentation.csproj @@ -60,12 +60,16 @@ + + $(MSBuildProjectDirectory)\..\.. + + - - - - + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj index 45599e128f4..306e9a3a6d6 100644 --- a/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj +++ b/DNN Platform/DotNetNuke.Log4net/DotNetNuke.Log4Net.csproj @@ -41,6 +41,7 @@ AnyCPU false 7 + bin\DotNetNuke.log4net.xml bin\ @@ -53,6 +54,7 @@ AnyCPU false 7 + bin\DotNetNuke.log4net.xml @@ -726,4 +728,14 @@ + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj index 27b69813824..a66b285d4e9 100644 --- a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj +++ b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj @@ -1,5 +1,10 @@  + + $(MSBuildProjectDirectory)\..\.. + + + netstandard2.0;net472 false @@ -27,7 +32,7 @@ - + diff --git a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj index ed7f7e1eb83..92945f8b5b9 100644 --- a/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj +++ b/DNN Platform/DotNetNuke.Web.Client/DotNetNuke.Web.Client.csproj @@ -85,10 +85,14 @@ + + $(MSBuildProjectDirectory)\..\.. + + - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Deprecated/Library.build b/DNN Platform/DotNetNuke.Web.Deprecated/Library.build index 87cd3311670..e0d72284be7 100644 --- a/DNN Platform/DotNetNuke.Web.Deprecated/Library.build +++ b/DNN Platform/DotNetNuke.Web.Deprecated/Library.build @@ -1,13 +1,15 @@  + + $(MSBuildProjectDirectory)\..\.. + + zip dnn_Web_Deprecated - DNNCE_01_Web.Deprecated - $(MSBuildProjectDirectory)\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\Website - $(WebsitePath)\Install\Module + DNNCE_Web.Deprecated $(WebsitePath) + $(WebsiteInstallPath)\Library diff --git a/DNN Platform/DotNetNuke.Web.Mvc/Library.build b/DNN Platform/DotNetNuke.Web.Mvc/Library.build index d3b913a2f04..fa5dfaba2a4 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/Library.build +++ b/DNN Platform/DotNetNuke.Web.Mvc/Library.build @@ -1,16 +1,20 @@  + + $(MSBuildProjectDirectory)\..\.. + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Razor/Library.build b/DNN Platform/DotNetNuke.Web.Razor/Library.build index 7e0fc07eec0..e44fe723110 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/Library.build +++ b/DNN Platform/DotNetNuke.Web.Razor/Library.build @@ -1,14 +1,20 @@  + + $(MSBuildProjectDirectory)\..\.. + + - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/Library.build b/DNN Platform/DotNetNuke.Web/Library.build index 15e86ef5f7e..5f4e077214b 100644 --- a/DNN Platform/DotNetNuke.Web/Library.build +++ b/DNN Platform/DotNetNuke.Web/Library.build @@ -1,22 +1,25 @@  + + $(MSBuildProjectDirectory)\..\.. + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj index 65bcd8faa57..8571765076b 100644 --- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj +++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.WebUtility.vbproj @@ -183,8 +183,17 @@ + + $(MSBuildProjectDirectory)\..\.. + + - + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Website.Deprecated/Library.build b/DNN Platform/DotNetNuke.Website.Deprecated/Library.build index afde4d3f947..d332103729c 100644 --- a/DNN Platform/DotNetNuke.Website.Deprecated/Library.build +++ b/DNN Platform/DotNetNuke.Website.Deprecated/Library.build @@ -1,13 +1,15 @@  + + $(MSBuildProjectDirectory)\..\.. + + zip dnn_Website_Deprecated DNNCE_Website.Deprecated - $(MSBuildProjectDirectory)\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\Website - $(WebsitePath)\Install\Module $(WebsitePath) + $(WebsiteInstallPath)\Library @@ -15,6 +17,5 @@ - diff --git a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj index 7ddc4120994..8e0d789eada 100644 --- a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj +++ b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj @@ -121,11 +121,15 @@ + + $(MSBuildProjectDirectory)\..\.. + + - - - + + + \ No newline at end of file diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index 456d1c468bd..fbb84259263 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -1860,4 +1860,15 @@ DotNetNuke.WebUtility + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/CoreMessaging/Module.build b/DNN Platform/Modules/CoreMessaging/Module.build index aed02ad33c9..a713e7ef60e 100644 --- a/DNN Platform/Modules/CoreMessaging/Module.build +++ b/DNN Platform/Modules/CoreMessaging/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip CoreMessaging DNNCE_CoreMessaging $(WebsitePath)\DesktopModules\CoreMessaging + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/DDRMenu/Module.build b/DNN Platform/Modules/DDRMenu/Module.build index 11a2963bcbd..66c9e750478 100644 --- a/DNN Platform/Modules/DDRMenu/Module.build +++ b/DNN Platform/Modules/DDRMenu/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip DDRMenu DDRMenu $(WebsitePath)\DesktopModules\DDRMenu + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/DigitalAssets/Module.build b/DNN Platform/Modules/DigitalAssets/Module.build index 8bd357d5cb9..37e080b11c5 100644 --- a/DNN Platform/Modules/DigitalAssets/Module.build +++ b/DNN Platform/Modules/DigitalAssets/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_DigitalAssets DNNCE_DigitalAssetsManagement $(WebsitePath)\DesktopModules\DigitalAssets + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/DnnExportImport/Module.build b/DNN Platform/Modules/DnnExportImport/Module.build index 26694a619d7..9756dfd8d74 100644 --- a/DNN Platform/Modules/DnnExportImport/Module.build +++ b/DNN Platform/Modules/DnnExportImport/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_SiteExportImport DNNCE_SiteExportImport $(WebsitePath)\DesktopModules\Admin\SiteExportImport + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/Groups/Module.build b/DNN Platform/Modules/Groups/Module.build index d579b2522d6..443baa56b02 100644 --- a/DNN Platform/Modules/Groups/Module.build +++ b/DNN Platform/Modules/Groups/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip SocialGroups DNNCE_SocialGroups $(WebsitePath)\DesktopModules\SocialGroups + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/HTML/Module.build b/DNN Platform/Modules/HTML/Module.build index 7eda03b158e..d853a0fc7af 100644 --- a/DNN Platform/Modules/HTML/Module.build +++ b/DNN Platform/Modules/HTML/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_HTML DNNCE_HTML $(WebsitePath)\DesktopModules\HTML + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/HtmlEditorManager/Module.build b/DNN Platform/Modules/HtmlEditorManager/Module.build index 7051c8c7e4e..c6507e70f99 100644 --- a/DNN Platform/Modules/HtmlEditorManager/Module.build +++ b/DNN Platform/Modules/HtmlEditorManager/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip dnn_HtmlEditorManager DNNCE_HtmlEditorManager $(WebsitePath)\DesktopModules\Admin\HtmlEditorManager + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/Journal/Module.build b/DNN Platform/Modules/Journal/Module.build index cc9e33b020c..f0352774538 100644 --- a/DNN Platform/Modules/Journal/Module.build +++ b/DNN Platform/Modules/Journal/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip Journal DNNCE_Journal $(WebsitePath)\DesktopModules\Journal + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/MemberDirectory/Module.build b/DNN Platform/Modules/MemberDirectory/Module.build index f73033b9db5..68e036a0511 100644 --- a/DNN Platform/Modules/MemberDirectory/Module.build +++ b/DNN Platform/Modules/MemberDirectory/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip MemberDirectory DNNCE_MemberDirectory $(WebsitePath)\DesktopModules\MemberDirectory + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Modules/RazorHost/Module.build b/DNN Platform/Modules/RazorHost/Module.build index 8d987d45bbf..756ab661180 100644 --- a/DNN Platform/Modules/RazorHost/Module.build +++ b/DNN Platform/Modules/RazorHost/Module.build @@ -1,11 +1,16 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip RazorHost DNNCE_RazorHost $(WebsitePath)\DesktopModules\RazorModules\RazorHost + $(WebsiteInstallPath)\Module diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Provider.build b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Provider.build index 97e18feaaab..459aefc032c 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Provider.build +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Provider.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\..\..\.. + + resources Facebook_Auth Facebook_Auth - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\AuthSystem + $(WebsiteInstallPath)\AuthSystem diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Provider.build b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Provider.build index 41d9615d1ab..96549d76471 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Provider.build +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Provider.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\..\..\.. + + resources Google_Auth Google_Auth - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\AuthSystem + $(WebsiteInstallPath)\AuthSystem diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Provider.build b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Provider.build index dd372086310..84338e55a56 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Provider.build +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Provider.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\..\..\.. + + resources Live_Auth Live_Auth - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\AuthSystem + $(WebsiteInstallPath)\AuthSystem diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Provider.build b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Provider.build index bf0e208801f..458c3c9a1a2 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Provider.build +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Provider.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\..\..\.. + + resources Twitter_Auth Twitter_Auth - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\AuthSystem + $(WebsiteInstallPath)\AuthSystem diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/Provider.build b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/Provider.build index c52bde8e5b8..e4c3dd87c76 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/Provider.build +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/Provider.build @@ -1,13 +1,15 @@  + + $(MSBuildProjectDirectory)\..\..\..\.. + + zip AspNetClientCapabilityProvider AspNetClientCapabilityProvider /Providers - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\Provider $(WebsitePath)\Providers\ClientCapabilityProviders\AspNetClientCapabilityProvider + $(WebsiteInstallPath)\Provider diff --git a/DNN Platform/Providers/FolderProviders/Provider.build b/DNN Platform/Providers/FolderProviders/Provider.build index 664aaefb1ce..52f90ba40b3 100644 --- a/DNN Platform/Providers/FolderProviders/Provider.build +++ b/DNN Platform/Providers/FolderProviders/Provider.build @@ -1,12 +1,14 @@  + + $(MSBuildProjectDirectory)\..\..\.. + + zip FolderProviders DNNCE_FolderProviders /Providers - $(MSBuildProjectDirectory)\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\Website - $(WebsitePath)\Install\Provider + $(WebsiteInstallPath)\Provider diff --git a/DNN Platform/Skins/Xcillion/Module.build b/DNN Platform/Skins/Xcillion/Module.build index 26078c14412..a05564ca9b5 100644 --- a/DNN Platform/Skins/Xcillion/Module.build +++ b/DNN Platform/Skins/Xcillion/Module.build @@ -1,5 +1,9 @@  - + + + $(MSBuildProjectDirectory)\..\..\.. + zip @@ -7,6 +11,7 @@ Skin_Xcillion $(WebsitePath)\portals\_default Xcillion + $(WebsiteInstallPath)\Skin diff --git a/DNN Platform/Syndication/DotNetNuke.Syndication.csproj b/DNN Platform/Syndication/DotNetNuke.Syndication.csproj index 36833566446..c8f0bf39a11 100644 --- a/DNN Platform/Syndication/DotNetNuke.Syndication.csproj +++ b/DNN Platform/Syndication/DotNetNuke.Syndication.csproj @@ -91,11 +91,17 @@ + + $(MSBuildProjectDirectory)\..\.. + + - + + + \ No newline at end of file diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index dd9af776b8b..6108d2b201e 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -1,5 +1,6 @@  - + Debug @@ -3432,11 +3433,15 @@ - + + $(MSBuildProjectDirectory)\..\.. + + + + + + + + + \ No newline at end of file diff --git a/DNN_Platform.build b/DNN_Platform.build index 6caebb08f05..ab09de3e286 100644 --- a/DNN_Platform.build +++ b/DNN_Platform.build @@ -1,11 +1,14 @@  - $(MSBuildProjectDirectory)\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\Dnn.AdminExperience\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\Website + $(RootDirectory)\Website + + + + $(RootDirectory)\Build\BuildScripts + $(RootDirectory)\Dnn.AdminExperience\Build\BuildScripts $(WebsitePath)\bin $(WebsitePath)\bin\Providers - $(WebsitePath)\Install\Module + $(WebsitePath)\Install $(WebsitePath)\Install\Skin \ No newline at end of file diff --git a/DNN_Platform.sln b/DNN_Platform.sln index 8810e5ff0f4..bd68ad7e964 100644 --- a/DNN_Platform.sln +++ b/DNN_Platform.sln @@ -457,11 +457,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dnn.AdminExperience", "Dnn. Dnn.AdminExperience\.browserslistrc = Dnn.AdminExperience\.browserslistrc Dnn.AdminExperience\.gitignore = Dnn.AdminExperience\.gitignore Dnn.AdminExperience\.npmrc = Dnn.AdminExperience\.npmrc - Dnn.AdminExperience\Build-Yarn-Workspace.ps1 = Dnn.AdminExperience\Build-Yarn-Workspace.ps1 Dnn.AdminExperience\CONTRIBUTING.md = Dnn.AdminExperience\CONTRIBUTING.md - Dnn.AdminExperience\lerna.json = Dnn.AdminExperience\lerna.json Dnn.AdminExperience\LICENSE.txt = Dnn.AdminExperience\LICENSE.txt - Dnn.AdminExperience\package.json = Dnn.AdminExperience\package.json Dnn.AdminExperience\README.md = Dnn.AdminExperience\README.md EndProjectSection EndProject diff --git a/Dnn.AdminExperience/Build-Yarn-Workspace.ps1 b/Dnn.AdminExperience/Build-Yarn-Workspace.ps1 deleted file mode 100644 index 0974566b7f2..00000000000 --- a/Dnn.AdminExperience/Build-Yarn-Workspace.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -yarn install -yarn lerna run build --parallel diff --git a/Dnn.AdminExperience/Dnn.React.Common/dist.webpack.config.js b/Dnn.AdminExperience/Dnn.React.Common/dist.webpack.config.js index 0870d00d926..29f45223ea8 100644 --- a/Dnn.AdminExperience/Dnn.React.Common/dist.webpack.config.js +++ b/Dnn.AdminExperience/Dnn.React.Common/dist.webpack.config.js @@ -35,7 +35,7 @@ module.exports = { modules: [ path.resolve('./src'), // Look in src first path.resolve('./node_modules'), // Try local node_modules - path.resolve('../node_modules') // Last fallback to workspaces node_modules + path.resolve('../../node_modules') // Last fallback to workspaces node_modules ] }, plugins: [ diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build index 2124021fdd6..25556308d39 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Module.build @@ -1,21 +1,20 @@ - + - $(MSBuildProjectDirectory)\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\Website - $(WebsitePath)\bin - $(WebsitePath)\bin\Providers - $(WebsitePath)\Install\Module + $(MSBuildProjectDirectory)\..\..\.. + - + zip Dnn.EditBar.UI Dnn.EditBar.UI $(WebsitePath)\DesktopModules\admin\Dnn.EditBar + $(WebsiteInstallPath)\Module $(MSBuildProjectDirectory)\Package\Resources\editBar diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build index 0f86ea31d2f..48bee10d812 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Module.build @@ -1,22 +1,21 @@ - - + + - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - + $(MSBuildProjectDirectory)\..\..\..\.. + + - - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\bin - $(WebsitePath)\bin\Providers - $(WebsitePath)\Install\Module + zip Dnn.PersonaBar.Extensions Dnn.PersonaBar.Extensions $(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar\Modules\ - ..\..\..\package.json + $(WebsiteInstallPath)\Module + ..\..\..\..\package.json - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js index 7dcb24fe2b4..1f722b075b2 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js @@ -43,7 +43,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js index fcee1ef5c09..06755b0bb4a 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js index 4663f9636d3..6bcfbe0351a 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js @@ -32,7 +32,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/webpack.config.js index 7eff893b8d3..c31bef6944c 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/webpack.config.js @@ -62,7 +62,7 @@ module.exports = { modules: [ path.resolve('./src'), // Look in src first path.resolve('./node_modules'), // Try local node_modules - path.resolve('../../../../../node_modules') // Last fallback to workspaces node_modules + path.resolve('../../../../../../node_modules') // Last fallback to workspaces node_modules ] }, externals: webpackExternals, diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web/webpack.config.js index ef452df715e..5e9c5cd0692 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web/webpack.config.js @@ -27,7 +27,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web/webpack.config.js index ea56c2e1464..a724c35c5fd 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web/webpack.config.js @@ -36,7 +36,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/webpack.config.js index 5469287bcaa..56e7a69c160 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web/webpack.config.js @@ -32,7 +32,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web/webpack.config.js index adce88bd369..7101beb3a7b 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web/webpack.config.js @@ -22,7 +22,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web/webpack.config.js index c2ea0776cc6..9f761026348 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web/webpack.config.js index 70d21e4ed7f..59ebb3be1d6 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web/webpack.config.js @@ -30,7 +30,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js index 9cfee3f44c3..3c3fae1488f 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web/webpack.config.js @@ -22,7 +22,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js index 4d613108e46..1fe5150e4c5 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web/webpack.config.js @@ -52,7 +52,7 @@ module.exports = { path.resolve("./src"), // Look in src first path.resolve("./exportables"), // Look in exportables after path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, externals: Object.assign(webpackExternals, { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js index 2eb08637647..581e14ce013 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web/webpack.config.js @@ -23,7 +23,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js index 0795bd34ba4..83bb243505c 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web/webpack.config.js @@ -32,7 +32,7 @@ module.exports = { path.resolve("./src"), // Look in src first path.resolve("./exportables"), // Look in exportables after path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, module: { diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js index b7ddc90276f..2862de9532d 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables/webpack.config.js @@ -46,7 +46,7 @@ module.exports = { path.resolve(__dirname, "../"), path.resolve(__dirname, "node_modules"), path.resolve(__dirname, "../../node_modules"), - path.resolve(__dirname, "../../../../../../../node_modules") + path.resolve(__dirname, "../../../../../../../../node_modules") ] }, devtool: "source-map" diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js index 7a4d3d6a998..21ac0621203 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/webpack.config.js @@ -56,7 +56,7 @@ module.exports = { path.resolve(__dirname, "./node_modules"), // Try local node_modules path.resolve(__dirname, "./src/_exportables/src"), path.resolve(__dirname, "./src/_exportables/node_modules"), - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, externals: Object.assign(webpackExternals, diff --git a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js index 2d741cd4e09..4a55a9eccf9 100644 --- a/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js +++ b/Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { modules: [ path.resolve("./src"), // Look in src first path.resolve("./node_modules"), // Try local node_modules - path.resolve("../../../../../node_modules") // Last fallback to workspaces node_modules + path.resolve("../../../../../../node_modules") // Last fallback to workspaces node_modules ] }, diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build index ccc181eedcf..04e890b309a 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Module.build @@ -1,17 +1,21 @@ - + + + + $(MSBuildProjectDirectory)\..\..\.. + + + + + + - $(MSBuildProjectDirectory)\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\Website - $(WebsitePath)\bin - $(WebsitePath)\bin\Providers - $(WebsitePath)\Install\Module zip Dnn.PersonaBar.UI Dnn.PersonaBar.UI $(WebsitePath)\DesktopModules\admin\Dnn.PersonaBar + $(WebsiteInstallPath)\Module - - diff --git a/Dnn.AdminExperience/package.json b/Dnn.AdminExperience/package.json deleted file mode 100644 index 576310f75db..00000000000 --- a/Dnn.AdminExperience/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "private": true, - "workspaces": [ - "Dnn.React.Common", - "Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables", - "Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web" - ], - "devDependencies": { - "lerna": "^3.16.4" - }, - "name": "admin-experience" -} diff --git a/build.cake b/build.cake index 26b7b248d05..8eebf85bf9a 100644 --- a/build.cake +++ b/build.cake @@ -9,9 +9,12 @@ #load "local:?path=Build/Cake/compiling.cake" #load "local:?path=Build/Cake/create-database.cake" +#load "local:?path=Build/Cake/database.cake" +#load "local:?path=Build/Cake/devsite.cake" #load "local:?path=Build/Cake/external.cake" #load "local:?path=Build/Cake/nuget.cake" #load "local:?path=Build/Cake/packaging.cake" +#load "local:?path=Build/Cake/settings.cake" #load "local:?path=Build/Cake/testing.cake" #load "local:?path=Build/Cake/thirdparty.cake" #load "local:?path=Build/Cake/unit-tests.cake" @@ -104,11 +107,13 @@ Task("BuildAll") }); Task("BackupManifests") - .Does( () => { - Zip("./", "manifestsBackup.zip", manifestFiles); + .Does( () => { + if (!System.IO.File.Exists("manifestsBackup.zip")) { + Zip("./", "manifestsBackup.zip", manifestFiles); + } }); -Task("RestoreManifests") +Task("RestoreManifests") .Does( () => { DeleteFiles(manifestFiles); Unzip("./manifestsBackup.zip", "./"); diff --git a/Dnn.AdminExperience/lerna.json b/lerna.json similarity index 100% rename from Dnn.AdminExperience/lerna.json rename to lerna.json diff --git a/package.json b/package.json new file mode 100644 index 00000000000..14e9e684697 --- /dev/null +++ b/package.json @@ -0,0 +1,29 @@ +{ + "name": "dnn-platform", + "version": "1.0.0", + "private": true, + "workspaces": [ + "Dnn.AdminExperience/Dnn.React.Common", + "Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/Bundle.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Pages.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Prompt.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Roles.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Security.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Seo.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Servers.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteImportExport.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Sites.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/SiteSettings.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/TaskScheduler.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Themes.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Users.Web/src/_exportables", + "Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Vocabularies.Web" + ], + "devDependencies": { + "lerna": "^3.16.4" + } +} diff --git a/Dnn.AdminExperience/yarn.lock b/yarn.lock similarity index 100% rename from Dnn.AdminExperience/yarn.lock rename to yarn.lock