dev 1.0.68 → 1.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/dev/Project.rb +5 -3
- metadata +1 -1
data/lib/dev/Project.rb
CHANGED
@@ -310,12 +310,14 @@ class Project < Hash
|
|
310
310
|
#if(self[:type]=="C#")
|
311
311
|
hash.set_value("msbuild_vs9","C:/WINDOWS/Microsoft.NET/Framework/v3.5/MSBuild.exe")
|
312
312
|
hash.set_value("msbuild","C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe")
|
313
|
-
nunit_exe="#{Dev::Environment.dev_root}/dep/
|
313
|
+
nunit_exe="#{Dev::Environment.dev_root}/dep/google-third-party/NUnit/2.6.0.12051/bin/nunit-console-x86.exe"
|
314
314
|
["2.5.10.11092","2.6.0.12051"].each{ |v|
|
315
315
|
tmp="#{Dev::Environment.dev_root}/dep/github-third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
|
316
|
-
nunit_exe=tmp if File.exist?(tmp)
|
316
|
+
nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
|
317
317
|
tmp="#{Dev::Environment.dev_root}/dep/google-third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
|
318
|
-
nunit_exe=tmp if File.exist?(tmp)
|
318
|
+
nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
|
319
|
+
tmp="#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/2.5.10.11092/bin/net-2.0/nunit-console-x86.exe"
|
320
|
+
nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
|
319
321
|
}
|
320
322
|
hash.set_value("nunit",nunit_exe)
|
321
323
|
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")
|