Skip to content

Commit 6d15c9f

Browse files
remogloorremogloor
committed
Changed the build scripts that WP7 Uni Tests are not executed on Windows 8 because the Emulator does not run anymore
1 parent 6bddadb commit 6d15c9f

File tree

2 files changed

+182
-3
lines changed

2 files changed

+182
-3
lines changed

‎Ninject.build‎

Lines changed: 181 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,182 @@
1-
<project name="NinjectMain" default="build">
2-
<include buildfile="Ninject.Extensions.Factory.build" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<project name="Ninject" default="build">
3+
<property name="version" value="0.0.0.0" overwrite="true"/>
4+
<property name="product.name" value="Ninject" overwrite="false"/>
5+
<property name="product.company" value="Ninject Project Contributors" overwrite="false"/>
6+
<property name="product.duration" value="2007-2012" overwrite="false"/>
7+
<property name="product.description" value="Lightweight dependency injection for .NET" overwrite="false"/>
8+
<property name="product.platforms" value="net-3.5-client,net-4.0-client,net-4.5,net-3.5_medium_trust,net-4.0_medium_trust,net-4.5_medium_trust,silverlight-5.0,silverlight-4.0,silverlight-3.0,silverlight-2.0,silverlight-4.0-wp71,silverlight-4.0-wp7,mono-2.0,mono-3.5,mono-4.0,netcf-3.5" overwrite="false"/>
9+
<property name="product.buildserverPlatforms" value="net-3.5-client,net-4.0-client,net-3.5_medium_trust,net-4.0_medium_trust,silverlight-5.0,silverlight-4.0,silverlight-3.0,silverlight-2.0,mono-2.0,mono-3.5,mono-4.0,netcf-3.5" overwrite="false"/>
10+
<property name="dependencies" value="" overwrite="false"/>
11+
12+
<property name="product.assembly.testmodule" value="${product.name}.Tests.TestModule.dll" overwrite="false"/>
13+
<property name="product.assembly.testassembly" value="${product.name}.Tests.TestAssembly.dll" overwrite="false"/>
14+
<property name="current.path.testmodules" value="${path.build}/${build.platform}/tests/TestModules" dynamic="true"/>
15+
16+
<include buildfile="Ninject.include" />
17+
<target name="all" depends="core csl test silverlight-test"/>
18+
<target name="nuget-all" depends="nuget"/>
19+
20+
<target name="core" depends="init">
21+
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
22+
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
23+
<sources basedir="${path.src}">
24+
<include name="${build.asminfo}"/>
25+
<include name="${product.name}/**/*.cs"/>
26+
</sources>
27+
<references>
28+
<include name="mscorlib.dll"/>
29+
<include name="System.dll"/>
30+
<include name="System.Core.dll"/>
31+
<include name="${path.lib}/System.Linq.dll" if="${string::contains(build.platform, 'wp7') and not(string::contains(build.platform, 'wp71'))}"/>
32+
</references>
33+
<nowarn>
34+
<warning number="1711"/>
35+
</nowarn>
36+
</csc>
37+
</target>
38+
39+
<target name="csl" depends="init core">
40+
<property name="current.path.build.extensions" value="${path.build}/${build.platform}/${build.config}/extensions"/>
41+
<mkdir dir="${current.path.build.extensions}" if="${not(directory::exists(current.path.build.extensions))}"/>
42+
43+
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build.extensions}/CommonServiceLocator.NinjectAdapter.dll">
44+
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
45+
<sources basedir="${path.src}">
46+
<include name="${build.asminfo}"/>
47+
<include name="CommonServiceLocator.NinjectAdapter/**/*.cs"/>
48+
</sources>
49+
<references basedir="${current.path.build}">
50+
<include name="mscorlib.dll"/>
51+
<include name="System.dll"/>
52+
<include name="System.Core.dll"/>
53+
<include name="${product.assembly}"/>
54+
<include name="${path.packages}/CommonServiceLocator.*/lib/NET35/Microsoft.Practices.ServiceLocation.dll"/>
55+
</references>
56+
</csc>
57+
</target>
58+
59+
<target name="compile-test-modules" depends="core" unless="${skip.tests}">
60+
<mkdir dir="${current.path.test}"/>
61+
<copy todir="${current.path.test}" flatten="true">
62+
<fileset basedir="${current.path.build}">
63+
<include name="**/*.dll"/>
64+
</fileset>
65+
</copy>
66+
<csc noconfig="true" nostdlib="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
67+
output="${current.path.test}/${product.assembly.testmodule}">
68+
<sources basedir="${path.src}">
69+
<include name="TestModules/**/*.cs"/>
70+
</sources>
71+
<references basedir="${current.path.test}">
72+
<include name="mscorlib.dll"/>
73+
<include name="System.dll"/>
74+
<include name="System.Core.dll"/>
75+
<include name="${product.assembly}"/>
76+
</references>
77+
<nowarn>
78+
<warning number="1584"/>
79+
</nowarn>
80+
</csc>
81+
<csc noconfig="true" nostdlib="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
82+
output="${current.path.test}/${product.assembly.testassembly}">
83+
<sources basedir="${path.src}">
84+
<include name="TestAssembly/**/*.cs"/>
85+
</sources>
86+
<references basedir="${current.path.test}">
87+
<include name="mscorlib.dll"/>
88+
<include name="System.dll"/>
89+
<include name="System.Core.dll"/>
90+
</references>
91+
<nowarn>
92+
<warning number="1584"/>
93+
</nowarn>
94+
</csc>
95+
</target>
96+
97+
<target name="compile-tests" depends="compile-test-modules" unless="${skip.tests}" if="${not(string::contains(build.platform, 'silverlight') or build.platform == 'netcf-3.5')}">
98+
<mkdir dir="${current.path.test}"/>
99+
<call target="CopyDefaultTestInfrastructureAssemblies"/>
100+
101+
<copy todir="${current.path.testmodules}">
102+
<fileset basedir="${path.src}/Ninject.Test/TestModules">
103+
<include name="test.foo"/>
104+
<include name="test.bar"/>
105+
</fileset>
106+
</copy>
107+
<csc noconfig="true" nostdlib="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
108+
output="${current.path.test}/${product.assembly.test}">
109+
<sources basedir="${path.src}">
110+
<include name="${product.name}.Test/**/*.cs"/>
111+
</sources>
112+
<references basedir="${current.path.test}">
113+
<include name="mscorlib.dll"/>
114+
<include name="System.dll"/>
115+
<include name="System.Core.dll"/>
116+
<include name="Moq.dll"/>
117+
<include name="xunit.dll"/>
118+
<include name="xunit.extensions.dll"/>
119+
<include name="FluentAssertions.dll"/>
120+
<include name="System.Web.dll"/>
121+
<include name="${product.assembly}"/>
122+
</references>
123+
<nowarn>
124+
<warning number="1584"/>
125+
</nowarn>
126+
</csc>
127+
</target>
128+
129+
<target name="compile-silverlight-tests" depends="compile-test-modules core" unless="${skip.tests or skip.silverlightTests}" if="${string::contains(build.platform, 'silverlight')}">
130+
<mkdir dir="${current.path.test}"/>
131+
<call target="CopyDefaultTestInfrastructureAssemblies-SL"/>
132+
133+
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
134+
output="${current.path.test}/${product.assembly.silverlighttestdll}">
135+
<sources basedir="${path.src}">
136+
<include name="${product.name}.Test/*.cs"/>
137+
<include name="${product.name}.Test/Fakes/**/*.cs"/>
138+
<include name="${product.name}.Test/Unit/**/*.cs"/>
139+
<include name="${product.name}.Test/Integration/**/*.cs"/>
140+
<include name="${product.name}.SilverlightTests/*.cs"/>
141+
<exclude name="${product.name}.Test/MSTestAttributes/*.cs"/>
142+
</sources>
143+
<references basedir="${current.path.test}">
144+
<include name="mscorlib.dll"/>
145+
<include name="System.dll"/>
146+
<include name="System.Core.dll"/>
147+
<include name="System.Windows.dll"/>
148+
<include name="System.Windows.Browser.dll"/>
149+
<include name="System.Net.dll"/>
150+
<include name="Microsoft.Phone.dll" if="${string::contains(build.platform, 'wp7')}"/>
151+
<include name="Microsoft.Phone.Interop.dll" if="${string::contains(build.platform, 'wp7')}"/>
152+
<include name="Moq.Silverlight.dll" unless="${string::contains(build.platform, 'wp7')}"/>
153+
<include name="Castle.Core.dll" if="${string::contains(build.platform, 'silverlight-4.0') or string::contains(build.platform, 'silverlight-5.0')}"/>
154+
<include name="Castle.Core-Silverlight.dll" unless="${string::contains(build.platform, 'silverlight-4.0') or string::contains(build.platform, 'silverlight-5.0')}"/>
155+
<include name="Castle.DynamicProxy-Silverlight.dll" unless="${build.platform == 'silverlight-4.0' or build.platform == 'silverlight-5.0'}"/>
156+
<include name="FluentAssertions.Silverlight.dll"/>
157+
<include name="xunit.runner.silverlight.dll"/>
158+
<include name="xunit-silverlight.dll"/>
159+
<include name="xunit.extensions-silverlight.dll"/>
160+
<include name="${product.assembly}"/>
161+
</references>
162+
<nowarn>
163+
<warning number="1584"/>
164+
</nowarn>
165+
</csc>
166+
<zip zipfile="${current.path.test}/${product.assembly.silverlighttest}">
167+
<fileset basedir="${current.path.test}">
168+
<include name="*.dll" />
169+
<exclude name="CommonServiceLocator.NinjectAdapter.dll" />
170+
</fileset>
171+
<fileset basedir="${path.src}/${product.name}.SilverlightTests">
172+
<include name="AppManifest.xaml" if="${string::contains(build.platform, 'silverlight-4.0')}"/>
173+
</fileset>
174+
<fileset basedir="${path.src}/${product.name}.SilverlightTests/Silverlight3">
175+
<include name="AppManifest.xaml" unless="${string::contains(build.platform, 'silverlight-4.0')}"/>
176+
</fileset>
177+
<fileset basedir="${path.lib}">
178+
<include name="System.Linq.dll" if="${string::contains(build.platform, 'wp7') and not(string::contains(build.platform, 'wp71'))}"/>
179+
</fileset>
180+
</zip>
181+
</target>
3182
</project>

‎build-release.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set unittestlog=Ninject-Nant-unit-tests.log
88
IF ERRORLEVEL 1 GOTO Failed
99
%nantexe% -buildfile:%nantfile% package-source %1 %2 %3 %4 %5 %6 %7 %8
1010
IF ERRORLEVEL 1 GOTO Failed
11-
%nantexe% -buildfile:%nantfile% "-D:build.config=release" "-D:skip.silverlightWPTests=true" allPlatforms %1 %2 %3 %4 %5 %6 %7 %8
11+
%nantexe% -buildfile:%nantfile% "-D:build.config=release" allPlatforms %1 %2 %3 %4 %5 %6 %7 %8
1212
IF ERRORLEVEL 1 GOTO Failed
1313
%nantexe% -buildfile:%nantfile% -q -nologo revert
1414

0 commit comments

Comments
 (0)