Permalink
Browse files

serenity.testing / script.ui nuget done

  • Loading branch information...
1 parent 2fda22c commit 6d6e48f6b905ca1b836c5d71a019eebb65442670 @volkanceylan committed Jan 6, 2017
Showing with 30 additions and 21 deletions.
  1. +5 −5 Build.cake
  2. +9 −9 Serenity.Script.UI/Serenity.Script.nuspec
  3. +16 −7 Serenity.Testing/Serenity.Testing.nuspec
View
@@ -171,7 +171,8 @@ Task("PdbPatch")
.IsDependentOn("Test")
.Does(() =>
{
- if ((target ?? "").ToLowerInvariant() == "push")
+ if ((target ?? "").ToLowerInvariant() == "push" ||
+ (target ?? "").ToLowerInvariant() == "pdbpatch")
runGitLink();
});
@@ -191,7 +192,7 @@ Action<string, string> myPack = (s, id) => {
var packagesConfig = "./" + s + ".Net45/packages.config";
if (!System.IO.File.Exists(packagesConfig))
- packagesConfig = "./" + s + "packages.config";
+ packagesConfig = "./" + s + "/packages.config";
var projectJson = "./" + s + "/project.json";
if (!System.IO.File.Exists(projectJson))
@@ -308,9 +309,8 @@ Task("Pack")
myPack("Serenity.Data", null);
myPack("Serenity.Data.Entity", null);
myPack("Serenity.Services", null);
- //myPack("Serenity.Testing", null);
-
- //myPack("Serenity.Script.UI", "Serenity.Script");
+ myPack("Serenity.Testing", null);
+ myPack("Serenity.Script.UI", "Serenity.Script");
//myPack("Serenity.Web", null);
//myPack("Serenity.CodeGenerator", null);
@@ -14,17 +14,17 @@
<copyright>${copyright}</copyright>
<tags>${tags}</tags>
<dependencies>
- <dependency id="Saltarelle.Compiler" version="${saltarelleCompilerVersion}" />
- <dependency id="Saltarelle.jQuery" version="${saltarellejQueryVersion}" />
- <dependency id="Saltarelle.jQuery.UI" version="${saltarellejQueryUIVersion}" />
- <dependency id="Saltarelle.Linq" version="${saltarelleLinqVersion}" />
- <dependency id="Saltarelle.Runtime" version="${saltarelleRuntimeVersion}" />
- <dependency id="Saltarelle.Web" version="${saltarelleWebVersion}" />
+ <dependency id="Saltarelle.Compiler" version="${net2:Saltarelle.Compiler}" />
+ <dependency id="Saltarelle.jQuery" version="${net2:Saltarelle.jQuery}" />
+ <dependency id="Saltarelle.jQuery.UI" version="${net2:Saltarelle.jQuery.UI}" />
+ <dependency id="Saltarelle.Linq" version="${net2:Saltarelle.Linq}" />
+ <dependency id="Saltarelle.Runtime" version="${net2:Saltarelle.Runtime}" />
+ <dependency id="Saltarelle.Web" version="${net2:Saltarelle.Web}" />
</dependencies>
</metadata>
<files>
- <file src="Serenity.Script.Imports.dll" target="lib/${scriptFramework}" />
- <file src="Serenity.Script.Core.dll" target="lib/${scriptFramework}" />
- <file src="Serenity.Script.UI.dll" target="lib/${scriptFramework}" />
+ <file src="bin/${configuration}/Serenity.Script.Imports.dll" target="lib/${scriptFramework}" />
+ <file src="bin/${configuration}/Serenity.Script.Core.dll" target="lib/${scriptFramework}" />
+ <file src="bin/${configuration}/Serenity.Script.UI.dll" target="lib/${scriptFramework}" />
</files>
</package>
@@ -13,15 +13,24 @@
<projectUrl>${projectUrl}</projectUrl>
<copyright>${copyright}</copyright>
<tags>${tags}</tags>
- <dependencies>
- <dependency id="Newtonsoft.Json" version="${jsonNetVersion}" />
- <dependency id="Serenity.Core" version="${version}" />
- <dependency id="Serenity.Data" version="${version}" />
- <dependency id="Serenity.Data.Entity" version="${version}" />
+ <dependencies>
+ <group targetFramework=".NETFramework4.5">
+ <dependency id="Newtonsoft.Json" version="${net45:Newtonsoft.Json}" />
+ <dependency id="Serenity.Core" version="${version}" />
+ <dependency id="Serenity.Data" version="${version}" />
+ <dependency id="Serenity.Data.Entity" version="${version}" />
+ </group>
+<!-- <group targetFramework=".NETStandard1.6">
+ <dependency id="Newtonsoft.Json" version="${*:Newtonsoft.Json}" />
+ <dependency id="Serenity.Core" version="${version}" />
+ <dependency id="Serenity.Data" version="${version}" />
+ <dependency id="Serenity.Data.Entity" version="${version}" />
+ </group>
+-->
</dependencies>
</metadata>
<files>
- <file src="${id}.dll" target="lib/${framework}" />
- <file src="${id}.pdb" target="lib/${framework}" />
+ <file src="bin/${configuration}/Serenity.Testing.dll" target="lib/net45" />
+ <file src="bin/${configuration}/Serenity.Testing.pdb" target="lib/net45" />
</files>
</package>

0 comments on commit 6d6e48f

Please sign in to comment.