Skip to content
Browse files

Consolidate build with changes for RavenDB package

  • Loading branch information...
1 parent 55cab0a commit 940bf24ed53fd4c827ded2792e4780e99f723805 @seif seif committed Jan 21, 2013
View
31 Build/Build.proj
@@ -1,21 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="PackageArtefacts" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+
+ <PropertyGroup>
+ <VersionMajor>2</VersionMajor>
+ <VersionMinor>1</VersionMinor>
+ <VersionPatch>0</VersionPatch>
+ <VersionPreRelease>RC3</VersionPreRelease>
+ </PropertyGroup>
+
<PropertyGroup>
<SolutionName>SharpArchTemplate</SolutionName>
<SolutionsPath>$(MSBuildProjectDirectory)\..\Solutions</SolutionsPath>
<BuildPath>$(MSBuildProjectDirectory)\..\BuildSystem</BuildPath>
- <WebAppPath>$(SolutionsPath)\$(SolutionName).Web</WebAppPath>
+ <WebAppPath>$(SolutionsPath)\$(SolutionName).Web.Mvc</WebAppPath>
<SolutionRoot>$(BuildPath)\..\..</SolutionRoot>
</PropertyGroup>
+ <Import Project="$(BuildPath)\BuildSystem.proj" />
+
<ItemGroup>
- <PackageFiles Include="$(WebAppPath)\**\*.*"
- Exclude="$(WebAppPath)\**\bin\**;
- $(WebAppPath)\**\Logs\**;
- $(WebAppPath)\**\obj\**;">
- <PackageName>$(DropsPath)\$(GlobalBuildVersionNumber)\$(PackageName).Source.v$(GlobalBuildVersionNumber).zip</PackageName>
- <WorkingDirectory>$(WebAppPath)</WorkingDirectory>
+ <PackageFiles Include="$(SolutionsPath)\**\*.*"
+ Exclude="$(SolutionsPath)\**\bin\**;
+ $(SolutionsPath)\**\Logs\**;
+ $(SolutionsPath)\**\obj\**;">
+ <PackageName>$(DropsPath)\$(SemanticVersion)\$(PackageName).Source.v$(SemanticVersion).zip</PackageName>
+ <WorkingDirectory>$(SolutionsPath)</WorkingDirectory>
+ <Flatten>False</Flatten>
</PackageFiles>
</ItemGroup>
@@ -27,15 +37,12 @@
<TemplifyPath>$(SolutionsPath)</TemplifyPath>
<TemplifyPackageName>Sharp Architecture Template</TemplifyPackageName>
<TemplifyPackageAuthor>Sharp Architecture Development Team</TemplifyPackageAuthor>
- <TemplifyPackageVersion>$(GlobalBuildVersionNumber)</TemplifyPackageVersion>
+ <TemplifyPackageVersion>$(SemanticVersion)</TemplifyPackageVersion>
<TemplifyPackageRepositoryPath>$(DropsPath)\$(GlobalBuildVersionNumber)</TemplifyPackageRepositoryPath>
</PropertyGroup>
- <Import Project="$(BuildPath)\BuildSystem.proj" />
-
<Target Name="Build"
DependsOnTargets="CleanSolution;
- UpdateAssemblyVersion;
BuildSolutions;" />
<Target Name="PackageArtefacts"
2 BuildSystem
@@ -1 +1 @@
-Subproject commit 1209d454a8c55ee4180ffb66a4badb740f5cfe6b
+Subproject commit db9bee3a69a30380d709683abb9bfe30fb6ef5dd
View
4 Common/AssemblyVersion.cs → Solutions/Common/AssemblyVersion.cs
@@ -1,7 +1,7 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.1
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
View
0 Common/CommonAssemblyInfo.cs → Solutions/Common/CommonAssemblyInfo.cs
File renamed without changes.
View
4 Solutions/MSpecTests.SharpArchTemplate/MSpecTests.SharpArchTemplate.csproj
@@ -105,10 +105,10 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\Common\AssemblyVersion.cs">
+ <Compile Include="..\Common\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
- <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
+ <Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
</ItemGroup>
View
4 Solutions/SharpArchTemplate.Domain/SharpArchTemplate.Domain.csproj
@@ -84,10 +84,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\Common\AssemblyVersion.cs">
+ <Compile Include="..\Common\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
- <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
+ <Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="MyEntity1.cs" />
View
4 Solutions/SharpArchTemplate.Infrastructure/SharpArchTemplate.Infrastructure.csproj
@@ -100,10 +100,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\Common\AssemblyVersion.cs">
+ <Compile Include="..\Common\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
- <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
+ <Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="NHibernateMaps\AutomappingConfiguration.cs" />
View
4 Solutions/SharpArchTemplate.Tasks/SharpArchTemplate.Tasks.csproj
@@ -86,10 +86,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\Common\AssemblyVersion.cs">
+ <Compile Include="..\Common\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
- <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
+ <Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
</ItemGroup>
View
4 Solutions/SharpArchTemplate.Web.Mvc/SharpArchTemplate.Web.Mvc.csproj
@@ -140,10 +140,10 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
- <Compile Include="..\..\Common\AssemblyVersion.cs">
+ <Compile Include="..\Common\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
- <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
+ <Compile Include="..\Common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="CastleWindsor\ComponentRegistrar.cs" />

0 comments on commit 940bf24

Please sign in to comment.
Something went wrong with that request. Please try again.