Author: brett
Date: Tue Jul 8 02:59:16 2014
New Revision: 1608644
URL: http://svn.apache.org/r1608644
Log:
[NPANDAY-505] probe for csc/vbc
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml?rev=1608644&r1=1608643&r2=1608644&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/compiler-plugins.xml
Tue Jul 8 02:59:16 2014
@@ -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>
