any change

Persian-DnnSoftware · Nov 5, 2019 · eba28c3 · eba28c3
1 parent d36633e
commit eba28c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/DNN Platform/Library/Services/Upgrade/Internals/Steps/UpdateLanguagePackStep.cs b/DNN Platform/Library/Services/Upgrade/Internals/Steps/UpdateLanguagePackStep.cs
@@ -58,7 +58,8 @@ public override void Execute()
             //START persian-dnnsoftware
             //if (culture.ToLower() != "en-us")
             if (culture.ToLowerInvariant() != "en-us" && culture.ToLowerInvariant() != "fa-ir")
-                //END persian-dnnsoftware
+            { 
+            //END persian-dnnsoftware
                 try
                 {
 					//need apply the Licensing module after packages installed, so that we can know whats the edition of install instance. CE/PE/EE

diff --git a/SolutionInfo.cs b/SolutionInfo.cs
@@ -36,5 +36,5 @@
 [assembly: AssemblyTrademark("DNN")]
 
 [assembly: AssemblyVersion("9.4.1.0")]
-[assembly: AssemblyFileVersion("9.4.1.28")]
-[assembly: AssemblyInformationalVersion("9.4.1+Branch.v9.4.1-persian.Sha.005c33baa45db624b2438569ab5ca6c6fa71b18a")]
+[assembly: AssemblyFileVersion("9.4.1.34")]
+[assembly: AssemblyInformationalVersion("9.4.1+Branch.v9.4.1-persian.Sha.d36633e16baf3a42a5e0c4bd91d35afeca2058b6")]
diff --git a/build.cake b/build.cake
@@ -244,19 +244,18 @@ Task("ExternalExtensions")
 		//pb
         //Information("Downloading: {0}", "https://github.com/dnnsoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip"); //Persian-DnnSoftware
 		//https://github.com/Persian-DnnSoftware/Dnn.AdminExperience/archive/v9.4.1.zip
-		//Information("Downloading: {0}", "https://github.com/Persian-DnnSoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip");
-		//DownloadFile("https://github.com/dnnsoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip", buildDirFullPath + "Dnn.AdminExperience.zip");
-		//DownloadFile("https://github.com/Persian-DnnSoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip", buildDirFullPath + "Dnn.AdminExperience.zip"); //Persian-DnnSoftware
+		Information("Downloading: {0}", "https://github.com/Persian-DnnSoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip");
+		//DownloadFile("https://github.com/dnnsoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip", buildDirFullPath + "Dnn.AdminExperience.zip");//Persian-DnnSoftware
+		DownloadFile("https://github.com/Persian-DnnSoftware/Dnn.AdminExperience/archive/" + targetBranchCp + ".zip", buildDirFullPath + "Dnn.AdminExperience.zip"); 
 
 		Information("Decompressing: {0}", "CK Editor");
 		Unzip(buildDirFullPath + "ckeditor.zip", buildDirFullPath + "Providers/");
 
 		Information("Decompressing: {0}", "CDF");
 		Unzip(buildDirFullPath + "clientdependency.zip", buildDirFullPath + "Modules");
 
-		//Information("Decompressing: {0}", "Admin Experience"); //persian-dnnsoftware
-		//Unzip(buildDirFullPath + "Dnn.AdminExperience.zip", tempDir); //persian-dnnsoftware
-
+		Information("Decompressing: {0}", "Admin Experience"); 
+		Unzip(buildDirFullPath + "Dnn.AdminExperience.zip", tempDir); 
 
 		//look for solutions and start building them
 		var externalSolutions = GetFiles("./src/**/*.sln");
@@ -283,8 +282,8 @@ Task("ExternalExtensions")
 		}
 
 
-		//externalSolutions = GetFiles("./" + tempDir.ToString() + "/**/*.sln"); //persian-dnnsoftware
-		externalSolutions = GetFiles("./" + clientTempDir.ToString() + "/**/*.sln");
+		externalSolutions = GetFiles("./" + tempDir.ToString() + "/**/*.sln"); //persian-dnnsoftware
+
 
 		Information("Found {0} solutions.", externalSolutions.Count);
 
@@ -317,8 +316,8 @@ Task("ExternalExtensions")
 		//Information("Copying {1} Artifacts from {0}", "CDF", fileCounter);
 		//CopyFiles("./src/Modules/ClientDependency-dnn/ClientDependency.Core/bin/Release/ClientDependency.Core.*", "./Website/bin");
 
-		//var files = GetFiles("./" + tempDir.ToString() + "/*/Website/Install/Module/*_Install.zip"); //persian-dnnsoftware
-		var files = GetFiles("./" + clientTempDir.ToString() + "/*/Website/Install/Module/*_Install.zip");
+		var files = GetFiles("./" + tempDir.ToString() + "/*/Website/Install/Module/*_Install.zip"); 
+
 
 		Information("Copying {1} Artifacts from {0}", "AdminExperience", files.Count);
 		CopyFiles(files, "./Website/Install/Module/");