Commit 60e3572
Changed files (4)
build/project.deploy.build
@@ -52,8 +52,11 @@
<target name="create.configs">
<property name="target" value="${log4net.config}" />
<call target="expand.template.file" />
- <copy file="${log4net.config}" tofile="${build.compile.dir}\log4net.config.xml" />
- <copy file="${build.compile.dir}\log4net.config.xml" tofile="${product.dir}\client\boot\log4net.config.xml" />
+ <copy file="${build.config.dir}\log4net.config.xml" tofile="${product.dir}\client\boot\log4net.config.xml" />
+
+ <property name="target" value="${assembly.config}" />
+ <call target="expand.template.file" />
+ <copy file="${build.config.dir}\AssemblyInfo.cs" tofile="${product.dir}\client\boot\Properties\AssemblyInfo.cs" />
</target>
</project>
build/project.test.build
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="project.test">
- <property name="test.output" value="${project.name}.test.dll" />
- <property name="xunit.cons.exe" value="${build.tools.dir}\gallio\gallio.echo.exe" />
-
- <fileset id="test.references.fileset">
- <include name="${build.lib.dir}\**\*.dll" />
- <include name="${build.compile.dir}\${app.output}" />
- </fileset>
-
- <target name="test.compile" depends="app.compile, test.copy.dependencies">
- <csc output="${build.compile.dir}\${test.output}" target="library" debug="${debug}">
- <sources basedir="${product.dir}">
- <include name="**\*Specs.cs" />
- </sources>
- <references refid="test.references.fileset"/>
- </csc>
- </target>
-
- <target name="test.copy.dependencies">
- <copy todir="${build.compile.dir}" flatten="true">
- <fileset basedir="${build.lib.dir}">
- <include name="\**\*.dll" />
- </fileset>
- </copy>
- <copy todir="${build.compile.dir}" flatten="false">
- <fileset basedir="${build.resources.dir}">
- <include name="\**\*.*" />
- </fileset>
- </copy>
- <property name="target" value="${log4net.config}" />
- <call target="expand.template.file" />
- <copy file="${log4net.config}" tofile="${build.compile.dir}\log4net.config.xml" />
- </target>
-
- <target name="run.test" depends="test.compile">
- <exec
- program="${xunit.cons.exe}"
- workingdir="${build.compile.dir}"
- commandline="${xunit.arguments}" />
- </target>
-
- <target name="test">
- <property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:text /rd:${build.compile.dir}" />
- <call target="run.test" />
- </target>
-
- <target name="test.html">
- <property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:html /rd:${build.compile.dir}" />
- <call target="run.test" />
- </target>
-
-</project>
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="project.test">
+ <property name="test.output" value="${project.name}.test.dll" />
+ <property name="xunit.cons.exe" value="${build.tools.dir}\gallio\gallio.echo.exe" />
+
+ <fileset id="test.references.fileset">
+ <include name="${build.lib.dir}\**\*.dll" />
+ <include name="${build.compile.dir}\${app.output}" />
+ </fileset>
+
+ <target name="test.compile" depends="app.compile, test.copy.dependencies">
+ <csc output="${build.compile.dir}\${test.output}" target="library" debug="${debug}">
+ <sources basedir="${product.dir}">
+ <include name="**\*Specs.cs" />
+ </sources>
+ <references refid="test.references.fileset"/>
+ </csc>
+ </target>
+
+ <target name="test.copy.dependencies">
+ <copy todir="${build.compile.dir}" flatten="true">
+ <fileset basedir="${build.lib.dir}">
+ <include name="\**\*.dll" />
+ </fileset>
+ </copy>
+ <copy todir="${build.compile.dir}" flatten="false">
+ <fileset basedir="${build.resources.dir}">
+ <include name="\**\*.*" />
+ </fileset>
+ </copy>
+ <property name="target" value="${log4net.config}" />
+ <call target="expand.template.file" />
+ <copy file="${log4net.config}" tofile="${build.compile.dir}\log4net.config.xml" />
+ </target>
+
+ <target name="run.test" depends="test.compile">
+ <exec
+ program="${xunit.cons.exe}"
+ workingdir="${build.compile.dir}"
+ commandline="${xunit.arguments}" />
+ </target>
+
+ <target name="test">
+ <property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:text /rd:${build.compile.dir}" />
+ <call target="run.test" />
+ </target>
+
+ <target name="test.html">
+ <property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:html /rd:${build.compile.dir}" />
+ <call target="run.test" />
+ </target>
+
+</project>
product/client/boot/boot.csproj
@@ -175,6 +175,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
@@ -738,6 +739,9 @@
<Content Include="images\unsaved.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="log4net.config.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
.gitignore
@@ -1,19 +1,20 @@
-obj
-bin
-_ReSharper.*
-*.csproj.user
-*.resharper.user
-*.resharper
-*.suo
-*.cache
-*~
-*.sql
-*.swp
-*.swo
-*.properties.xml
-*.config.xml
-*.bootstrap.xml
-build/config/AssemblyInfo.cs
-compile
-artifacts
-installation
+obj
+bin
+_ReSharper.*
+*.csproj.user
+*.resharper.user
+*.resharper
+*.suo
+*.cache
+*~
+*.sql
+*.swp
+*.swo
+*.properties.xml
+*.config.xml
+*.bootstrap.xml
+AssemblyInfo.cs
+build/config/AssemblyInfo.cs
+compile
+artifacts
+installation