Permalink
Browse files

Fixed IL merge issue to pull correct SL libs in

  • Loading branch information...
jbogard committed Mar 19, 2010
1 parent c518961 commit f0d3b3e2669e235498b5d004c1da8ac9af27367b
Showing with 11 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +2 −1 AutoMapper.build
  3. +7 −0 src/AutoMapper.4.5.resharper
  4. +1 −0 src/AutoMapper.sln
View
@@ -1,4 +1,5 @@
build/
+release/
*.suo
*.user
bin
View
@@ -4,6 +4,7 @@
<property name="dist.dir" value="release" />
<property name="src.dir" value="src" />
<property name="tools.dir" value="tools" />
+ <property name="lib.dir" value="lib" />
<property name="nant.settings.currentframework" value="net-3.5" />
<property name="svn.executable" value="tools/subversion/svn.exe" dynamic="true" if="${not property::exists('svn.executable')}" />
@@ -62,7 +63,7 @@
<exec program="${tools.dir}\ILMerge\ilmerge.exe"
commandline="/v2 /log /out:&quot;${build.dir}\merge\AutoMapper.dll&quot; /internalize:AutoMapper.exclude &quot;${build.dir}\${config}\AutoMapper\AutoMapper.dll&quot; &quot;${build.dir}\${config}\AutoMapper\Castle.Core.dll&quot; &quot;${build.dir}\${config}\AutoMapper\Castle.DynamicProxy2.dll&quot; /keyfile:&quot;${src.dir}\AutoMapper.snk&quot;" workingdir="." />
<exec program="${tools.dir}\ILMerge\ilmerge.exe"
- commandline="/v2 /log /out:&quot;${build.dir}\merge-sl\AutoMapper.Silverlight.dll&quot; /internalize:AutoMapper.exclude &quot;${build.dir}\${config}\AutoMapper.Silverlight\AutoMapper.Silverlight.dll&quot; &quot;${build.dir}\${config}\AutoMapper.Silverlight\Castle.Core.dll&quot; &quot;${build.dir}\${config}\AutoMapper.Silverlight\Castle.DynamicProxy2.dll&quot; /keyfile:&quot;${src.dir}\AutoMapper.snk&quot;" workingdir="." />-->
+ commandline="/targetplatform:v2,&quot;${lib.dir}\Silverlight 3.0&quot; /lib:&quot;${lib.dir}\Silverlight 3.0&quot; /log /out:&quot;${build.dir}\merge-sl\AutoMapper.Silverlight.dll&quot; /internalize:AutoMapper.exclude &quot;${build.dir}\${config}\AutoMapper.Silverlight\AutoMapper.Silverlight.dll&quot; &quot;${build.dir}\${config}\AutoMapper.Silverlight\Castle.Core.dll&quot; &quot;${build.dir}\${config}\AutoMapper.Silverlight\Castle.DynamicProxy2.dll&quot; /keyfile:&quot;${src.dir}\AutoMapper.snk&quot;" workingdir="." />-->
</target>
<!-- Internal targets -->
@@ -0,0 +1,7 @@
+<Configuration>
+ <Daemon.SolutionSettings>
+ <SkipFilesAndFolders>
+ <Item>0691ABF2-B3C7-43BF-9862-2D8D1299CE58/f:go.bat/l:C!?dev?AutoMapper?go.bat</Item>
+ </SkipFilesAndFolders>
+ </Daemon.SolutionSettings>
+</Configuration>
View
@@ -4,6 +4,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\Unit
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0691ABF2-B3C7-43BF-9862-2D8D1299CE58}"
ProjectSection(SolutionItems) = preProject
+ ..\.gitignore = ..\.gitignore
..\AutoMapper.build = ..\AutoMapper.build
..\AutoMapper.exclude = ..\AutoMapper.exclude
..\go.bat = ..\go.bat

0 comments on commit f0d3b3e

Please sign in to comment.