Author: brett
Date: Sat Jul 12 08:58:13 2014
New Revision: 1609895
URL: http://svn.apache.org/r1609895
Log:
[NPANDAY-505] consolidate XSD definition again
It should be ok to use a newer Windows SDK in most cases, rather than
requiring several old versions to target those builds. The compiler will
still produce binaries for the right framework. Keep these consistent for
now, until we have a richer way of defining the SDKs to use.
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -121,7 +121,6 @@
</platform>
</platforms>
<probingPaths>
- <!-- TODO: this should be broken up as XSD 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@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
Modified:
incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/components/dotnet-executable/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -39,7 +39,6 @@
</platform>
</platforms>
<probingPaths>
- <!-- TODO: this should be broken up as XSD 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@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
Modified:
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/plugins/maven-link-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -38,7 +38,6 @@ under the License.
</platform>
</platforms>
<probingPaths>
- <!-- TODO: this should be broken up as XSD 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@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
Modified:
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -38,7 +38,6 @@ under the License.
</platform>
</platforms>
<probingPaths>
- <!-- TODO: this should be broken up as XSD 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@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
Modified:
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/plugins/maven-wsdl-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -37,7 +37,6 @@ under the License.
</platform>
</platforms>
<probingPaths>
- <!-- TODO: this should be broken up as XSD 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@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
Modified:
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1609895&r1=1609894&r2=1609895&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
(original)
+++
incubator/npanday/trunk/plugins/maven-xsd-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Sat Jul 12 08:58:13 2014
@@ -105,78 +105,12 @@ under the License.
<profile>XSD:XML_INSTANCE</profile>
<frameworkVersions>
<frameworkVersion>4.5.1</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
<frameworkVersion>4.5</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
<frameworkVersion>4.0</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>o</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:XML_INSTANCE</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:XML_INSTANCE</profile>
- <frameworkVersions>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
<frameworkVersion>2.0.50727</frameworkVersion>
+ <frameworkVersion>1.1.4322</frameworkVersion>
</frameworkVersions>
<platforms>
<platform>
@@ -184,6 +118,10 @@ under the License.
</platform>
</platforms>
<probingPaths>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft
SDKs\Windows@CurrentInstallFolder}\bin</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK35ToolsPath}</probingPath>
</probingPaths>
@@ -201,111 +139,12 @@ under the License.
<profile>XSD:SCHEMA</profile>
<frameworkVersions>
<frameworkVersion>4.5.1</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>fields</include>
- <include>enableDataBinding</include>
- <include>namespace</include>
- <include>language</include>
- <include>out</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- <include>parameters</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:SCHEMA</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
<frameworkVersion>4.5</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>fields</include>
- <include>enableDataBinding</include>
- <include>namespace</include>
- <include>language</include>
- <include>out</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- <include>parameters</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:SCHEMA</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
<frameworkVersion>4.0</frameworkVersion>
- </frameworkVersions>
- <platforms>
- <platform>
- <operatingSystem>Windows</operatingSystem>
- </platform>
- </platforms>
- <probingPaths>
-
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
- </probingPaths>
- <commandFilter>
- <includes>
- <include>classes</include>
- <include>dataset</include>
- <include>element</include>
- <include>fields</include>
- <include>enableDataBinding</include>
- <include>namespace</include>
- <include>language</include>
- <include>out</include>
- <include>o</include>
- <include>type</include>
- <include>uri</include>
- <include>parameters</include>
- </includes>
- </commandFilter>
- </executablePlugin>
- <executablePlugin>
- <identifier>MS:XSD:SCHEMA</identifier>
- <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
- <vendor>MICROSOFT</vendor>
- <executable>xsd</executable>
- <profile>XSD:SCHEMA</profile>
- <frameworkVersions>
<frameworkVersion>3.5</frameworkVersion>
<frameworkVersion>3.0</frameworkVersion>
<frameworkVersion>2.0.50727</frameworkVersion>
+ <frameworkVersion>1.1.4322</frameworkVersion>
</frameworkVersions>
<platforms>
<platform>
@@ -313,6 +152,10 @@ under the License.
</platform>
</platforms>
<probingPaths>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
+
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft
SDKs\Windows@CurrentInstallFolder}\bin</probingPath>
<probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK35ToolsPath}</probingPath>
</probingPaths>
