dev 1.0.68 → 1.0.69

data/lib/dev/Project.rb

@@ -310,12 +310,14 @@ class Project < Hash
       #if(self[:type]=="C#")
         hash.set_value("msbuild_vs9","C:/WINDOWS/Microsoft.NET/Framework/v3.5/MSBuild.exe")
         hash.set_value("msbuild","C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe")
-        nunit_exe="#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/2.5.10.11092/bin/net-2.0/nunit-console-x86.exe"
+        nunit_exe="#{Dev::Environment.dev_root}/dep/google-third-party/NUnit/2.6.0.12051/bin/nunit-console-x86.exe"
         ["2.5.10.11092","2.6.0.12051"].each{ |v|
           tmp="#{Dev::Environment.dev_root}/dep/github-third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
-          nunit_exe=tmp if File.exist?(tmp)
+          nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
           tmp="#{Dev::Environment.dev_root}/dep/google-third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
-          nunit_exe=tmp if File.exist?(tmp)
+          nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
+		  tmp="#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/2.5.10.11092/bin/net-2.0/nunit-console-x86.exe"
+		  nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
         }
         hash.set_value("nunit",nunit_exe)
         hash.set_value("regasm","C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/RegAsm.exe") if File.exists?("C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/RegAsm.exe")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.68
+  version: 1.0.69
   prerelease: 
 platform: ruby
 authors: