Permalink
Browse files

Created msbuild build process for DReAM

  • Loading branch information...
1 parent 516301a commit 1cb0b5e607ad8efb2885d33abb61d8cc76a4cb44 @sdether sdether committed Mar 1, 2011
View
@@ -20,4 +20,5 @@ App_Data/
src/test-results/*.xml
src/*/test-results/*.xml
src/*/*/test-results/*.xml
-*.test-cache
+*.test-cache
+*.cache
View
@@ -0,0 +1,83 @@
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration>Signed Release</Configuration>
+ <Platform >AnyCPU</Platform>
+ <MindTouchKey Condition=" '$(MindTouchKey)' == '' ">build\mindtouch.dream.public.snk</MindTouchKey>
+ <ConfigurationFilename Condition=" '$(ConfigurationFilename)' == '' ">mindtouch.build.xml</ConfigurationFilename>
+ <IgnoreModified Condition=" '$(IgnoreModified)' == '' ">false</IgnoreModified>
+ <SolutionDir>$(MSBuildProjectDirectory)\src</SolutionDir>
+ <SolutionExt>.sln</SolutionExt>
+ <SolutionFileName>MindTouchDream.sln</SolutionFileName>
+ <SolutionName>MindTouchDream</SolutionName>
+ <SolutionPath>$(MSBuildProjectDirectory)\src\MindTouchDream.sln</SolutionPath>
+ <BinDir>$(SolutionDir)\bin</BinDir>
+ <DistDir>$(MSBuildProjectDirectory)\dist</DistDir>
+ <Files>
+ mindtouch.core.dll;
+ mindtouch.core.xml;
+ mindtouch.dream.dll;
+ mindtouch.dream.xml;
+ mindtouch.dream.test.dll;
+ mindtouch.dream.test.xml;
+ mindtouch.host.service.exe;
+ mindtouch.host.exe;
+ mindtouch.host.exe.config;
+ Autofac.dll;
+ log4net.dll;
+ nunit.framework.dll;
+ SgmlReaderDll.dll
+ </Files>
+ </PropertyGroup>
+ <UsingTask TaskName="MindTouch.Build.Tasks.PreBuild"
+ AssemblyFile="build/mindtouch.build.tasks.dll" />
+ <UsingTask TaskName="MindTouch.Build.Tasks.PostBuild"
+ AssemblyFile="build/mindtouch.build.tasks.dll" />
+ <UsingTask TaskName="MindTouch.Build.Tasks.UpdateVersion"
+ AssemblyFile="build/mindtouch.build.tasks.dll" />
+ <Target Name="Build">
+ <CallTarget Targets="PreBuild"/>
+ <CallTarget Targets="Dream"/>
+ <CallTarget Targets="PostBuild"/>
+ </Target>
+ <Target Name="PostBuild">
+ <Message Text="Post Build" />
+ <PostBuild SolutionDir="$(SolutionDir)" ConfigurationFilename="$(ConfigurationFilename)" IgnoreModified="$(IgnoreModified)"/>
+ <MakeDir Directories="$(DistDir)"/>
+ <CombinePath BasePath="$(BinDir)" Paths="$(Files)">
+ <Output TaskParameter="CombinedPaths" PropertyName="SourceFiles"/>
+ </CombinePath>
+ <CombinePath BasePath="$(DistDir)" Paths="$(Files)">
+ <Output TaskParameter="CombinedPaths" PropertyName="DestFiles"/>
+ </CombinePath>
+ <Copy SourceFiles="$(SourceFiles)" DestinationFiles="$(DestFiles)"/>
+ </Target>
+ <Target Name="PreBuild">
+ <Message Text="Pre Build" />
+ <Copy SourceFiles="$(MindTouchKey)" DestinationFiles="$(SolutionDir)\mindtouch.snk"/>
+ <PreBuild SolutionDir="$(SolutionDir)" ConfigurationFilename="$(ConfigurationFilename)" IgnoreModified="$(IgnoreModified)"/>
+ </Target>
+ <Target Name="UpdateVersion">
+ <Message Text="Updating Version" />
+ <UpdateVersion SolutionDir="$(SolutionDir)" ConfigurationFilename="$(ConfigurationFilename)" Version="$(Version)" IgnoreModified="$(IgnoreModified)"/>
+ </Target>
+ <Target Name="Env">
+ <CombinePath BasePath="$(DistDir)" Paths="$(Files)">
+ <Output TaskParameter="CombinedPaths" PropertyName="DistFiles"/>
+ </CombinePath>
+ <Message Text="DistFiles: $(DistFiles)"/>
+ <Message Text="Configuration: $(Configuration)"/>
+ <Message Text="MindTouchKey: $(MindTouchKey)"/>
+ <Message Text="SolutionDir: $(SolutionDir)"/>
+ <Message Text="SolutionExt: $(SolutionExt)"/>
+ <Message Text="SolutionFileName: $(SolutionFileName)"/>
+ <Message Text="SolutionName: $(SolutionName)"/>
+ <Message Text="SolutionPath: $(SolutionPath)"/>
+ </Target>
+ <Target Name="Dream" Outputs="@(DreamBuildOutput)">
+ <Message Text="Building DReAM" />
+ <MSBuild Targets="Rebuild" Projects="src\MindTouchDream.sln" Properties="Configuration=Signed Release; Platform=Any CPU; BuildingSolutionFile=true; SolutionDir=$(SolutionDir); SolutionExt=$(SolutionExt); SolutionFileName=$(SolutionFileName); SolutionName=$(SolutionName); SolutionPath=$(SolutionPath)" ToolsVersion="$(ProjectToolsVersion)" UnloadProjectsOnCompletion="$(UnloadProjectsOnCompletion)" UseResultsCache="$(UseResultsCache)">
+ <Output TaskParameter="TargetOutputs" ItemName="DreamBuildOutput" />
+ </MSBuild>
+ <Message Text="Done building DReAM" />
+ </Target>
+</Project>
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
@@ -1,14 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <assemblies major="2" minor="2" release="1" revision="24969">
- <assembly name="mindtouch.dream" publicKeyToken="b17e0197b56911d2" culture="neutral" assemblyinfo-path="src\mindtouch.dream\AssemblyInfo.cs" remap="true" />
- <assembly name="mindtouch.dream.test" publicKeyToken="b17e0197b56911d2" culture="neutral" assemblyinfo-path="src\mindtouch.dream.test\Properties\AssemblyInfo.cs" remap="true" />
- <assembly name="mindtouch.core" publicKeyToken="b17e0197b56911d2" culture="neutral" assemblyinfo-path="src\mindtouch.core\AssemblyInfo.cs" />
- <assembly name="mindtouch.host" publicKeyToken="b17e0197b56911d2" culture="neutral" assemblyinfo-path="src\mindtouch.host\AssemblyInfo.cs" />
- <assembly name="mindtouch.host.service" publicKeyToken="b17e0197b56911d2" culture="neutral" assemblyinfo-path="src\mindtouch.host.service\AssemblyInfo.cs" />
- <assembly file="SgmlReaderDll.dll" />
+ <assemblies
+ major="2"
+ minor="2"
+ release="1"
+ revision="0">
+ <assembly
+ name="mindtouch.dream"
+ publicKeyToken="b17e0197b56911d2"
+ assemblyinfo-path="src\mindtouch.dream\AssemblyInfo.cs"
+ remap="true" />
+ <assembly
+ name="mindtouch.dream.test"
+ publicKeyToken="b17e0197b56911d2"
+ assemblyinfo-path="src\mindtouch.dream.test\Properties\AssemblyInfo.cs"
+ remap="true" />
+ <assembly
+ name="mindtouch.core"
+ publicKeyToken="b17e0197b56911d2"
+ assemblyinfo-path="src\mindtouch.core\AssemblyInfo.cs" />
+ <assembly
+ name="mindtouch.host"
+ publicKeyToken="b17e0197b56911d2"
+ assemblyinfo-path="src\mindtouch.host\AssemblyInfo.cs" />
+ <assembly
+ name="mindtouch.host.service"
+ publicKeyToken="b17e0197b56911d2"
+ assemblyinfo-path="src\mindtouch.host.service\AssemblyInfo.cs" />
+ <assembly
+ file="SgmlReaderDll.dll" />
</assemblies>
<configfiles>
- <path>src\mindtouch.host\App.config</path>
+ <path>src\bin\mindtouch.host.exe.config</path>
</configfiles>
</configuration>
@@ -53,10 +53,10 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.24969")]
-[assembly: AssemblyFileVersion("2.2.1.24969")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: GitBranch("2.2")]
-[assembly: GitRevision("ba03c6789e50951a7ad0341e6ccec8b18aad6930")]
+[assembly: GitRevision("HEAD")]
[assembly: GitUri("https://github.com/sdether/DReAM")]
//
@@ -53,10 +53,10 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.24969")]
-[assembly: AssemblyFileVersion("2.2.1.24969")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: GitBranch("2.2")]
-[assembly: GitRevision("ba03c6789e50951a7ad0341e6ccec8b18aad6930")]
+[assembly: GitRevision("HEAD")]
[assembly: GitUri("https://github.com/sdether/DReAM")]
#if SIGNED
@@ -55,10 +55,10 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.24969")]
-[assembly: AssemblyFileVersion("2.2.1.24969")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: GitBranch("2.2")]
-[assembly: GitRevision("ba03c6789e50951a7ad0341e6ccec8b18aad6930")]
+[assembly: GitRevision("HEAD")]
[assembly: GitUri("https://github.com/sdether/DReAM")]
//
@@ -858,7 +858,10 @@ private enum CharSetStates {
}
}
stateloop_continue:
+
+ // Note (arnec): the below exist so that stateloop_continue has a place to land and there is no warning about an unused variable
var x = 0;
+ x++;
}
stateloop_end:
stateSave = state;
@@ -53,8 +53,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.2.1.24969")]
-[assembly: AssemblyFileVersion("2.2.1.24969")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: GitBranch("2.2")]
-[assembly: GitRevision("ba03c6789e50951a7ad0341e6ccec8b18aad6930")]
+[assembly: GitRevision("HEAD")]
[assembly: GitUri("https://github.com/sdether/DReAM")]
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
<configuration>
<configSections>
- <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+ <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections>
<appSettings>
- <add key="threadpool" value="elastic" />
+ <add key="threadpool" value="elastic"/>
</appSettings>
<system.net>
<connectionManagement>
- <clear />
- <add address="*" maxconnection="16" />
+ <clear/>
+ <add address="*" maxconnection="16"/>
</connectionManagement>
</system.net>
<log4net>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
- <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+ <conversionPattern value="%date [%thread] %-5level %logger - %message%newline"/>
</layout>
</appender>
- <renderer renderingClass="MindTouch.Logging.ExceptionRenderer" renderedClass="System.Exception" />
+ <renderer renderingClass="MindTouch.Logging.ExceptionRenderer" renderedClass="System.Exception"/>
<!-- Set root logger level to DEBUG and its only appender to A1 -->
<root>
- <level value="WARN" />
- <appender-ref ref="ConsoleAppender" />
+ <level value="WARN"/>
+ <appender-ref ref="ConsoleAppender"/>
</root>
</log4net>
<runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="mindtouch.dream" publicKeyToken="b17e0197b56911d2" culture="neutral" />
- <bindingRedirect oldVersion="2.2.0.0-2.2.1.24969" newVersion="2.2.1.24969" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="SgmlReaderDll" publicKeyToken="46b2db9ca481831b" culture="neutral" />
- <bindingRedirect oldVersion="1.8.0.0-1.8.7.14535" newVersion="1.8.7.14535" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="mindtouch.dream.test" publicKeyToken="b17e0197b56911d2" culture="neutral" />
- <bindingRedirect oldVersion="2.2.0.0-2.2.1.24969" newVersion="2.2.1.24969" />
- </dependentAssembly>
- </assemblyBinding>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="mindtouch.dream" publicKeyToken="b17e0197b56911d2" culture="neutral"/>
+ <bindingRedirect oldVersion="2.2.0.0-2.2.1.0" newVersion="2.2.1.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="SgmlReaderDll" publicKeyToken="46b2db9ca481831b" culture="neutral"/>
+ <bindingRedirect oldVersion="1.8.0.0-1.8.7.14535" newVersion="1.8.7.14535"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="mindtouch.dream.test" publicKeyToken="b17e0197b56911d2" culture="neutral"/>
+ <bindingRedirect oldVersion="2.2.0.0-2.2.1.0" newVersion="2.2.1.0"/>
+ </dependentAssembly>
+ </assemblyBinding>
</runtime>
-</configuration>
+</configuration>
@@ -53,8 +53,8 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.2.1.24969")]
-[assembly: AssemblyFileVersion("2.2.1.24969")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: GitBranch("2.2")]
-[assembly: GitRevision("ba03c6789e50951a7ad0341e6ccec8b18aad6930")]
+[assembly: GitRevision("HEAD")]
[assembly: GitUri("https://github.com/sdether/DReAM")]
@@ -45,7 +45,7 @@
<NoWarn>1911,0618</NoWarn>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\redist\log4net.dll</HintPath>
</Reference>
@@ -63,16 +63,6 @@
<None Include="App.config">
</None>
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\mindtouch.dream\mindtouch.dream.csproj">
- <Project>{3E706653-69D1-4522-BEE8-ECEC1A1BF7DE}</Project>
- <Name>mindtouch.dream</Name>
- </ProjectReference>
- <ProjectReference Include="..\mindtouch.core\mindtouch.core.csproj">
- <Project>{CAAE6609-8532-4CCA-ABD5-186C43F77687}</Project>
- <Name>mindtouch.core</Name>
- </ProjectReference>
- </ItemGroup>
<ItemGroup>
<Content Include="mindtouch.env.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -81,6 +71,16 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\mindtouch.core\mindtouch.core.csproj">
+ <Project>{CAAE6609-8532-4CCA-ABD5-186C43F77687}</Project>
+ <Name>mindtouch.core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\mindtouch.dream\mindtouch.dream.csproj">
+ <Project>{3E706653-69D1-4522-BEE8-ECEC1A1BF7DE}</Project>
+ <Name>mindtouch.dream</Name>
+ </ProjectReference>
+ </ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -183,6 +183,7 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>copy "$(SolutionDir)redist\*.*" "$(TargetDir)"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
@@ -88,7 +88,7 @@ public class AmazonS3ClientTests {
try {
_client.PutFile("foo/bar/", Helper.CreateFileHandle(data, null));
Assert.Fail("didn't throw");
- } catch(InvalidOperationException e) { }
+ } catch(InvalidOperationException) { }
}
[Test]
@@ -42,7 +42,6 @@ public class AmazonS3PrivateStorageTests {
//--- Fields ---
private DreamHostInfo _hostInfo;
private Mock<IAmazonS3Client> _s3ClientMock;
- private AmazonS3ClientProxy _clientProxy;
private MockServiceInfo _mockService;
private string _storageRoot;
private string _rootPath;
@@ -47,7 +47,6 @@ public class AmazonS3StorageTest {
[TestFixtureSetUp]
public void Init() {
- var root = "rootpath";
var config = new XDoc("config");
var builder = new ContainerBuilder();
builder.Register((c, p) => {

0 comments on commit 1cb0b5e

Please sign in to comment.