lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-03-30 15:03:23 -07:00
parent 5ed02227d3 dc775c79c1
commit 1a3e57a840
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.hgignore
View File

@@ -24,3 +24,5 @@ glob:*.build.csdef
glob:src/Orchard.Azure/Orchard.Azure.Web/Core
glob:src/Orchard.Azure/Orchard.Azure.Web/Modules
glob:src/Orchard.Azure/Orchard.Azure.Web/Themes
syntax: glob
src/Orchard.Web/Orchard.Web.Publish.xml

33
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -173,6 +173,39 @@
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target> -->
<PropertyGroup>
<CopyAllFilesToSingleFolderForPackageDependsOn>
CustomCollectFiles;
$(CopyAllFilesToSingleFolderForPackageDependsOn);
</CopyAllFilesToSingleFolderForPackageDependsOn>
</PropertyGroup>
<Target Name="CustomCollectFiles">
<ItemGroup>
<Orchard-Web-Bins Include="bin\*" />
<SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
<SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />
<_CustomFiles
Include="Modules\**\*;Themes\**\*;Core\**\*;**\*.po"
Exclude="**\obj\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;**\*.hg*"
/>
<FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
<DestinationRelativePath>%(RelativeDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<_SqlCeBinariesx86Files Include="@(SqlCeBinariesx86);" />
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx86Files.Identity)">
<DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<_SqlCeBinariesx64Files Include="@(SqlCeBinariesx64);" />
<FilesForPackagingFromProject Include="%(_SqlCeBinariesx64Files.Identity)">
<DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
<Target Name="CopySqlCeBinaries">
<ItemGroup>
<SqlCeBinariesx86 Include="$(ProjectDir)..\..\lib\sqlce\x86\**\*" />

4
src/Orchard/Orchard.Framework.csproj
View File

@@ -88,10 +88,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\fluentnhibernate\FluentNHibernate.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\sharpziplib\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\fluentnhibernate\log4net.dll</HintPath>