Permalink
Browse files

Merge ..\stable-ravendb

Conflicts:
	default.ps1
  • Loading branch information...
2 parents 90be22d + 23c39ba commit 6c4801f26a200cafe1a29c04783d1231abee56c6 @ayende ayende committed Jul 31, 2011
Showing with 4 additions and 3 deletions.
  1. +1 −1 RavenDB-Embedded.nuspec
  2. +1 −0 RavenDB.nuspec
  3. +2 −2 default.ps1
View
@@ -12,7 +12,7 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<tags>nosql ravendb raven document database embedded</tags>
<dependencies>
- <dependency id="Log4Net" version="[1.2.10]" />
+ <dependency id="NLog" version="[2.0.0.2000]" />
<dependency id="Newtonsoft.Json" version="[4.0.2]" />
</dependencies>
<iconUrl>http://ravendb.net/raven.png</iconUrl>
View
@@ -12,6 +12,7 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<tags>nosql ravendb raven document database</tags>
<dependencies>
+ <dependency id="NLog" version="[2.0.0.2000]" />
<dependency id="Newtonsoft.Json" version="[4.0.2]" />
</dependencies>
<iconUrl>http://ravendb.net/raven.png</iconUrl>
View
@@ -243,7 +243,7 @@ task CopySilverlight{
}
foreach($silverlight_dll in $silverlight_dlls_libs) {
- cp "$base_dir\SharedLibs\Silverlight\$silverlight_dll" $build_dir\Output\Silverlight
+ cp "$lib_dir\Silverlight\$silverlight_dll" $build_dir\Output\Silverlight
}
}
@@ -453,7 +453,7 @@ task CreateNugetPackage {
}
foreach($silverlight_dll in $silverlight_dlls_libs) {
- cp "$build_dir\SharedLibs\Silverlight\$silverlight_dll" $build_dir\NuPack\lib\sl40
+ cp "$lib_dir\Silverlight\$silverlight_dll" $build_dir\NuPack\lib\sl40
}
foreach($client_dll in $all_client_dlls) {

0 comments on commit 6c4801f

Please sign in to comment.