svn commit: r1609692 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java

[brett]

Author: brett
Date: Fri Jul 11 11:22:54 2014
New Revision: 1609692

URL: http://svn.apache.org/r1609692
Log:
detect other tools versions that should be installed

Modified:
    
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java

Modified: 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1609692&r1=1609691&r2=1609692&view=diff
==============================================================================
--- 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 (original)
+++ 
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java
 Fri Jul 11 11:22:54 2014
@@ -126,8 +126,6 @@ public abstract class AbstractNPandayInt
     }
 
     private static List<String> findAvailableFrameworkVersions() {
-        // TODO: might need to check if framework is sufficient - might need 
to check actual SDK for a given tools version
-
         List<String> keys;
         if (!Os.isFamily( Os.FAMILY_WINDOWS )) {
             // on Mono, assume all present until we can do better at finding 
them
@@ -137,6 +135,11 @@ public abstract class AbstractNPandayInt
         else {
             try {
                 keys = new ArrayList<String>();
+                for (String key : 
WinRegistry.readStringSubKeys(WinRegistry.RegistryHKey.HKLM.getHKey(), 
"SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions")) {
+                    keys.add("v" + key);
+                }
+
+                // Additional framework versions, which likely provide tools, 
as ToolsVersions is not always populated
                 for (String key : 
WinRegistry.readStringSubKeys(WinRegistry.RegistryHKey.HKLM.getHKey(), 
"SOFTWARE\\Microsoft\\.NETFramework")) {
                     if (key.matches("^v[0-9.]+$")) {
                         keys.add(key);