Skip to content

Commit

Permalink
Merged
Browse files Browse the repository at this point in the history
  • Loading branch information
phatboyg committed Aug 11, 2010
2 parents 694144c + 7933f61 commit 43692a9
Show file tree
Hide file tree
Showing 76 changed files with 10,854 additions and 24,569 deletions.
2 changes: 1 addition & 1 deletion build/UppercuT.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<uppercut>
<version>0.9.0.304</version>
<version>0.9.0.0</version>
</uppercut>

1 change: 0 additions & 1 deletion build/analyze.step
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<nant buildfile="${dirs.current}\analyzers\test.step" inheritall="true" />
<nant buildfile="${dirs.current}\analyzers\ncover.step" inheritall="true" failonerror="false" />
<nant buildfile="${dirs.current}\analyzers\ndepend.step" inheritall="true" failonerror="false" />
<nant buildfile="${dirs.current}\analyzers\nitriq.step" inheritall="true" failonerror="false" />
<nant buildfile="${dirs.current}\analyzers\moma.step" inheritall="true" failonerror="false" />
</target>

Expand Down
2 changes: 1 addition & 1 deletion build/analyzers/ndepend.step
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<project name="NDepend" default="go">
<project name="NDepend" default="go" xmlns="http://nant.sf.net/schemas/nant.xsd">
<!-- Project UppercuT - http://projectuppercut.org -->
<!-- DO NOT EDIT THIS FILE - Add custom tasks in BuildTasks.Custom\Analyzers folder with file by the same name - find out more at http://uppercut.pbwiki.com -->
<property name="build.config.settings" value="__NONE__" overwrite="false" />
Expand Down
2 changes: 1 addition & 1 deletion build/analyzers/nunit.test.step
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<property name="dirs.test_results" value="${dirs.build_artifacts}\nunit" overwrite="false" />
<property name="file.test_results" value="index" overwrite="false" />
<property name="tests.excluded_categories.comma_separated" value="Database,Integration,Slow,NotWorking,Ignore,database,integration,slow,notworking,ignore" overwrite="false" />
<property name="test.args" value="/xml=&quot;${dirs.test_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework}" />
<property name="test.args" value="/xml=&quot;${dirs.test_results}\nunit-results.xml&quot; /nologo /framework=net-3.5" />
<property name="test.args.exclude" value="/exclude=&quot;${tests.excluded_categories.comma_separated}&quot;" />
<property name="app.nunit.console" value="${path::get-full-path(dirs.lib)}\NUnit\nunit-console.exe" overwrite="false" />
<property name="file.custom.step.before" value="${dirs.build_scripts_custom}\${file.current.no_extension}.pre.step" />
Expand Down
Binary file modified build/uppercut.dll
Binary file not shown.
Binary file modified build/uppercut.tasks.dll
Binary file not shown.
3 changes: 1 addition & 2 deletions build/versionBuilder.step
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<property name="version.revision" value="0" overwrite="false" />
<property name="version.hash" value="${version.revision}" overwrite="false" />
<property name="assembly.description" value="${project.name} is a product of ${company.name}" overwrite="false" />
<property name="assembly.clscompliant" value="true" overwrite="false" />
<property name="allow.partially_trusted_callers" value="true" overwrite="false" />
<property name="sign.project_with_key" value="false" overwrite="false" />
<property name="sign.key.use_relative_pathing" value="false" overwrite="false" />
Expand Down Expand Up @@ -117,7 +116,7 @@
</imports>
<attributes>
<attribute type="ComVisibleAttribute" value="false" />
<attribute type="CLSCompliantAttribute" value="${assembly.clscompliant}" />
<attribute type="CLSCompliantAttribute" value="true" />
<attribute type="AssemblyCompanyAttribute" value="${company.name}" />
<attribute type="AssemblyVersionAttribute" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
<attribute type="AssemblyFileVersionAttribute" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
Expand Down
Binary file removed lib/Magnum/Ionic.Zip.dll
Binary file not shown.
Binary file removed lib/Magnum/Magnum.FileSystem.dll
Binary file not shown.
Binary file removed lib/Magnum/Magnum.FileSystem.pdb
Binary file not shown.
Binary file modified lib/Magnum/Magnum.TestFramework.dll
Binary file not shown.
Binary file modified lib/Magnum/Magnum.TestFramework.pdb
Binary file not shown.
13,265 changes: 0 additions & 13,265 deletions lib/Magnum/Magnum.XML

This file was deleted.

Binary file modified lib/Magnum/Magnum.dll
Binary file not shown.
Binary file removed lib/Magnum/Magnum.pdb
Binary file not shown.
277 changes: 0 additions & 277 deletions lib/NUnit/NUnitFitTests.html

This file was deleted.

Loading

0 comments on commit 43692a9

Please sign in to comment.