File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 4545 <property name =" build.platform" value =" net-3.5" overwrite =" true" />
4646 <property name =" build.target" value =" net-3.5" overwrite =" false" />
4747 <property name =" build.asminfo" value =" SharedAssemblyInfo.cs" />
48+
49+ <property name =" OsMajorVersion" value =" ${version::get-major(operating-system::get-version(environment::get-operating-system()))}" dynamic =" true" />
50+ <property name =" OsMinorVersion" value =" ${version::get-minor(operating-system::get-version(environment::get-operating-system()))}" dynamic =" true" />
4851
4952 <property name =" package" value =" false" readonly =" false" overwrite =" false" />
5053 <property name =" skip.tests" value =" false" readonly =" false" overwrite =" false" />
5154 <property name =" skip.silverlightTests" value =" false" readonly =" false" overwrite =" false" />
52- <property name =" skip.silverlightWPTests" value =" false " readonly =" false" overwrite =" false" />
55+ <property name =" skip.silverlightWPTests" value =" ${OsMajorVersion > '6' or (OsMajorVersion == '6' and OsMinorVersion > '1')} " readonly =" false" overwrite =" false" />
5356
5457 <property name =" Is64BitOperatingSystem" value =" false" />
5558 <property name =" Is64BitProcess" value =" false" />
101104
102105 <property name =" IsWow64Process" value =" ${PInvoke::IsWow64Process()}" />
103106 <echo message =" Setting the [IsWow64Process] property to ${IsWow64Process}." />
107+
108+ <echo message =" OSVersion: ${OsMajorVersion}.${OsMinorVersion}" />
109+ <echo message =" Skipping Silverlight UnitTests" if =" ${skip.silverlightTests}" />
110+ <echo message =" Skipping WP7 UnitTests" if =" ${skip.silverlightWPTests}" />
104111 </target >
105112
106113 <target name =" DetectIf64BitProcess" >
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ set unittestlog=Ninject-Nant-unit-tests.log
88IF ERRORLEVEL 1 GOTO Failed
99%nantexe% -buildfile:%nantfile% package-source %1 %2 %3 %4 %5 %6 %7 %8
1010IF 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
1212IF ERRORLEVEL 1 GOTO Failed
1313%nantexe% -buildfile:%nantfile% -q -nologo revert
1414
You can’t perform that action at this time.
0 commit comments