← Back to branch summary

~nunit-core/nunitv2/2.5

« back to all changes in this revision

Viewing changes to src/ClientUtilities/util/TestRunnerFactory.cs

  • Committer: Charlie Poole
  • Date: 2010-01-30 20:53:22 UTC
  • Revision ID: charlie@nunit.com-20100130205322-mbz89mufwd2gl31x
https://launchpad.net/bugs/514042
Add Nant builds for .NET 3.5 and 4.0; fix error when net-3.5 or net-4.0 is
used as the value of the /framework option of nunit-console.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ClientUtilities/util/TestRunnerFactory.cs
31
31
                targetFramework = currentFramework;
32
32
            else if (targetFramework.Runtime == RuntimeType.Any)
33
33
            {
34
 
                targetFramework = new RuntimeFramework(currentFramework.Runtime, targetFramework.Version);
 
34
                targetFramework = currentFramework.ReplaceRuntimeType(currentFramework.Runtime);
35
35
                package.Settings["RuntimeFramework"] = targetFramework;
36
36
            }
37
37
 
39
39
 
40
40
            ProcessModel processModel = (ProcessModel)package.GetSetting("ProcessModel", ProcessModel.Default);
41
41
            if ( processModel == ProcessModel.Default )
42
 
                if ( !targetFramework.Matches( currentFramework ) )
 
42
                if ( !targetFramework.MatchesClr( currentFramework ) )
43
43
                    processModel = ProcessModel.Separate;
44
44
 
45
45
            switch (processModel)