lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Workaround issue with custom Orchard MsBuild tasks locked on disk

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay 2010-07-19 15:41:14 -07:00
parent 745a4dfd7f
commit 60a0b6c3ae
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -7,6 +7,7 @@ glob:*.user
glob:*.patch glob:*.patch
glob:*.hg glob:*.hg
glob:build glob:build
glob:buildtasks
glob:artifacts glob:artifacts
glob:*.sln.cache glob:*.sln.cache
glob:src/Orchard.Web/Media/* glob:src/Orchard.Web/Media/*

24
Orchard.proj
View File

@ -7,6 +7,7 @@
<LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder> <LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
<SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder> <SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
<BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder> <BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
<MsBuildTasksFolder>$(MSBuildProjectDirectory)\buildtasks</MsBuildTasksFolder>
<ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder> <ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder>
<SqlCeFolder>$(MSBuildProjectDirectory)\lib\sqlce</SqlCeFolder> <SqlCeFolder>$(MSBuildProjectDirectory)\lib\sqlce</SqlCeFolder>
<SourceArtifactFolder>$(ArtifactsFolder)\Source</SourceArtifactFolder> <SourceArtifactFolder>$(ArtifactsFolder)\Source</SourceArtifactFolder>
@ -37,15 +38,6 @@
<CallTarget Targets="Package"/> <CallTarget Targets="Package"/>
</Target> </Target>
<Target Name ="BuildWithVersion">
<CallTarget Targets="Clean"/>
<CallTarget Targets="SetVersion"/>
<CallTarget Targets="Compile"/>
<CallTarget Targets="Test"/>
<CallTarget Targets="Package"/>
</Target>
<Target Name="Package"> <Target Name="Package">
<CallTarget Targets="Package-Stage"/> <CallTarget Targets="Package-Stage"/>
<CallTarget Targets="Package-MsDeploy"/> <CallTarget Targets="Package-MsDeploy"/>
@ -70,8 +62,6 @@
</Target> </Target>
<Target Name ="Compile"> <Target Name ="Compile">
<CallTarget Targets="CompileMsBuildTasks"/>
<MSBuild <MSBuild
Projects="$(SrcFolder)\Orchard.sln" Projects="$(SrcFolder)\Orchard.sln"
Targets="Build" Targets="Build"
@ -82,10 +72,9 @@
<MSBuild <MSBuild
Projects="$(SrcFolder)\Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj" Projects="$(SrcFolder)\Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj"
Targets="Build" Targets="Build"
Properties="Configuration=Release;OutputPath=$(CompileFolder)" /> Properties="Configuration=Release;OutputPath=$(MsBuildTasksFolder)" />
</Target> </Target>
<!-- Testing --> <!-- Testing -->
<Target Name ="Test"> <Target Name ="Test">
@ -112,11 +101,13 @@
<!-- Packaging (Stage) --> <!-- Packaging (Stage) -->
<UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" /> <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
<UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" /> <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
<UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" /> <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
<Target Name="Package-Stage"> <Target Name="Package-Stage">
<CallTarget Targets="CompileMsBuildTasks"/>
<ItemGroup> <ItemGroup>
<SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/> <SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
<SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/> <SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/>
@ -252,6 +243,7 @@
<!-- Update all AssemblyInfo.cs and module.txt files to contain $(Version) --> <!-- Update all AssemblyInfo.cs and module.txt files to contain $(Version) -->
<Target Name="SetVersion" Condition="$(Version) != ''"> <Target Name="SetVersion" Condition="$(Version) != ''">
<CallTarget Targets="CompileMsBuildTasks"/> <CallTarget Targets="CompileMsBuildTasks"/>
<ItemGroup> <ItemGroup>
<Version-AssemblyInfos Include="$(SrcFolder)\**\AssemblyInfo.cs" /> <Version-AssemblyInfos Include="$(SrcFolder)\**\AssemblyInfo.cs" />
<Version-Modules Include="$(SrcFolder)\**\Module.txt" /> <Version-Modules Include="$(SrcFolder)\**\Module.txt" />