commit 0e39ff4e4b45ef443dea7eadaa55667e11c5e40c
author Brett Porter <brett@apache.org> Tue Jul 08 03:45:05 2014 +0000
committer Brett Porter <brett@apache.org> Tue Jul 08 03:45:05 2014 +0000
tree d7fa96d0a0967bc22ca4971b9a96b0f051a636ef
parent e3bdd0e66012979d3844be56142f5bd929676c07

[NPANDAY-505] correct compiler registry entries

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1608652 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 0b5d261..81e1a2f 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
@@ -311,7 +311,7 @@
       </platform>
     </platforms>
     <probingPaths>
-      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0@MSBuildToolsPath}</probingPath>
     </probingPaths>
     <commandFilter>
       <includes>
@@ -382,8 +382,8 @@
       </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>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0@MSBuildToolsPath}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@MSBuildToolsPath}</probingPath>
     </probingPaths>
     <commandFilter>
       <includes>
@@ -453,7 +453,7 @@
       </platform>
     </platforms>
     <probingPaths>
-      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@MSBuildToolsPath}</probingPath>
     </probingPaths>
     <commandFilter>
       <includes>
@@ -997,7 +997,7 @@
       </platform>
     </platforms>
     <probingPaths>
-      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@FrameworkSDKRoot}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@MSBuildToolsPath}</probingPath>
     </probingPaths>
     <commandFilter>
       <includes>
@@ -1328,8 +1328,8 @@
       </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>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0@MSBuildToolsPath}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@MSBuildToolsPath}</probingPath>
     </probingPaths>
     <commandFilter>
       <includes>
@@ -1402,10 +1402,8 @@
     </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\12.0@MSBuildToolsPath}</probingPath>
+      <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@MSBuildToolsPath}</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>