commit 2f4ccf2a65f23fb4df68c22dee7abbafb188aaa5
author Brett Porter <brett@apache.org> Tue Jul 08 02:59:16 2014 +0000
committer Brett Porter <brett@apache.org> Tue Jul 08 02:59:16 2014 +0000
tree 1aa0955254e7ed466b548478346862ca6a2a6058
parent e42a4bb09b2f5fc964a17a683ade0d51f660444a

[NPANDAY-505] probe for csc/vbc

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1608644 13f79535-47bb-0310-9956-ffa450edef68

components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml

diff --git a/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml b/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
index 81ef4d6..0b5d261 100644
--- a/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
+++ b/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
@@ -86,6 +86,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\2.0@MSBuildToolsPath}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -148,6 +151,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\3.5@MSBuildToolsPath}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -234,6 +240,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\3.5@MSBuildToolsPath}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -301,6 +310,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@FrameworkSDKRoot}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -369,6 +381,10 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@FrameworkSDKRoot}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -436,6 +452,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@FrameworkSDKRoot}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -977,6 +996,9 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@FrameworkSDKRoot}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -1297,7 +1319,7 @@
             </profile>-->
     </profiles>
     <frameworkVersions>
-      <frameworkVersion>4.0</frameworkVersion>      
+      <frameworkVersion>4.5</frameworkVersion>
     </frameworkVersions>
     <platforms>
       <platform>
@@ -1305,6 +1327,10 @@
         <architecture>x86</architecture>
       </platform>
     </platforms>
+    <probingPaths>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@FrameworkSDKRoot}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>
@@ -1361,6 +1387,7 @@
     <executable>vbc</executable>
     <language>VB</language>
     <frameworkVersions>
+      <frameworkVersion>4.5.1</frameworkVersion>
       <frameworkVersion>4.5</frameworkVersion>
       <frameworkVersion>4.0</frameworkVersion>
       <frameworkVersion>3.5</frameworkVersion>
@@ -1373,6 +1400,15 @@
         <operatingSystem>Windows</operatingSystem>
       </platform>
     </platforms>
+    <probingPaths>
+      <!-- TODO: this should be broken up as CSC is, just means for now you always get newest available tools version, but will target right framework -->
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\3.5@MSBuildToolsPath}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\2.0@MSBuildToolsPath}</probingPath>
+    </probingPaths>
     <commandFilter>
       <includes>
         <include>addmodule</include>