dev 1.0.34 → 1.0.35

data/lib/dev/Project.rb

@@ -267,8 +267,13 @@ 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_version="2.5.10.11092"
-        hash.set_value("nunit","#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/#{nunit_version}/bin/net-2.0/nunit-console-x86.exe")
+        nunit_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="#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/#{nunit_version}/bin/net-2.0/nunit-console-x86.exe" if !File.exists?(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")
         hash.set_value("regasm","C:/Windows/Microsoft.NET/Framework/v4.0.30319/RegAsm.exe") if File.exists?("C:/Windows/Microsoft.NET/Framework/v4.0.30319/RegAsm.exe")
       #end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25174992 !ruby/object:Gem::Requirement
+  requirement: &24236976 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25174992
+  version_requirements: *24236976
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &25174716 !ruby/object:Gem::Requirement
+  requirement: &24236700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25174716
+  version_requirements: *24236700
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &25174464 !ruby/object:Gem::Requirement
+  requirement: &24236448 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25174464
+  version_requirements: *24236448
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25174212 !ruby/object:Gem::Requirement
+  requirement: &24236196 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25174212
+  version_requirements: *24236196
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &25173960 !ruby/object:Gem::Requirement
+  requirement: &24235944 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25173960
+  version_requirements: *24235944
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25173708 !ruby/object:Gem::Requirement
+  requirement: &24235692 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25173708
+  version_requirements: *24235692
 description: development tasks
 email: lou.parslow@gmail.com
 executables: