mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-14 02:44:52 +08:00
Merge dev -> perf
--HG-- branch : perf
This commit is contained in:
19
Orchard.proj
19
Orchard.proj
@@ -14,6 +14,7 @@
|
||||
<MsDeployArtifactFolder>$(ArtifactsFolder)\MsDeploy</MsDeployArtifactFolder>
|
||||
<GalleryArtifactFolder>$(ArtifactsFolder)\Gallery</GalleryArtifactFolder>
|
||||
<ModulesSrcFolder>$(MSBuildProjectDirectory)\src\Orchard.Web\Modules</ModulesSrcFolder>
|
||||
<OrchardCoreSrcFolder>$(MSBuildProjectDirectory)\src\Orchard.Web\Core</OrchardCoreSrcFolder>
|
||||
<ThemesSrcFolder>$(MSBuildProjectDirectory)\src\Orchard.Web\Themes</ThemesSrcFolder>
|
||||
|
||||
<CompileFolder>$(BuildFolder)\Compile</CompileFolder>
|
||||
@@ -120,9 +121,11 @@
|
||||
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
|
||||
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
|
||||
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
|
||||
<UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.ValidateExtensionProjectFiles" />
|
||||
|
||||
<Target Name="Package-Stage">
|
||||
<CallTarget Targets="CompileMsBuildTasks"/>
|
||||
<CallTarget Targets="ValidateProjectFiles"/>
|
||||
|
||||
<ItemGroup>
|
||||
<SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
|
||||
@@ -230,6 +233,7 @@
|
||||
$(StageFolder)\**\Modules\Orchard.Indexing\**;
|
||||
$(StageFolder)\**\Modules\Orchard.Migrations\**;
|
||||
$(StageFolder)\**\Modules\Orchard.MultiTenancy\**;
|
||||
$(StageFolder)\**\Modules\Orchard.Scripting.Dlr\**;
|
||||
$(StageFolder)\**\Modules\Orchard.Search\**;
|
||||
" />
|
||||
|
||||
@@ -326,10 +330,23 @@
|
||||
<Exec Command=""$(GalleryFolder)\bin\Orchard.exe" package create Orchard.Indexing "$(GalleryArtifactFolder)"" WorkingDirectory="$(GalleryFolder)"/>
|
||||
<Exec Command=""$(GalleryFolder)\bin\Orchard.exe" package create Orchard.Migrations "$(GalleryArtifactFolder)"" WorkingDirectory="$(GalleryFolder)"/>
|
||||
<Exec Command=""$(GalleryFolder)\bin\Orchard.exe" package create Orchard.MultiTenancy "$(GalleryArtifactFolder)"" WorkingDirectory="$(GalleryFolder)"/>
|
||||
<Exec Command=""$(GalleryFolder)\bin\Orchard.exe" package create Orchard.Scriping.Dlr "$(GalleryArtifactFolder)"" WorkingDirectory="$(GalleryFolder)"/>
|
||||
<Exec Command=""$(GalleryFolder)\bin\Orchard.exe" package create Orchard.Search "$(GalleryArtifactFolder)"" WorkingDirectory="$(GalleryFolder)"/>
|
||||
</Target>
|
||||
|
||||
<!-- Version -->
|
||||
<!-- ValidateProjectFiles-->
|
||||
<Target Name="ValidateProjectFiles">
|
||||
<CallTarget Targets="CompileMsBuildTasks"/>
|
||||
|
||||
<ItemGroup>
|
||||
<Validate-ProjectFiles Include="$(ModulesSrcFolder)\**\*.csproj;$(ThemesSrcFolder)\**\*.csproj;$(OrchardCoreSrcFolder)\Orchard.Core.csproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ValidateExtensionProjectFiles Files="@(Validate-ProjectFiles)"/>
|
||||
|
||||
</Target>
|
||||
|
||||
<!-- SetVersion -->
|
||||
<!-- Update all AssemblyInfo.cs and module.txt files to contain $(Version) -->
|
||||
<Target Name="SetVersion" Condition="$(Version) != ''">
|
||||
<CallTarget Targets="CompileMsBuildTasks"/>
|
||||
|
Reference in New Issue
Block a user