tooling, assets, codegen packages

serenity-is · Jan 6, 2017 · f9ce3f1 · f9ce3f1
1 parent 93bdfd0
commit f9ce3f1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/Build.cake b/Build.cake
@@ -160,7 +160,11 @@ Action<string, string> myPack = (s, id) => {
     foreach (var p in prm)
         nuspec = nuspec.Replace("${" + p.Key + "}", p.Value);
       
-    var assembly = "./" + s + "/bin/" + configuration + "/" + s + ".dll";
+    var assembly = "./" + s + ".Net45/bin/" + configuration + "/" + s + ".dll";
+    if (!System.IO.File.Exists(assembly))
+        assembly = "./" + s + ".Net45/bin/" + configuration + "/" + s + ".exe";
+	if (!System.IO.File.Exists(assembly))
+		assembly = "./" + s + "/bin/" + configuration + "/" + s + ".dll";
     if (!System.IO.File.Exists(assembly))
         assembly = "./" + s + "/bin/" + configuration + "/" + s + ".exe";
       
@@ -314,7 +318,7 @@ Task("Pack")
     myPack("Serenity.Testing", null);
     myPack("Serenity.Script.UI", "Serenity.Script");
     myPack("Serenity.Web", null);
-    //myPack("Serenity.CodeGenerator", null);
+    myPack("Serenity.CodeGenerator", null);
     
     fixNugetCache();
 });
@@ -326,7 +330,7 @@ Task("Push")
         myPush();
     });
 
-Task("Assets")
+Task("Assets-Pack")
     .IsDependentOn("Clean")
     .Does(() =>
     {
@@ -335,13 +339,13 @@ Task("Assets")
     });
 
 Task("Assets-Push")
-    .IsDependentOn("Assets")
+    .IsDependentOn("Assets-Pack")
     .Does(() =>
     {
         myPush();
     });
 
-Task("Tooling")
+Task("Tooling-Pack")
     .IsDependentOn("Clean")
     .Does(() =>
     {
@@ -350,7 +354,7 @@ Task("Tooling")
     });
 
 Task("Tooling-Push")
-    .IsDependentOn("Tooling")
+    .IsDependentOn("Tooling-Pack")
     .Does(() =>
     {
         myPush();

diff --git a/Serenity.CodeGenerator/Serenity.CodeGenerator.nuspec b/Serenity.CodeGenerator/Serenity.CodeGenerator.nuspec
@@ -14,16 +14,16 @@
     <copyright>${copyright}</copyright>
     <tags>${tags}</tags>
     <dependencies>
-        <dependency id="Serenity.Web.Tooling" version="${serenityWebToolingVersion}" />
+	  <dependency id="Serenity.Web.Tooling" version="${serenityWebToolingVersion}" />
     </dependencies>
   </metadata>
   <files>
-    <file src="..\..\Readme.CodeGenerator.txt" target="content\Readme.CodeGenerator.txt" />
-    <file src="Serenity.CodeGenerator.exe" target="tools\sergen.exe" />
-    <file src="Newtonsoft.Json.dll" target="tools" />
-    <file src="RazorGenerator.Templating.dll" target="tools" />
-    <file src="Serenity.Core.dll" target="tools" />
-    <file src="Serenity.Data.dll" target="tools" />
-    <file src="Serenity.Data.Entity.dll" target="tools" />
+    <file src="Readme.CodeGenerator.txt" target="content\Readme.CodeGenerator.txt" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/Serenity.CodeGenerator.exe" target="tools\sergen.exe" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/Newtonsoft.Json.dll" target="tools" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/RazorGenerator.Templating.dll" target="tools" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/Serenity.Core.dll" target="tools" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/Serenity.Data.dll" target="tools" />
+    <file src="../Serenity.CodeGenerator/bin/${configuration}/Serenity.Data.Entity.dll" target="tools" />
   </files>
 </package>
diff --git a/Serenity.Core/Properties/AssemblyInfo.cs b/Serenity.Core/Properties/AssemblyInfo.cs
@@ -1,3 +1,9 @@
-using System.Runtime.InteropServices;
+using System.Reflection;
+using System.Runtime.InteropServices;
 
+[assembly: AssemblyTitle("Serenity Platform - Core Library")]
+[assembly: AssemblyDescription(
+    "Contains abstractions and implementations for " +
+    "some basic Serenity features like authorization, " +
+    "caching, localization, dependency resolution, reflection...")]
 [assembly: ComVisible(false)]
diff --git a/Serenity.Web/Serenity.Web.Assets.nuspec b/Serenity.Web/Serenity.Web.Assets.nuspec
@@ -15,6 +15,6 @@
     <tags>${tags}</tags>
   </metadata>
   <files>
-    <file src="..\..\Assets\**\*" exclude="**\*.bak;**\*.log;**\*.orig" target="content" />
+    <file src="Assets\**\*" exclude="**\*.bak;**\*.log;**\*.orig" target="content" />
   </files>
 </package>
diff --git a/Serenity.Web/Serenity.Web.Tooling.nuspec b/Serenity.Web/Serenity.Web.Tooling.nuspec
@@ -15,6 +15,6 @@
     <tags>${tags}</tags>
   </metadata>
   <files>
-    <file src="..\..\Tooling\**\*" exclude="**\*.bak;**\*.log;**\*.orig" target="content\tools" />
+    <file src="Tooling\**\*" exclude="**\*.bak;**\*.log;**\*.orig" target="content\tools" />
   </files>
 </package>